diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 16:04:39 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 16:04:39 -0400 |
| commit | 5b3c788c46759023f1bd4470ffef306b8c0e5a39 (patch) | |
| tree | e2979ffc8baae7ea771e05279e27e3a6f81b6082 /home.asm | |
| parent | Pikapic animation function labels (diff) | |
| download | pokeyellow-5b3c788c46759023f1bd4470ffef306b8c0e5a39.tar.gz pokeyellow-5b3c788c46759023f1bd4470ffef306b8c0e5a39.tar.xz pokeyellow-5b3c788c46759023f1bd4470ffef306b8c0e5a39.zip | |
More on Pikachu emotions
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" |