From d237b01cfb241f417567c964e0df0658cf921570 Mon Sep 17 00:00:00 2001
From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com>
Date: Wed, 10 Sep 2025 06:31:11 +0200
Subject: Misc. naming and cleanup (#139)

* Name some printer/diploma routines

* Name `wd434`

* Name `NAME_LENGTH_JP`

* Rename `callabd`/`calladb` to `farcall`/`callfar`
---
 engine/pikachu/pikachu_emotions.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engine/pikachu/pikachu_emotions.asm')

diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm
index a29fd781..3fc08363 100644
--- a/engine/pikachu/pikachu_emotions.asm
+++ b/engine/pikachu/pikachu_emotions.asm
@@ -3,7 +3,7 @@ IsPlayerTalkingToPikachu::
 	and a
 	ret z
 	ldh a, [hSpriteIndex]
-	cp $f
+	cp PIKACHU_SPRITE_INDEX
 	ret nz
 	call InitializePikachuTextID
 	xor a
@@ -111,7 +111,7 @@ StarterPikachuEmotionCommand_emote:
 
 ShowPikachuEmoteBubble:
 	ld [wWhichEmotionBubble], a
-	ld a, $f ; Pikachu
+	ld a, PIKACHU_SPRITE_INDEX
 	ld [wEmotionBubbleSpriteIndex], a
 	predef EmotionBubble
 	ret
@@ -333,7 +333,7 @@ MapSpecificPikachuExpression:
 	call IsPlayerPikachuAsleepInParty
 	ldpikaemotion a, PikachuEmotion11
 	jr c, .play_emotion
-	callfar CheckPikachuFaintedOrStatused ; same bank
+	callfar CheckPikachuStatusCondition ; same bank
 	ldpikaemotion a, PikachuEmotion28
 	jr c, .play_emotion
 	ld a, [wCurMap]
@@ -383,7 +383,7 @@ IsPlayerPikachuAsleepInParty:
 	jr z, .done
 	cp STARTER_PIKACHU
 	jr nz, .curMonNotStarterPikachu
-	callfar IsThisPartymonStarterPikachu
+	callfar IsThisPartyMonStarterPikachu
 	jr nc, .curMonNotStarterPikachu
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMon1Status
-- 
cgit v1.3.1-sl0p