diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/agatha.asm | 2 | ||||
-rwxr-xr-x | scripts/bruno.asm | 2 | ||||
-rwxr-xr-x | scripts/celadongamecorner.asm | 4 | ||||
-rwxr-xr-x | scripts/lance.asm | 4 | ||||
-rwxr-xr-x | scripts/lorelei.asm | 2 | ||||
-rwxr-xr-x | scripts/mansion1.asm | 4 | ||||
-rwxr-xr-x | scripts/mansion2.asm | 2 | ||||
-rwxr-xr-x | scripts/rockethideout1.asm | 2 | ||||
-rwxr-xr-x | scripts/rockethideout4.asm | 2 | ||||
-rwxr-xr-x | scripts/silphco10.asm | 2 | ||||
-rwxr-xr-x | scripts/silphco11.asm | 2 | ||||
-rwxr-xr-x | scripts/silphco2.asm | 4 | ||||
-rwxr-xr-x | scripts/silphco3.asm | 4 | ||||
-rwxr-xr-x | scripts/silphco4.asm | 4 | ||||
-rwxr-xr-x | scripts/silphco5.asm | 6 | ||||
-rwxr-xr-x | scripts/silphco6.asm | 2 | ||||
-rwxr-xr-x | scripts/silphco7.asm | 6 | ||||
-rwxr-xr-x | scripts/silphco8.asm | 2 | ||||
-rwxr-xr-x | scripts/silphco9.asm | 8 | ||||
-rwxr-xr-x | scripts/vermiliongym.asm | 2 | ||||
-rwxr-xr-x | scripts/victoryroad1.asm | 2 | ||||
-rwxr-xr-x | scripts/victoryroad2.asm | 2 | ||||
-rwxr-xr-x | scripts/victoryroad3.asm | 2 |
23 files changed, 36 insertions, 36 deletions
diff --git a/scripts/agatha.asm b/scripts/agatha.asm index f0607785..60ddf606 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -21,7 +21,7 @@ AgathaScript_76443: ; 76443 (1d:6443) ld a, $3b AgathaScript_76459: ; 76459 (1d:6459) - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $2 predef_jump ReplaceTileBlock diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 1aae7d19..c39656b9 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -21,7 +21,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec) ld a, $24 BrunoScript_76302: ; 76302 (1d:6302) - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $2 predef_jump ReplaceTileBlock diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 48264603..84919b64 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -31,7 +31,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) CheckEvent EVENT_FOUND_ROCKET_HIDEOUT ret nz ld a, $2a - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0208 predef_jump ReplaceTileBlock @@ -451,7 +451,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) call WaitForSoundToFinish SetEvent EVENT_FOUND_ROCKET_HIDEOUT ld a, $43 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0208 predef ReplaceTileBlock jp TextScriptEnd diff --git a/scripts/lance.asm b/scripts/lance.asm index 4d0072be..9fa621da 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -24,12 +24,12 @@ LanceScript_5a2c4: ; 5a2c4 (16:62c4) LanceScript_5a2de: ; 5a2de (16:62de) push bc - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $602 call LanceScript_5a2f0 pop bc ld a, b - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $603 LanceScript_5a2f0: ; 5a2f0 (16:62f0) diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 4a245d93..3c639d1e 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -22,7 +22,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) .asm_761a9 ld a, $24 .asm_761ab - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $2 predef_jump ReplaceTileBlock diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 7d349276..88bdd3ed 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -35,12 +35,12 @@ Mansion1Subscript1: ; 442c5 (11:42c5) Mansion1Script_44304: ; 44304 (11:4304) ld a, $2d - ld [wd09f], a + ld [wNewTileBlockID], a jr Mansion1ReplaceBlock Mansion1Script_4430b: ; 4430b (11:430b) ld a, $e - ld [wd09f], a + ld [wNewTileBlockID], a Mansion1ReplaceBlock: ; 44310 (11:4310) predef ReplaceTileBlock ret diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 4f5aac9f..cb697b94 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -38,7 +38,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee) ret Mansion2Script_5202f: ; 5202f (14:602f) - ld [wd09f], a + ld [wNewTileBlockID], a predef_jump ReplaceTileBlock Mansion2Script_Switches: ; 52037 (14:6037) diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index ccf40cb4..c658596e 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -26,7 +26,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) .asm_44c01 ld a, $e .asm_44c03 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $080c predef_jump ReplaceTileBlock diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 3c312d4c..ed2bb61d 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -26,7 +26,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473) .asm_45496 ld a, $e .asm_45498 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $050c predef_jump ReplaceTileBlock diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 326b0aeb..fb419a22 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -19,7 +19,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) CheckEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret nz ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $405 predef_jump ReplaceTileBlock diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 8f37b57f..5de025f0 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -19,7 +19,7 @@ SilphCo11Script_62110: ; 62110 (18:6110) CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret nz ld a, $20 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $603 predef_jump ReplaceTileBlock diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index a8d0fa56..b758455e 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -20,7 +20,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) jr nz, .asm_59d2e push af ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0202 predef ReplaceTileBlock pop af @@ -28,7 +28,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) CheckEventAfterBranchReuseA EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret nz ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0502 predef_jump ReplaceTileBlock diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index b55cc5eb..f693ea33 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -20,7 +20,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) jr nz, .asm_59f98 push af ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $404 predef ReplaceTileBlock pop af @@ -28,7 +28,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) CheckEventAfterBranchReuseA EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret nz ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $408 predef_jump ReplaceTileBlock diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 815170ff..0ea2c8c8 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -20,7 +20,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) jr nz, .asm_19d48 push af ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0602 predef ReplaceTileBlock pop af @@ -28,7 +28,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) CheckEventAfterBranchReuseA EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret nz ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0406 predef_jump ReplaceTileBlock diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index ecc57537..d6f35993 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -20,7 +20,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) jr nz, .asm_19f74 push af ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0203 predef ReplaceTileBlock pop af @@ -29,7 +29,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) jr nz, .asm_19f87 push af ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0603 predef ReplaceTileBlock pop af @@ -37,7 +37,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) CheckEventAfterBranchReuseA EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR2 ret nz ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0507 predef_jump ReplaceTileBlock diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index a84f0dc4..25fbcef9 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -19,7 +19,7 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret nz ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $0602 predef_jump ReplaceTileBlock diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 26d9e62f..7169f0c0 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -20,7 +20,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) jr nz, .asm_51b9e push af ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $305 predef ReplaceTileBlock pop af @@ -29,7 +29,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) jr nz, .asm_51bb1 push af ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $20a predef ReplaceTileBlock pop af @@ -37,7 +37,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) CheckEventAfterBranchReuseA EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR2 ret nz ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $60a predef_jump ReplaceTileBlock diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 26a89355..7545f359 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -19,7 +19,7 @@ SilphCo8Script_5651a: ; 5651a (15:651a) CheckEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret nz ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $403 predef_jump ReplaceTileBlock diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 8960c290..557ce1f1 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -20,7 +20,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) jr nz, .asm_5d7f8 push af ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $401 predef ReplaceTileBlock pop af @@ -29,7 +29,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) jr nz, .asm_5d80b push af ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $209 predef ReplaceTileBlock pop af @@ -38,7 +38,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) jr nz, .asm_5d81e push af ld a, $54 - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $509 predef ReplaceTileBlock pop af @@ -46,7 +46,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) CheckEventAfterBranchReuseA EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR3 ret nz ld a, $5f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $605 predef_jump ReplaceTileBlock diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 8c400b5f..0282e340 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -37,7 +37,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) call PlaySound ld a, $5 .asm_5ca7f - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $202 predef_jump ReplaceTileBlock diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 91e20ad3..dbb69a64 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -14,7 +14,7 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret z ld a, $1d - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $604 predef_jump ReplaceTileBlock diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index b7aa40b5..41fe0212 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -33,7 +33,7 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) ld bc, $70b VictoryRoad2Script_517e2: ; 517e2 (14:57e2) - ld [wd09f], a + ld [wNewTileBlockID], a predef ReplaceTileBlock ret diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 2984e4ae..33a29e44 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -16,7 +16,7 @@ VictoryRoad3Script_44996: ; 44996 (11:4996) CheckEventHL EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ret z ld a, $1d - ld [wd09f], a + ld [wNewTileBlockID], a ld bc, $503 predef_jump ReplaceTileBlock |