diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-01 21:54:11 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-01 21:54:11 -0500 |
| commit | 92a8c491c3a8c39a7c51b300d759f93aa5157447 (patch) | |
| tree | 2b0fca0ca289327e65b3b4339f1523f6060c4437 /engine/startmenu.asm | |
| parent | ffbf2c0f5d28c05c14f67a3cfb123d37157c2ef9 (diff) | |
Break up engine/sprites.asm; address yenatch's comments
Diffstat (limited to 'engine/startmenu.asm')
| -rwxr-xr-x | engine/startmenu.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/startmenu.asm b/engine/startmenu.asm index a0b6c5c0e..1a8f605ae 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -469,7 +469,7 @@ StartMenu_Status: ; 12928 call FadeToMenu callba TrainerCard - call ReturnToCallingMenu + call CloseSubmenu ld a, 0 ret ; 12937 @@ -483,7 +483,7 @@ StartMenu_Pokedex: ; 12937 call FadeToMenu callba Pokedex - call ReturnToCallingMenu + call CloseSubmenu .asm_12949 ld a, 0 @@ -495,7 +495,7 @@ StartMenu_Pokegear: ; 1294c call FadeToMenu callba PokeGear - call ReturnToCallingMenu + call CloseSubmenu ld a, 0 ret ; 1295b @@ -508,7 +508,7 @@ StartMenu_Pack: ; 1295b ld a, [wcf66] and a jr nz, .used_item - call ReturnToCallingMenu + call CloseSubmenu ld a, 0 ret @@ -557,7 +557,7 @@ StartMenu_Pokemon: ; 12976 jr z, .quit .return - call ReturnToCallingMenu + call CloseSubmenu ld a, 0 ret @@ -1761,7 +1761,7 @@ SetUpMoveScreenBG: ; 13172 xor a ld [hBGMapMode], a callba Functionfb571 - callba ClearSpriteAnims + callba ClearSpriteAnims2 ld a, [CurPartyMon] ld e, a ld d, $0 |