aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/pikachu_happiness.asm
diff options
context:
space:
mode:
authorNarishma-gb <194818981+Narishma-gb@users.noreply.github.com>2025-09-10 06:31:11 +0200
committerGitHub <noreply@github.com>2025-09-10 00:31:11 -0400
commitd237b01cfb241f417567c964e0df0658cf921570 (patch)
tree799e92e48259443aa6cf4c553ed7adf38bd442d4 /engine/events/pikachu_happiness.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
downloadpokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.gz
pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.xz
pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.zip
Misc. naming and cleanup (#139)
* Name some printer/diploma routines * Name `wd434` * Name `NAME_LENGTH_JP` * Rename `callabd`/`calladb` to `farcall`/`callfar`
Diffstat (limited to 'engine/events/pikachu_happiness.asm')
-rw-r--r--engine/events/pikachu_happiness.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/events/pikachu_happiness.asm b/engine/events/pikachu_happiness.asm
index 0aee04f9..32a69c2b 100644
--- a/engine/events/pikachu_happiness.asm
+++ b/engine/events/pikachu_happiness.asm
@@ -5,14 +5,14 @@ ModifyPikachuHappiness::
cp PIKAHAPPY_WALKING
jr z, .checkanywhereinparty
push de
- callfar IsThisPartymonStarterPikachu_Party
+ callfar IsThisPartyMonStarterPikachu
pop de
ret nc
jr .proceed
.checkanywhereinparty
push de
- callfar IsStarterPikachuInOurParty
+ callfar IsStarterPikachuAliveInOurParty
pop de
ret nc