aboutsummaryrefslogtreecommitdiffstats
path: root/engine/events/poison.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/poison.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/poison.asm')
-rw-r--r--engine/events/poison.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/poison.asm b/engine/events/poison.asm
index 4645387c..6dfe1376 100644
--- a/engine/events/poison.asm
+++ b/engine/events/poison.asm
@@ -62,11 +62,11 @@ ApplyOutOfBattlePoisonDamage:
ld a, TEXT_MON_FAINTED
ldh [hTextID], a
call DisplayTextID
- callfar IsThisPartymonStarterPikachu_Party
+ callfar IsThisPartyMonStarterPikachu
jr nc, .curMonNotPlayerPikachu
ldpikacry e, PikachuCry4
callfar PlayPikachuSoundClip
- calladb_ModifyPikachuHappiness PIKAHAPPY_PSNFNT
+ callfar_ModifyPikachuHappiness PIKAHAPPY_PSNFNT
.curMonNotPlayerPikachu
pop de
pop hl
@@ -132,7 +132,7 @@ Func_c4c7:
call Random
and $1
jr z, .asm_c4de
- calladb_ModifyPikachuHappiness $6
+ callfar_ModifyPikachuHappiness PIKAHAPPY_WALKING
.asm_c4de
ld hl, wPikachuMood
ld a, [hl]