diff options
Diffstat (limited to 'scripts/seafoamislands4.asm')
| -rwxr-xr-x | scripts/seafoamislands4.asm | 59 |
1 files changed, 31 insertions, 28 deletions
diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index 7e519f86..f7407e48 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -3,39 +3,39 @@ SeafoamIslands4Script: ; 4658d (11:658d) ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] - jr z, .asm_465dc ; 0x46597 $43 + jr z, .asm_465dc ld hl, Seafoam4HolesCoords call CheckBoulderCoords ret nc - ld hl, wd881 - ld a, [wWhichTrade] + EventFlagAddress hl, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE + ld a, [wCoordIndex] cp $1 - jr nz, .asm_465b8 ; 0x465a8 $e - set 0, [hl] + jr nz, .asm_465b8 + SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 - ld [wd079], a + ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 - ld [wd07a], a - jr .asm_465c4 ; 0x465b6 $c + ld [wObjectToShow], a + jr .asm_465c4 .asm_465b8 - set 1, [hl] + SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 - ld [wd079], a + ld [wObjectToHide], a ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 - ld [wd07a], a + ld [wObjectToShow], a .asm_465c4 - ld a, [wd079] - ld [wcc4d], a + ld a, [wObjectToHide] + ld [wMissableObjectIndex], a predef HideObject - ld a, [wd07a] - ld [wcc4d], a + ld a, [wObjectToShow] + ld [wMissableObjectIndex], a predef ShowObject - jr .asm_465ed ; 0x465da $11 + jr .asm_465ed .asm_465dc ld a, $a2 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam4HolesCoords - call Func_46981 + call IsPlayerOnDungeonWarp ld a, [wd732] bit 4, a ret nz @@ -56,9 +56,7 @@ SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) dw SeafoamIslands4Script3 SeafoamIslands4Script0: ; 46603 (11:6603) - ld a, [wd880] - and $3 - cp $3 + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [W_YCOORD] cp $8 @@ -79,9 +77,9 @@ SeafoamIslands4Script0: ; 46603 (11:6603) ret RLEMovement46632: ; 46632 (11:6632) - db $80,6 - db $10,5 - db $80,3 + db D_DOWN,6 + db D_RIGHT,5 + db D_DOWN,3 db $ff SeafoamIslands4Script1: ; 46639 (11:6639) @@ -93,9 +91,7 @@ SeafoamIslands4Script1: ; 46639 (11:6639) ret SeafoamIslands4Script2: ; 46644 (11:6644) - ld a, [wd880] - and $3 - cp $3 + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [W_XCOORD] cp $12 @@ -124,10 +120,17 @@ SeafoamIslands4Script2: ; 46644 (11:6644) ret RLEData_4667f: ; 4667f (11:667f) - db $80,$06,$10,$02,$80,$04,$20,$01,$FF + db D_DOWN,$06 + db D_RIGHT,$02 + db D_DOWN,$04 + db D_LEFT,$01 + db $FF RLEData_46688: ; 46688 (11:6688) - db $80,$06,$10,$02,$80,$04,$FF + db D_DOWN,$06 + db D_RIGHT,$02 + db D_DOWN,$04 + db $FF SeafoamIslands4Script3: ; 4668f (11:668f) ld a, [wSimulatedJoypadStatesIndex] |