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/items/item_effects.asm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engine/items/item_effects.asm')

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index bf43293e..1bbb4cf9 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -809,7 +809,7 @@ ItemUseEvoStone:
 	ld [wCurPartySpecies], a
 	call Func_d85d
 	jr nc, .noEffect
-	callfar IsThisPartymonStarterPikachu_Party
+	callfar IsThisPartyMonStarterPikachu
 	jr nc, .notPlayerPikachu
 	ldpikacry e, PikachuCry28
 	callfar PlayPikachuSoundClip
@@ -938,7 +938,7 @@ ItemUseMedicine:
 	jr nc, .noHappinessBoost
 	push hl
 	push de
-	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDITEM
+	farcall_ModifyPikachuHappiness PIKAHAPPY_USEDITEM
 	pop de
 	pop hl
 .noHappinessBoost
@@ -1537,7 +1537,7 @@ ItemUseMedicine:
 
 	xor a
 	ld [wForceEvolution], a
-	callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP
+	farcall_ModifyPikachuHappiness PIKAHAPPY_LEVELUP
 	ld a, [wWhichPokemon]
 	push af
 	ld a, [wUsedItemOnWhichPokemon]
@@ -1691,7 +1691,7 @@ ItemUseXAccuracy:
 	jp z, ItemUseNotTime
 	ld hl, wPlayerBattleStatus2
 	set USING_X_ACCURACY, [hl] ; X Accuracy bit
-	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
+	farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	jp PrintItemUseTextAndRemoveItem
 
 ; This function is bugged and never works. It always jumps to ItemUseNotTime.
@@ -1769,7 +1769,7 @@ ItemUseGuardSpec:
 	push af
 	ld a, [wPlayerMonNumber]
 	ld [wWhichPokemon], a
-	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
+	farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	pop af
 	ld [wWhichPokemon], a
 
@@ -1794,7 +1794,7 @@ ItemUseDireHit:
 	push af
 	ld a, [wPlayerMonNumber]
 	ld [wWhichPokemon], a
-	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
+	farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	pop af
 	ld [wWhichPokemon], a
 
@@ -1834,7 +1834,7 @@ ItemUseXStat:
 	push af
 	ld a, [wPlayerMonNumber]
 	ld [wWhichPokemon], a
-	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
+	farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM
 	pop af
 	ld [wWhichPokemon], a
 
@@ -2497,8 +2497,8 @@ ItemUseTMHM:
 	push af
 	ld a, d
 	ld [wWhichPokemon], a
-	callabd_ModifyPikachuHappiness PIKAHAPPY_USEDTMHM
-	callfar IsThisPartymonStarterPikachu_Party
+	farcall_ModifyPikachuHappiness PIKAHAPPY_USEDTMHM
+	callfar IsThisPartyMonStarterPikachu
 	jr nc, .notTeachingThunderboltOrThunderToPikachu
 	ld a, [wCurItem]
 	cp TM_THUNDERBOLT ; are we teaching thunderbolt to the player pikachu?
-- 
cgit v1.3.1-sl0p