aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pokemon
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-05-25 19:46:44 -0500
committerdannye <33dannye@gmail.com>2025-05-25 19:46:44 -0500
commit4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b (patch)
treef8709c989a831284973172b526c070172ec0a3e3 /engine/pokemon
parenttools/unnamed.py supports RGBDS 0.9.2 (object revision 12) (diff)
downloadpokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.tar.gz
pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.tar.xz
pokeyellow-4500fe42963c0de3cf3f2160b1c8e4c30b42cc0b.zip
Use more ldpikacry
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/bills_pc.asm6
-rw-r--r--engine/pokemon/status_screen.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index bfa86cff..ea40ba04 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -237,7 +237,7 @@ BillsPCDeposit:
jp nc, BillsPCMenu
callfar IsThisPartymonStarterPikachu_Party
jr nc, .asm_215c9
- ld e, $1b
+ ldpikacry e, PikachuCry28
callfar PlayPikachuSoundClip
jr .asm_215cf
.asm_215c9
@@ -300,7 +300,7 @@ BillsPCWithdraw:
call GetPartyMonName
callfar IsThisPartymonStarterPikachu_Box
jr nc, .asm_21660
- ld e, $22
+ ldpikacry e, PikachuCry35
callfar PlayPikachuSoundClip
jr .asm_21666
.asm_21660
@@ -351,7 +351,7 @@ BillsPCRelease:
ld a, [wWhichPokemon]
ld hl, wBoxMonNicks
call GetPartyMonName
- ld e, $27
+ ldpikacry e, PikachuCry40
callfar PlayPikachuSoundClip
ld hl, PikachuUnhappyText
call PrintText
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index 1c9b2fc2..c810260d 100644
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -182,7 +182,7 @@ StatusScreen:
callfar IsThisPartymonStarterPikachu_Box
jr nc, .playRegularCry
.playPikachuSoundClip
- ld e, 16
+ ldpikacry e, PikachuCry17
callfar PlayPikachuSoundClip
jr .continue
.playRegularCry