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 /home.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 'home.asm')
| -rw-r--r-- | home.asm | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1144,7 +1144,7 @@ DisplayTextID:: ; 2817 (0:2817) and a jp z, DisplayStartMenu cp TEXT_PIKACHU_ANIM ; new yellow asm - jp z, DisplayUnknownText_29c6 + jp z, DisplayPikachuEmotion cp TEXT_SAFARI_GAME_OVER jp z, DisplaySafariGameOverText cp TEXT_MON_FAINTED @@ -1348,8 +1348,8 @@ RepelWoreOffText:: ; 29c1 (0:29c1) TX_FAR _RepelWoreOffText db "@" -DisplayUnknownText_29c6:: ; 29c6 (0:29c6) - callab Func_fd004 ; 3f:5004 +DisplayPikachuEmotion:: ; 29c6 (0:29c6) + callab TalkToPikachu ; 3f:5004 jp CloseTextDisplay INCLUDE "engine/menu/start_menu.asm" |