aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeruleanCity.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 19:59:41 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 19:59:41 -0400
commit35deb771130a9012ee4494b1db097761f2fe2919 (patch)
treef47b099cdb4a165dc0a5b0e85f2e24780629680f /scripts/CeruleanCity.asm
parentdata/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects (diff)
downloadpokeyellow-35deb771130a9012ee4494b1db097761f2fe2919.tar.gz
pokeyellow-35deb771130a9012ee4494b1db097761f2fe2919.tar.xz
pokeyellow-35deb771130a9012ee4494b1db097761f2fe2919.zip
H_CONSTANTNAMES -> hConstantNames
Diffstat (limited to 'scripts/CeruleanCity.asm')
-rwxr-xr-xscripts/CeruleanCity.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 94ec2496..61dd03f6 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -79,9 +79,9 @@ CeruleanCityScript0:
cp $14
jr z, .asm_19535
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, $5
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData2
ld [hl], $19
.asm_19535
@@ -90,7 +90,7 @@ CeruleanCityScript0:
predef ShowObject
ld de, CeruleanCityMovement1
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $1
ld [wCeruleanCityCurScript], a
@@ -114,7 +114,7 @@ CeruleanCityMovement1:
CeruleanCityScript_1955d:
ld a, 1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay ; face object
@@ -176,7 +176,7 @@ CeruleanCityScript2:
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
cp $14
@@ -187,7 +187,7 @@ CeruleanCityScript2:
ld de, CeruleanCityMovement3
.asm_195f3
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $3
ld [wCeruleanCityCurScript], a