diff options
| author | dannye <33dannye@gmail.com> | 2025-05-25 19:46:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-05-25 19:46:44 -0500 |
| commit | 4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b (patch) | |
| tree | f8709c989a831284973172b526c070172ec0a3e3 /engine/battle | |
| parent | tools/unnamed.py supports RGBDS 0.9.2 (object revision 12) (diff) | |
| download | pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.tar.gz pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.tar.xz pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.zip | |
Use more ldpikacry
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/common_text.asm | 4 | ||||
| -rw-r--r-- | engine/battle/core.asm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index a074fff7..76b2269d 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -12,9 +12,9 @@ PrintBeginningBattleText: cp BATTLE_TYPE_PIKACHU jr nz, .notPikachuBattle callfar IsPlayerPikachuAsleepInParty - ld e, $24 + ldpikacry e, PikachuCry37 jr c, .asm_f4026 - ld e, $a + ldpikacry e, PikachuCry11 .asm_f4026 callfar PlayPikachuSoundClip jr .continue diff --git a/engine/battle/core.asm b/engine/battle/core.asm index bfda1347..2a1134de 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1055,7 +1055,7 @@ RemoveFaintedPlayerMon: ld [wWhichPokemon], a callfar IsThisPartymonStarterPikachu_Party jr nc, .notPlayerPikachu - ld e, $3 + ldpikacry e, PikachuCry4 callfar PlayPikachuSoundClip jr .printText .notPlayerPikachu @@ -1810,9 +1810,9 @@ SendOutMon: ldh [hAutoBGTransferEnabled], a callfar StarterPikachuBattleEntranceAnimation callfar IsPlayerPikachuAsleepInParty - ld e, $24 + ldpikacry e, PikachuCry37 jr c, .asm_3cd81 - ld e, $a + ldpikacry e, PikachuCry11 .asm_3cd81 callfar PlayPikachuSoundClip jr .done |