summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ceruleancity.asm8
-rwxr-xr-xscripts/cinnabargym.asm8
-rwxr-xr-xscripts/cinnabarisland.asm4
-rwxr-xr-xscripts/fightingdojo.asm8
-rwxr-xr-xscripts/gary.asm4
-rwxr-xr-xscripts/halloffameroom.asm10
-rwxr-xr-xscripts/oakslab.asm16
-rwxr-xr-xscripts/pallettown.asm8
-rwxr-xr-xscripts/pokemontower2.asm6
-rwxr-xr-xscripts/redshouse2f.asm4
-rwxr-xr-xscripts/route22.asm24
-rwxr-xr-xscripts/route5gate.asm4
-rwxr-xr-xscripts/route6gate.asm4
-rwxr-xr-xscripts/route7gate.asm4
-rwxr-xr-xscripts/route8gate.asm4
-rwxr-xr-xscripts/safarizoneentrance.asm4
-rwxr-xr-xscripts/silphco11.asm10
-rwxr-xr-xscripts/silphco7.asm8
-rwxr-xr-xscripts/ssanne2.asm4
19 files changed, 71 insertions, 71 deletions
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm
index 2c7bd449..48480167 100755
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -44,15 +44,15 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
jr nc, .asm_194f7
ld a, [wCoordIndex]
cp $1
- ld a, $8
+ ld a, PLAYER_DIR_UP
ld b, SPRITE_FACING_DOWN
jr nz, .asm_194e6
- ld a, $4
+ ld a, PLAYER_DIR_DOWN
ld b, SPRITE_FACING_UP
.asm_194e6
- ld [wd528], a
+ ld [wPlayerMovingDirection], a
ld a, b
- ld [wSpriteStateData1 + $29], a
+ ld [wSpriteStateData1 + 2 * $10 + $9], a
call Delay3
ld a, $2
ld [hSpriteIndexOrTextID], a
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index 9b308bd3..fcafa83a 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -54,14 +54,14 @@ CinnabarGymScript0: ; 757ae (1d:57ae)
ld [H_SPRITEINDEX], a
cp $4
jr nz, .asm_757c3
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld de, MovementData_757d7
jr .asm_757cb
.asm_757c3
ld de, MovementData_757da
- ld a, $1
- ld [wd528], a
+ ld a, PLAYER_DIR_RIGHT
+ ld [wPlayerMovingDirection], a
.asm_757cb
call MoveSprite
ld a, $1
diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm
index 70ea25a5..92c0fc6b 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -24,8 +24,8 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
ld a, [W_XCOORD]
cp $12
ret nz
- ld a, $8
- ld [wd528], a
+ ld a, PLAYER_DIR_UP
+ ld [wPlayerMovingDirection], a
ld a, $8
ld [hSpriteIndexOrTextID], a
call DisplayTextID
diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm
index 8a4a0464..c21dde00 100755
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -42,8 +42,8 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
ret nz
ld a, $1
ld [wcf0d], a
- ld a, $1
- ld [wd528], a
+ ld a, PLAYER_DIR_RIGHT
+ ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
@@ -61,8 +61,8 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6)
ld a, [wcf0d]
and a
jr z, .asm_5cde4
- ld a, $1
- ld [wd528], a
+ ld a, PLAYER_DIR_RIGHT
+ ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
diff --git a/scripts/gary.asm b/scripts/gary.asm
index 476a59b0..d01161da 100755
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -139,8 +139,8 @@ GaryScript5: ; 7601a (1d:601a)
ld a, [wd730]
bit 0, a
ret nz
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_LEFT
diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm
index 680ebdd9..bc0d19e1 100755
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@@ -80,19 +80,19 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
- ld a, $1
- ld [wd528], a
+ ld a, PLAYER_DIR_RIGHT
+ ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
call SetSpriteMovementBytesToFF
- ld a, $8
+ ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
call Delay3
xor a
ld [wJoyIgnore], a
- inc a
- ld [wd528], a
+ inc a ; PLAYER_DIR_RIGHT
+ ld [wPlayerMovingDirection], a
ld a, $1
ld [hSpriteIndexOrTextID], a
call DisplayTextID
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 226c2d2d..ae6da40d 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -178,8 +178,8 @@ OaksLabScript6: ; 1cc36 (7:4c36)
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
call StartSimulatingJoypadStates
- ld a, $8
- ld [wd528], a
+ ld a, PLAYER_DIR_UP
+ ld [wPlayerMovingDirection], a
ld a, $7
ld [W_OAKSLABCURSCRIPT], a
@@ -354,8 +354,8 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
- ld a, $8
- ld [wd528], a
+ ld a, PLAYER_DIR_UP
+ ld [wPlayerMovingDirection], a
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
@@ -414,8 +414,8 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
set 7, [hl]
xor a
ld [wJoyIgnore], a
- ld a, $8
- ld [wd528], a
+ ld a, PLAYER_DIR_UP
+ ld [wPlayerMovingDirection], a
ld a, $c
ld [W_OAKSLABCURSCRIPT], a
ret
@@ -423,8 +423,8 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
OaksLabScript12: ; 1ce03 (7:4e03)
ld a, $f0
ld [wJoyIgnore], a
- ld a, $8
- ld [wd528], a
+ ld a, PLAYER_DIR_UP
+ ld [wPlayerMovingDirection], a
call UpdateSprites
ld a, $1
ld [wSpriteIndex], a
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm
index 327a32ff..b463c4d6 100755
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -28,8 +28,8 @@ PalletTownScript0: ; 18e81 (6:4e81)
ret nz
xor a
ld [hJoyHeld],a
- ld a,4
- ld [wd528],a
+ ld a,PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection],a
ld a,$FF
call PlaySound ; stop music
ld a, BANK(Music_MeetProfOak)
@@ -190,8 +190,8 @@ OakAppearsText: ; 18fb0 (6:4fb0)
ld [wEmotionBubbleSpriteIndex],a ; player's sprite
ld [wWhichEmotionBubble],a ; EXCLAMATION_BUBBLE
predef EmotionBubble
- ld a,4
- ld [wd528],a
+ ld a,PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection],a
jp TextScriptEnd
OakWalksUpText: ; 18fce (6:4fce)
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm
index 8520b10b..6a54d549 100755
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -33,15 +33,15 @@ PokemonTower2Script0: ; 6050f (18:450f)
res 6, [hl]
ld a, [wCoordIndex]
cp $1
- ld a, $8
+ ld a, PLAYER_DIR_UP
ld b, SPRITE_FACING_DOWN
jr nz, .asm_60544
ld hl, wd764
set 6, [hl]
- ld a, $2
+ ld a, PLAYER_DIR_LEFT
ld b, SPRITE_FACING_RIGHT
.asm_60544
- ld [wd528], a
+ ld [wPlayerMovingDirection], a
ld a, $1
ld [H_SPRITEINDEX], a
ld a, b
diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm
index 8fcdc66e..2335e6d1 100755
--- a/scripts/redshouse2f.asm
+++ b/scripts/redshouse2f.asm
@@ -11,8 +11,8 @@ RedsHouse2FScriptPointers: ; 5c0bc (17:40bc)
RedsHouse2FScript0: ; 5c0c0 (17:40c0)
xor a
ld [hJoyHeld],a
- ld a,8
- ld [wd528],a
+ ld a,PLAYER_DIR_UP
+ ld [wPlayerMovingDirection],a
ld a,1
ld [W_REDSHOUSE2CURSCRIPT],a
ret
diff --git a/scripts/route22.asm b/scripts/route22.asm
index f125030e..01f8bee8 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -67,8 +67,8 @@ Route22Script0: ; 50f00 (14:4f00)
ld [hJoyHeld], a
ld a, $f0
ld [wJoyIgnore], a
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
ld a, [wd7eb]
bit 0, a ; is this the rival battle at the beginning of the game?
jr nz, .firstRivalBattle
@@ -111,8 +111,8 @@ Route22Script1: ; 50f62 (14:4f62)
ld a, [wcf0d]
cp $1
jr nz, .asm_50f78
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_UP
jr .asm_50f7a
.asm_50f78
@@ -270,13 +270,13 @@ Route22Script4: ; 51087 (14:5087)
ld a, [wcf0d]
cp $1
jr nz, .asm_510a1
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_UP
jr .asm_510a8
.asm_510a1
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_RIGHT
.asm_510a8
ld [hSpriteFacingDirection], a
@@ -314,13 +314,13 @@ Route22Script5: ; 510df (14:50df)
ld a, [wcf0d]
cp $1
jr nz, .asm_510fb
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_UP
jr .asm_51102
.asm_510fb
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_RIGHT
.asm_51102
ld [hSpriteFacingDirection], a
diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm
index 1ccf27af..35f3a020 100755
--- a/scripts/route5gate.asm
+++ b/scripts/route5gate.asm
@@ -22,8 +22,8 @@ Route5GateScript0: ; 1df50 (7:5f50)
ld hl, CoordsData_1df8f
call ArePlayerCoordsInArray
ret nc
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm
index d1aed2df..a4b6149c 100755
--- a/scripts/route6gate.asm
+++ b/scripts/route6gate.asm
@@ -16,8 +16,8 @@ Route6GateScript0: ; 1e04e (7:604e)
ld hl, CoordsData_1e08c
call ArePlayerCoordsInArray
ret nc
- ld a, $1
- ld [wd528], a
+ ld a, PLAYER_DIR_RIGHT
+ ld [wPlayerMovingDirection], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm
index d73dc566..b55f813c 100755
--- a/scripts/route7gate.asm
+++ b/scripts/route7gate.asm
@@ -28,8 +28,8 @@ Route7GateScript0: ; 1e128 (7:6128)
ld hl, CoordsData_1e167
call ArePlayerCoordsInArray
ret nc
- ld a, $8
- ld [wd528], a
+ ld a, PLAYER_DIR_UP
+ ld [wPlayerMovingDirection], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm
index 261a7a1e..96bfa875 100755
--- a/scripts/route8gate.asm
+++ b/scripts/route8gate.asm
@@ -27,8 +27,8 @@ Route8GateScript0: ; 1e1ee (7:61ee)
ld hl, CoordsData_1e22c
call ArePlayerCoordsInArray
ret nc
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm
index 2e5b55f7..ab54dd8a 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -72,8 +72,8 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
ret
.SafariZoneEntranceScript5
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld hl, wd790
bit 6, [hl]
res 6, [hl]
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index b4f94b13..62591476 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -199,7 +199,7 @@ MovementData_62216: ; 62216 (18:6216)
db $FF
SilphCo11Script_6221a: ; 6221a (18:621a)
- ld [wd528], a
+ ld [wPlayerMovingDirection], a
ld a, $3
ld [H_SPRITEINDEX], a
ld a, b
@@ -213,11 +213,11 @@ SilphCo11Script5: ; 62227 (18:6227)
ld a, [wcf0d]
cp $1
jr z, .asm_6223c
- ld a, $2
+ ld a, PLAYER_DIR_LEFT
ld b, SPRITE_FACING_RIGHT
jr .asm_62240
.asm_6223c
- ld a, $8
+ ld a, PLAYER_DIR_UP
ld b, SPRITE_FACING_DOWN
.asm_62240
call SilphCo11Script_6221a
@@ -247,11 +247,11 @@ SilphCo11Script3: ; 6226a (18:626a)
ld a, [wcf0d]
cp $1
jr z, .asm_62284
- ld a, $2
+ ld a, PLAYER_DIR_LEFT
ld b, SPRITE_FACING_RIGHT
jr .asm_62288
.asm_62284
- ld a, $8
+ ld a, PLAYER_DIR_UP
ld b, SPRITE_FACING_DOWN
.asm_62288
call SilphCo11Script_6221a
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 5043b947..78d6e0d7 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -127,8 +127,8 @@ SilphCo7Script0: ; 51c23 (14:5c23)
ld [hJoyHeld], a
ld a, $f0
ld [wJoyIgnore], a
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld a, $ff
ld [wc0ee], a
call PlaySound
@@ -209,8 +209,8 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
ld [wJoyIgnore], a
ld hl, wd82f
set 0, [hl]
- ld a, $4
- ld [wd528], a
+ ld a, PLAYER_DIR_DOWN
+ ld [wPlayerMovingDirection], a
ld a, $9
ld [H_SPRITEINDEX], a
ld a, SPRITE_FACING_UP
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm
index d4651a22..bc13d4b6 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -74,8 +74,8 @@ SSAnne2Script_61416: ; 61416 (18:5416)
ld a, [W_XCOORD]
cp $25
jr nz, .asm_61426
- ld a, $2
- ld [wd528], a
+ ld a, PLAYER_DIR_LEFT
+ ld [wPlayerMovingDirection], a
ld a, SPRITE_FACING_RIGHT
jr .asm_61427
.asm_61426
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 20:09:43 +0000