diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-23 13:00:01 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-23 13:00:01 -0400 |
| commit | 5f2d3bedb9aef983f1d3cdbca1028b2e08be4cd4 (patch) | |
| tree | 22e40352158d672f29cc0e45da166f63f65dbf25 /engine/events | |
| parent | 1d456d5f66627e8023c074419180639cc027e7bc (diff) | |
Revisit some bank 5 code before continuing.
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/overworld.asm | 2 | ||||
| -rw-r--r-- | engine/events/pokemon_pc.asm | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index c169b7aa..179e8227 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -598,7 +598,7 @@ FlyScript: callasm FlyToAnimation special WaitSFX special ReplaceChrisSprite - callasm Function1415c + callasm _RefreshSprites end WaterfallFunction: ; caed diff --git a/engine/events/pokemon_pc.asm b/engine/events/pokemon_pc.asm index e22a2ffc..8981bcf4 100644 --- a/engine/events/pokemon_pc.asm +++ b/engine/events/pokemon_pc.asm @@ -185,7 +185,7 @@ _PlayersHousePC: ld b, $1 call _PlayersPC and a - jr nz, .asm_156f9 + jr nz, .asm_159d0 call OverworldTextModeSwitch call ApplyTilemap call UpdateSprites @@ -193,7 +193,7 @@ _PlayersHousePC: ld c, $0 ret -.asm_156f9 +.asm_159d0 call ClearBGPalettes ld c, $1 ret @@ -207,28 +207,28 @@ _PlayersPC: ld [wWhichIndexSet], a ld hl, PlayersPCAskWhatDoText call PC_DisplayTextWaitMenu - call Function15715 + call Function159ec call ExitMenu ret -Function15715: +Function159ec: xor a ld [wPCItemsCursor], a ld [wPCItemsScrollPosition], a ld hl, PlayersPCMenuData call LoadMenuHeader -.asm_15722 +.asm_159f9 call UpdateTimePals call DoNthMenu - jr c, .asm_15731 + jr c, .asm_15a08 call MenuJumptable - jr nc, .asm_15722 - jr .asm_15732 + jr nc, .asm_159f9 + jr .asm_15a09 -.asm_15731 +.asm_15a08 xor a -.asm_15732 +.asm_15a09 call ExitMenu ret |