diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:49:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:49:03 -0700 |
| commit | db0ac16b6b4f257de338d1aaac561e681ca8723a (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /engine/overworld/pokecenter.asm | |
| parent | More syncing with pokered (diff) | |
| parent | Merge branch 'master' of github.com:pret/pokeyellow (diff) | |
| download | pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.tar.gz pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.tar.xz pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.zip | |
Merge pull request #14 from PikalaxALT/master
Yellow documentation
Diffstat (limited to 'engine/overworld/pokecenter.asm')
| -rwxr-xr-x | engine/overworld/pokecenter.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 65dfcd87..0f355889 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -32,7 +32,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call LoadCurrentMapView call Delay3 call UpdateSprites - callab Func_fd252 ; todo + callab PikachuWalksToNurseJoy ; todo .notHealingPlayerPikachu ld hl, NeedYourPokemonText call PrintText @@ -40,7 +40,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call DelayFrames call CheckPikachuFollowingPlayer jr nz, .playerPikachuNotOnScreen - call Func_152d + call DisablePikachuOverworldSpriteDrawing callab IsStarterPikachuInOurParty call c, Func_6eaa .playerPikachuNotOnScreen @@ -64,7 +64,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call c, Func_6eaa ld a, $5 ld [wPikachuSpawnState], a - call Func_1525 + call EnablePikachuOverworldSpriteDrawing .doNotReturnPikachu lb bc, 1, 0 call Func_6ebb |