aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-11-18 19:24:53 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-11-18 19:24:53 -0500
commitc5b2436daadbae47d6251052d62436afbaa91158 (patch)
tree5671f8d0e7368b736c8e85bdae277bf9eee09b40 /home
parentUpdate Discord link. (diff)
downloadpokeyellow-c5b2436daadbae47d6251052d62436afbaa91158.tar.gz
pokeyellow-c5b2436daadbae47d6251052d62436afbaa91158.tar.xz
pokeyellow-c5b2436daadbae47d6251052d62436afbaa91158.zip
Rename spritestatedata structs.
Diffstat (limited to 'home')
-rw-r--r--home/overworld.asm2
-rwxr-xr-xhome/pikachu.asm4
2 files changed, 3 insertions, 3 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 29e4f18d..9c53a3be 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1081,7 +1081,7 @@ IsSpriteInFrontOfPlayer::
ld d, $10 ; talking range in pixels (normal range)
IsSpriteInFrontOfPlayer2::
lb bc, $3c, $40 ; Y and X position of player sprite
- ld a, [wPlayerFacingDirection] ; direction the player is facing
+ ld a, [wSpritePlayerStateData1FacingDirection] ; direction the player is facing
.checkIfPlayerFacingUp
cp SPRITE_FACING_UP
jr nz, .checkIfPlayerFacingDown
diff --git a/home/pikachu.asm b/home/pikachu.asm
index d16e95db..336c80b3 100755
--- a/home/pikachu.asm
+++ b/home/pikachu.asm
@@ -2,7 +2,7 @@ Func_1510::
push hl
ld hl, wPikachuOverworldStateFlags
set 7, [hl]
- ld hl, wPikachuSpriteImageIdx ; pikachu data?
+ ld hl, wSpritePikachuStateData1ImageIndex ; pikachu data?
ld [hl], $ff
pop hl
ret
@@ -25,7 +25,7 @@ DisablePikachuOverworldSpriteDrawing::
push hl
ld hl, wPikachuOverworldStateFlags
set 3, [hl]
- ld hl, wPikachuSpriteImageIdx ; pikachu data?
+ ld hl, wSpritePikachuStateData1ImageIndex ; pikachu data?
ld [hl], $ff
pop hl
ret