diff options
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/pokecenter.asm | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index a609fb60..719c8835 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -79,7 +79,7 @@ PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c) ld a, $3 ld [wNPCMovementScriptFunctionNum], a .done - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 1, [hl] ld a, $fc ld [wJoyIgnore], a diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index ff579a04..d883f0e3 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -5,7 +5,7 @@ EnterMapAnim: ; 70567 (1c:4567) call Delay3 push hl call GBFadeInFromWhite - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 bit 7, [hl] ; used fly out of battle? res 7, [hl] jr nz, .flyAnimation diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 9cedd99d..779d852c 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -25,7 +25,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) and a jp nz, .declinedHealing ; if the player chose No call SetLastBlackoutMap - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty jr nc, .notHealingPlayerPikachu call Func_154a jr nz, .notHealingPlayerPikachu @@ -41,7 +41,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call Func_154a jr nz, .playerPikachuNotOnScreen call Func_152d - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty call c, Func_6eaa .playerPikachuNotOnScreen lb bc, 1, 8 @@ -60,7 +60,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call PlaySound call Func_154a jr nz, .doNotReturnPikachu - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty call c, Func_6eaa ld a, $5 ld [wd431], a @@ -70,7 +70,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call Func_6ebb ld hl, PokemonFightingFitText call PrintText - callab IsPikachuInOurParty + callab IsStarterPikachuInOurParty jr nc, .notInParty lb bc, 15, 0 call Func_6ebb |