aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/ChampionsRoom.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-16 17:00:57 -0400
committerGitHub <noreply@github.com>2020-07-16 17:00:57 -0400
commitd44c7c305c3f94b59e3e2c008408779836a0020a (patch)
tree2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/ChampionsRoom.asm
parentMerge pull request #276 from TheFakeMateo/master (diff)
parentDefine constants for audio commands (diff)
downloadpokeyellow-d44c7c305c3f94b59e3e2c008408779836a0020a.tar.gz
pokeyellow-d44c7c305c3f94b59e3e2c008408779836a0020a.tar.xz
pokeyellow-d44c7c305c3f94b59e3e2c008408779836a0020a.zip
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/ChampionsRoom.asm')
-rwxr-xr-xscripts/ChampionsRoom.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index e57048c5..d151bb4d 100755
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -40,10 +40,10 @@ GaryScript1:
ret
GaryEntrance_RLEMovement:
- db D_UP,1
- db D_RIGHT,1
- db D_UP,3
- db $ff
+ db D_UP, 1
+ db D_RIGHT, 1
+ db D_UP, 3
+ db -1 ; end
GaryScript2:
ld a, [wSimulatedJoypadStatesIndex]
@@ -132,7 +132,7 @@ OakEntranceAfterVictoryMovement:
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
- db $FF
+ db -1 ; end
GaryScript5:
ld a, [wd730]
@@ -190,7 +190,7 @@ GaryScript7:
OakExitGaryRoomMovement:
db NPC_MOVEMENT_UP
db NPC_MOVEMENT_UP
- db $FF
+ db -1 ; end
GaryScript8:
ld a, [wd730]
@@ -217,9 +217,9 @@ GaryScript9:
ret
WalkToHallOfFame_RLEMovment:
- db D_UP,4
- db D_LEFT,1
- db $ff
+ db D_UP, 4
+ db D_LEFT, 1
+ db -1 ; end
GaryScript10:
ld a, [wSimulatedJoypadStatesIndex]