summaryrefslogtreecommitdiff
path: root/scripts/PewterCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/PewterCity.asm')
-rwxr-xr-xscripts/PewterCity.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index 18296675..86037c13 100755
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -44,7 +44,7 @@ PewterCityScript1:
and a
ret nz
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -58,18 +58,18 @@ PewterCityScript1:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3c
- ld [$ffeb], a
+ ld [hSpriteScreenYCoord], a
ld a, $30
- ld [$ffec], a
+ ld [hSpriteScreenXCoord], a
ld a, $c
- ld [$ffed], a
+ ld [hSpriteMapYCoord], a
ld a, $11
- ld [$ffee], a
+ ld [hSpriteMapXCoord], a
ld a, $3
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, MovementData_PewterMuseumGuyExit
call MoveSprite
ld a, $2
@@ -112,7 +112,7 @@ PewterCityScript4:
and a
ret nz
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -126,18 +126,18 @@ PewterCityScript4:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3c
- ld [$ffeb], a
+ ld [hSpriteScreenYCoord], a
ld a, $40
- ld [$ffec], a
+ ld [hSpriteScreenXCoord], a
ld a, $16
- ld [$ffed], a
+ ld [hSpriteMapYCoord], a
ld a, $10
- ld [$ffee], a
+ ld [hSpriteMapXCoord], a
ld a, $5
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, MovementData_PewterGymGuyExit
call MoveSprite
ld a, $5
@@ -220,7 +220,7 @@ PewterCityText3:
ld [wNPCMovementScriptFunctionNum], a
ld a, $2
ld [wNPCMovementScriptPointerTableNum], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
ld a, $3
ld [wSpriteIndex], a
@@ -284,7 +284,7 @@ PewterCityText5:
ld [wNPCMovementScriptFunctionNum], a
ld a, $3
ld [wNPCMovementScriptPointerTableNum], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
ld a, $5
ld [wSpriteIndex], a