Use more ldpikacry

11 files changed, 22 insertions, 19 deletions

diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm
index 290fc6e2..98d0e6e2 100644
--- a/constants/pikachu_emotion_constants.asm
+++ b/constants/pikachu_emotion_constants.asm
@@ -116,6 +116,7 @@ MACRO pikaemotion_dummy3
 ENDM
 
 MACRO pikacry_def
+	const_skip
 \1_id::
 	dba \1
 ENDM
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
diff --git a/engine/events/poison.asm b/engine/events/poison.asm
index c57af3c4..4645387c 100644
--- a/engine/events/poison.asm
+++ b/engine/events/poison.asm
@@ -64,7 +64,7 @@ ApplyOutOfBattlePoisonDamage:
 	call DisplayTextID
 	callfar IsThisPartymonStarterPikachu_Party
 	jr nc, .curMonNotPlayerPikachu
-	ld e, $3
+	ldpikacry e, PikachuCry4
 	callfar PlayPikachuSoundClip
 	calladb_ModifyPikachuHappiness PIKAHAPPY_PSNFNT
 .curMonNotPlayerPikachu
diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm
index 820be66a..6cb93a02 100644
--- a/engine/events/pokecenter.asm
+++ b/engine/events/pokecenter.asm
@@ -32,7 +32,7 @@ DisplayPokemonCenterDialogue_::
 	call LoadCurrentMapView
 	call Delay3
 	call UpdateSprites
-	callfar PikachuWalksToNurseJoy ; todo
+	callfar PikachuWalksToNurseJoy
 .notHealingPlayerPikachu
 	ld hl, NeedYourPokemonText
 	call PrintText
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 9802eb50..89d51d0b 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -811,7 +811,7 @@ ItemUseEvoStone:
 	jr nc, .noEffect
 	callfar IsThisPartymonStarterPikachu_Party
 	jr nc, .notPlayerPikachu
-	ld e, $1b
+	ldpikacry e, PikachuCry28
 	callfar PlayPikachuSoundClip
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index 21848bb9..defe5502 100644
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -158,7 +158,7 @@ HoFDisplayAndRecordMonInfo:
 	ld [wWhichPokemon], a
 	callfar IsThisPartymonStarterPikachu_Party
 	jr nc, .asm_70336
-	ld e, $22
+	ldpikacry e, PikachuCry35
 	callfar PlayPikachuSoundClip
 	jr .asm_7033c
 .asm_70336
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 96ce948c..ec7a2aa3 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -35,7 +35,6 @@ DisplayTitleScreen:
 	call ClearScreen
 	call DisableLCD
 	call LoadFontTilePatterns
-; todo: fix hl pointers
 	ld hl, NintendoCopyrightLogoGraphics
 	ld de, vTitleLogo tile $60
 	ld bc, 5 tiles
@@ -140,12 +139,11 @@ DisplayTitleScreen:
 	ld a, SFX_INTRO_WHOOSH
 	call PlaySound
 
-; scroll game version in from the right
 	callfar TitleScreen_PlacePikaSpeechBubble
 	ld a, SCREEN_HEIGHT_PX
 	ldh [hWY], a
 	call Delay3
-	ld e, 0
+	ldpikacry e, PikachuCry1
 	call TitleScreen_PlayPikachuPCM
 	call WaitForSoundToFinish
 	call StopAllMusic
@@ -179,7 +177,7 @@ ENDC
 	jr .titleScreenLoop
 
 .go_to_main_menu
-	ld e, $a
+	ldpikacry e, PikachuCry11
 	call TitleScreen_PlayPikachuPCM
 	call GBPalWhiteOutWithDelay3
 	call ClearSprites
@@ -218,9 +216,9 @@ ENDC
 ; unreferenced
 	ld a, [wTitleScreenScene + 4]
 	inc a
-	cp $2a
+	cp NUM_PIKA_CRIES
 	jr c, .asm_4305
-	ld a, $f
+	ldpikacry a, PikachuCry16
 .asm_4305
 	ld [wTitleScreenScene + 4], a
 	ld e, a
diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm
index 3fb5ca07..bdfae0eb 100644
--- a/engine/pikachu/pikachu_pcm.asm
+++ b/engine/pikachu/pikachu_pcm.asm
@@ -97,6 +97,8 @@ PikachuCriesPointerTable::
 ; db bank
 ; dw pointer to cry
 
+	const_def
+
 ; bank 21
 	pikacry_def PikachuCry1
 	pikacry_def PikachuCry2
@@ -159,3 +161,5 @@ PikachuCriesPointerTable::
 	pikacry_def PikachuCry40
 	pikacry_def PikachuCry41
 	pikacry_def PikachuCry42
+
+DEF NUM_PIKA_CRIES EQU const_value
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