aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SeafoamIslandsB3F.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/SeafoamIslandsB3F.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/SeafoamIslandsB3F.asm')
-rwxr-xr-xscripts/SeafoamIslandsB3F.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm
index 7d0e032b..d735f824 100755
--- a/scripts/SeafoamIslandsB3F.asm
+++ b/scripts/SeafoamIslandsB3F.asm
@@ -45,9 +45,9 @@ SeafoamIslandsB3F_Script:
jp CallFunctionInTable
Seafoam4HolesCoords:
- db $10,$03
- db $10,$06
- db $ff
+ dbmapcoord 3, 16
+ dbmapcoord 6, 16
+ db -1 ; end
SeafoamIslandsB3F_ScriptPointers:
dw SeafoamIslands4Script0
@@ -77,10 +77,10 @@ SeafoamIslands4Script0:
ret
RLEMovement46632:
- db D_DOWN,6
- db D_RIGHT,5
- db D_DOWN,3
- db $ff
+ db D_DOWN, 6
+ db D_RIGHT, 5
+ db D_DOWN, 3
+ db -1 ; end
SeafoamIslands4Script1:
ld a, [wSimulatedJoypadStatesIndex]
@@ -120,17 +120,17 @@ SeafoamIslands4Script2:
ret
RLEData_4667f:
- db D_DOWN,$06
- db D_RIGHT,$02
- db D_DOWN,$04
- db D_LEFT,$01
- db $FF
+ db D_DOWN, 6
+ db D_RIGHT, 2
+ db D_DOWN, 4
+ db D_LEFT, 1
+ db -1 ; end
RLEData_46688:
- db D_DOWN,$06
- db D_RIGHT,$02
- db D_DOWN,$04
- db $FF
+ db D_DOWN, 6
+ db D_RIGHT, 2
+ db D_DOWN, 4
+ db -1 ; end
SeafoamIslands4Script3:
ld a, [wSimulatedJoypadStatesIndex]