diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
| commit | 2b7961759b3786725b95ee8f4a0b6e556091db7a (patch) | |
| tree | 6287d4bb7bad7d012f804dc18856341a09fc015b /engine/menu/start_menu.asm | |
| parent | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (diff) | |
Fixes.
Diffstat (limited to 'engine/menu/start_menu.asm')
| -rwxr-xr-x | engine/menu/start_menu.asm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 60010d9c..adedc263 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -22,7 +22,8 @@ RedisplayStartMenu:: ; 29e1 (0:29e1) and a jr nz,.loop ; if the player pressed tried to go past the top item, wrap around to the bottom - CheckEvent EVENT_GOT_POKEDEX + ld a,[wd74b] + bit 5,a ; does the player have the pokedex? ld a,6 ; there are 7 menu items with the pokedex, so the max index is 6 jr nz,.wrapMenuItemId dec a ; there are only 6 menu items without the pokedex @@ -34,7 +35,8 @@ RedisplayStartMenu:: ; 29e1 (0:29e1) bit 7,a jr z,.buttonPressed ; if the player pressed tried to go past the bottom item, wrap around to the top - CheckEvent EVENT_GOT_POKEDEX + ld a,[wd74b] + bit 5,a ; does the player have the pokedex? ld a,[wCurrentMenuItem] ld c,7 ; there are 7 menu items with the pokedex jr nz,.checkIfPastBottom @@ -55,7 +57,8 @@ RedisplayStartMenu:: ; 29e1 (0:29e1) and a,%00001010 ; was the Start button or B button pressed? jp nz,CloseStartMenu call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2 - CheckEvent EVENT_GOT_POKEDEX + ld a,[wd74b] + bit 5,a ; does the player have the pokedex? ld a,[wCurrentMenuItem] jr nz,.displayMenuItem inc a ; adjust position to account for missing pokedex menu item |