summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/billshouse.asm8
-rwxr-xr-xscripts/cinnabarisland.asm2
-rwxr-xr-xscripts/copycatshouse2f.asm2
-rwxr-xr-xscripts/mansion1.asm2
-rwxr-xr-xscripts/mansion2.asm2
-rwxr-xr-xscripts/mansion3.asm2
-rwxr-xr-xscripts/mansion4.asm2
-rwxr-xr-xscripts/oakslab.asm4
-rwxr-xr-xscripts/pallettown.asm2
-rwxr-xr-xscripts/pokemontower7.asm2
-rwxr-xr-xscripts/redshouse1f2.asm2
-rwxr-xr-xscripts/route11gateupstairs.asm2
-rwxr-xr-xscripts/route12gateupstairs.asm2
-rwxr-xr-xscripts/route22.asm2
-rwxr-xr-xscripts/route22gate.asm2
-rwxr-xr-xscripts/route23.asm2
-rwxr-xr-xscripts/safarizoneentrance.asm6
-rwxr-xr-xscripts/vermilioncity.asm4
-rwxr-xr-xscripts/viridiancity.asm6
19 files changed, 28 insertions, 28 deletions
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index 02183977..3e13ba51 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -57,7 +57,7 @@ BillsHouseScript1:
BillsHouseScript2:
ld a, $ff
ld [wJoyIgnore], a
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
ld de, MovementData_1e79c
jr nz, .notDown
@@ -99,7 +99,7 @@ BillsHouseScript3:
call CheckPikachuFollowingPlayer
jr z, .asm_1e13e
ld hl, PikachuMovementData_1e14d
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
jr nz, .asm_1e133
ld hl, PikachuMovementData_1e152
@@ -211,7 +211,7 @@ BillsHouseScript7:
xor a
ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_UP
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, $FF ^ (A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
ld de, RLE_1e219
@@ -235,7 +235,7 @@ BillsHouseScript8:
xor a
ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_UP
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, $2
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_DOWN
diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm
index 4dbec159..c608f53d 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -35,7 +35,7 @@ CinnabarIslandScript0:
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
xor a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ld a, $1
ld [wCinnabarIslandCurScript], a
diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm
index 7bf8d0e9..ee8f2cc7 100755
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/copycatshouse2f.asm
@@ -82,7 +82,7 @@ CopycatsHouse2FText6:
CopycatsHouse2FText7:
TX_ASM
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ld hl, CopycatsHouse2FText_5cd1c
jr nz, .notUp
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm
index fb0a92bc..d659d993 100755
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -46,7 +46,7 @@ Mansion1ReplaceBlock:
ret
Mansion1Script_Switches:
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm
index 0ba8a245..7edfd097 100755
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -42,7 +42,7 @@ Mansion2Script_5202f:
predef_jump ReplaceTileBlock
Mansion2Script_Switches:
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a
diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm
index c71979d5..990ad434 100755
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -73,7 +73,7 @@ Mansion3Script_5225b:
ret
Mansion3Script_Switches:
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a
diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm
index 12420990..57687fec 100755
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@@ -44,7 +44,7 @@ Mansion4Script_523cf:
ret
Mansion4Script_Switches:
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
ret nz
xor a
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index d3082256..4bc8198c 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -464,13 +464,13 @@ OaksLabScript16:
ret nz
xor a
.asm_1c707
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ret
OaksLabScript17:
; Pikachu comes out
ld a, SPRITE_FACING_UP
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, $2
ld [wPikachuSpawnState], a
callba SchedulePikachuSpawnForAfterText
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm
index 49546a44..e98464ce 100755
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -174,7 +174,7 @@ PalletTownScript5:
PalletTownScript6:
xor a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, $1
ld [wSpriteIndex], a
xor a
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index 6a2cdad5..abfb1468 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -235,7 +235,7 @@ PokemonTower7Script11:
ld [wMissableObjectIndex], a
predef HideObject
ld a, SPRITE_FACING_UP
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, LAVENDER_HOUSE_1
ld [hWarpDestinationMap], a
ld a, $1
diff --git a/scripts/redshouse1f2.asm b/scripts/redshouse1f2.asm
index 871f2e31..8f44d30d 100755
--- a/scripts/redshouse1f2.asm
+++ b/scripts/redshouse1f2.asm
@@ -40,7 +40,7 @@ MomHealText2:
Func_f1bc4:
ld hl, TVWrongSideText
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jp nz, .notUp
ld hl, StandByMeText
diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm
index 300b299a..6188e122 100755
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@@ -47,7 +47,7 @@ Route11GateUpstairsText_494a3:
Route11GateUpstairsText3:
TX_ASM
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jp nz, GateUpstairsScript_PrintIfFacingUp
CheckEvent EVENT_BEAT_ROUTE12_SNORLAX
diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm
index bdbbf526..b80ca186 100755
--- a/scripts/route12gateupstairs.asm
+++ b/scripts/route12gateupstairs.asm
@@ -64,7 +64,7 @@ Route12GateUpstairsText_495c4:
db "@"
GateUpstairsScript_PrintIfFacingUp:
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_UP
jr z, .up
ld a, $1
diff --git a/scripts/route22.asm b/scripts/route22.asm
index fe881366..41f77680 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -153,7 +153,7 @@ Route22Script2:
ld a, $1
ld [wRivalStarter], a
.asm_50fc9
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
jr nz, .notDown
ld a, SPRITE_FACING_UP
diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm
index 05fbc7e9..2b622a43 100755
--- a/scripts/route22gate.asm
+++ b/scripts/route22gate.asm
@@ -40,7 +40,7 @@ Route22GateScript_1e6ba:
ld [wSimulatedJoypadStatesIndex], a
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
jp StartSimulatingJoypadStates
diff --git a/scripts/route23.asm b/scripts/route23.asm
index b82ab505..c2863f89 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -118,7 +118,7 @@ Route23Script_512d8:
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
xor a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
jp StartSimulatingJoypadStates
diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm
index 97578475..063a6d0b 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -26,7 +26,7 @@ SafariZoneEntranceScriptPointers:
xor a
ld [hJoyHeld], a
ld a, SPRITE_FACING_RIGHT
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, [wCoordIndex]
cp $1
jr z, .asm_7520f
@@ -160,7 +160,7 @@ SafariZoneEntranceTextPointers:
ld hl, .SafariZoneEntranceText_753bb
call PrintText
xor a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, D_DOWN
ld c, $3
call SafariZoneEntranceAutoWalk
@@ -172,7 +172,7 @@ SafariZoneEntranceTextPointers:
ld hl, .SafariZoneEntranceText_753c0
call PrintText
ld a, SPRITE_FACING_UP
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, D_UP
ld c, $1
call SafariZoneEntranceAutoWalk
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm
index b73797bb..6f0f4cc2 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -53,7 +53,7 @@ VermilionCityScriptPointers:
dw VermilionCityScript4
VermilionCityScript0:
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
and a ; cp SPRITE_FACING_DOWN
jr nz, .asm_198de
ld hl, CoordsData_19823
@@ -176,7 +176,7 @@ VermilionCityText3:
TX_ASM
CheckEvent EVENT_SS_ANNE_LEFT
jr nz, .asm_198f6
- ld a, [wPlayerFacingDirection]
+ ld a, [wSpritePlayerStateData1FacingDirection]
cp SPRITE_FACING_RIGHT
jr z, .asm_198c8
ld hl, VermilionCityCoords1
diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm
index 5aa1dbbc..f7b7b97f 100755
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -54,7 +54,7 @@ ViridianCityScript_1905b:
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
xor a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ld [hJoyHeld], a
ld a, $6
@@ -161,7 +161,7 @@ ViridianCityScript_1914d:
ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
xor a
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ret
@@ -180,7 +180,7 @@ ViridianCityScript_19162:
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $8
- ld [wPlayerFacingDirection], a
+ ld [wSpritePlayerStateData1FacingDirection], a
ld a, $8
ld [hSpriteIndexOrTextID], a
call DisplayTextID
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 13:07:33 +0000