aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pikachu/pikachu_follow.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/pikachu/pikachu_follow.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/pikachu/pikachu_follow.asm')
-rw-r--r--engine/pikachu/pikachu_follow.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/pikachu/pikachu_follow.asm b/engine/pikachu/pikachu_follow.asm
index 14331682..11093c29 100644
--- a/engine/pikachu/pikachu_follow.asm
+++ b/engine/pikachu/pikachu_follow.asm
@@ -6,7 +6,7 @@ ShouldPikachuSpawn::
ld a, [wPikachuOverworldStateFlags]
bit 7, a
jr nz, .hide
- call IsStarterPikachuInOurParty
+ call IsStarterPikachuAliveInOurParty
jr nc, .hide
ld a, [wWalkBikeSurfState]
and a
@@ -1375,7 +1375,7 @@ Func_fcc92:
ld a, $ff
.asm_fcca8
ld d, [hl]
- ldd [hl], a
+ ld [hld], a
ld a, d
dec e
jr nz, .asm_fcca8