diff options
Diffstat (limited to 'engine/menu')
| -rw-r--r-- | engine/menu/bills_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/start_menu.asm | 12 |
3 files changed, 5 insertions, 11 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index e8e48b79..87595a09 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -343,9 +343,7 @@ BillsPCMenuText: ; 216e1 (8:56e1) next "DEPOSIT ", $4a next "RELEASE ", $4a next "CHANGE BOX" -IF DEF(_YELLOW) next "PRINT BOX" -ENDC next "SEE YA!" db "@" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index a58523e8..7953b849 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -367,9 +367,7 @@ PokedexMenuItemsText: ; 402af (10:42af) db "DATA" next "CRY" next "AREA" -IF DEF(_YELLOW) next "PRNT" -ENDC next "QUIT@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 3c48e6ed..60010d9c 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -1,13 +1,11 @@ -DisplayStartMenu:: ; 2acd (0:2acd) - ld a,BANK(StartMenu_Pokedex) - ld [H_LOADEDROMBANK],a - ld [MBC1RomBank],a +DisplayStartMenu:: ; 29d1 (0:29d1) + switchbank StartMenu_Pokedex ; also bank for other functions ld a,[wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy],a - ld a, SFX_START_MENU + ld a, $8f ; (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound call PlaySound -RedisplayStartMenu:: ; 2adf (0:2adf) +RedisplayStartMenu:: ; 29e1 (0:29e1) callba DrawStartMenu callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone call UpdateSprites @@ -76,7 +74,7 @@ RedisplayStartMenu:: ; 2adf (0:2adf) jp z,StartMenu_Option ; EXIT falls through to here -CloseStartMenu:: ; 2b70 (0:2b70) +CloseStartMenu:: ; 2a72 (0:2a72) call Joypad ld a,[hJoyPressed] bit 0,a ; was A button newly pressed? |