diff options
Diffstat (limited to 'scripts/seafoamislands4.asm')
| -rwxr-xr-x | scripts/seafoamislands4.asm | 101 |
1 files changed, 52 insertions, 49 deletions
diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index 7e519f86..34873004 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -1,69 +1,67 @@ -SeafoamIslands4Script: ; 4658d (11:658d) +SeafoamIslands4Script: call EnableAutoTextBoxDrawing 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 .asm_465ed ld hl, SeafoamIslands4ScriptPointers - ld a, [W_SEAFOAMISLANDS4CURSCRIPT] + ld a, [wSeafoamIslands4CurScript] jp CallFunctionInTable -Seafoam4HolesCoords: ; 465f6 (11:65f6) +Seafoam4HolesCoords: db $10,$03 db $10,$06 db $ff -SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) +SeafoamIslands4ScriptPointers: dw SeafoamIslands4Script0 dw SeafoamIslands4Script1 dw SeafoamIslands4Script2 dw SeafoamIslands4Script3 -SeafoamIslands4Script0: ; 46603 (11:6603) - ld a, [wd880] - and $3 - cp $3 +SeafoamIslands4Script0: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $f ret nz ld hl, wSimulatedJoypadStatesEnd @@ -72,32 +70,30 @@ SeafoamIslands4Script0: ; 46603 (11:6603) dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret -RLEMovement46632: ; 46632 (11:6632) - db $80,6 - db $10,5 - db $80,3 +RLEMovement46632: + db D_DOWN,6 + db D_RIGHT,5 + db D_DOWN,3 db $ff -SeafoamIslands4Script1: ; 46639 (11:6639) +SeafoamIslands4Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret -SeafoamIslands4Script2: ; 46644 (11:6644) - ld a, [wd880] - and $3 - cp $3 +SeafoamIslands4Script2: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 jr z, .asm_4665e cp $13 @@ -116,28 +112,35 @@ SeafoamIslands4Script2: ; 46644 (11:6644) ld [wSpriteStateData2 + $06], a ld hl, wd730 set 7, [hl] - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 2, [hl] ld a, $3 .asm_4667b - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret -RLEData_4667f: ; 4667f (11:667f) - db $80,$06,$10,$02,$80,$04,$20,$01,$FF +RLEData_4667f: + 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 +RLEData_46688: + db D_DOWN,$06 + db D_RIGHT,$02 + db D_DOWN,$04 + db $FF -SeafoamIslands4Script3: ; 4668f (11:668f) +SeafoamIslands4Script3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret -SeafoamIslands4TextPointers: ; 4669a (11:669a) +SeafoamIslands4TextPointers: dw BoulderText dw BoulderText dw BoulderText |