diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 11:46:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 11:46:02 -0400 |
| commit | b7a20f13863331e15a074c91a4a1be38d27142c9 (patch) | |
| tree | abfb48aa129b82dc7a88c7b028f2e20a6c671f4d /engine/overworld | |
| parent | 755ca8914d2878c6a6ef365e962d505ff9d7801e (diff) | |
Vermilion Fan Club
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/cable_club_npc.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/pokecenter.asm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index 4170a936..f60042de 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -1,7 +1,7 @@ CableClubNPC: ; 7035 (1:7035) ld hl, CableClubNPCWelcomeText call PrintText - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .asm_7048 CheckEvent EVENT_GOT_POKEDEX jp nz, .receivedPokedex diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 3024ff7b..b9307517 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -2,7 +2,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) ld a, [wCurMap] cp PEWTER_POKECENTER jr nz, .regularCenter - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr z, .regularCenter ld hl, LooksContentText ; if pikachu is sleeping, don't heal call PrintText @@ -27,7 +27,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call SetLastBlackoutMap callab IsStarterPikachuInOurParty jr nc, .notHealingPlayerPikachu - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .notHealingPlayerPikachu call LoadCurrentMapView call Delay3 @@ -38,7 +38,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call PrintText ld c, 64 call DelayFrames - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .playerPikachuNotOnScreen call Func_152d callab IsStarterPikachuInOurParty @@ -58,7 +58,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) ld [wLastMusicSoundID], a ld [wNewSoundID], a call PlaySound - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz, .doNotReturnPikachu callab IsStarterPikachuInOurParty call c, Func_6eaa |