diff options
Diffstat (limited to 'scripts/seafoamislands5.asm')
| -rwxr-xr-x | scripts/seafoamislands5.asm | 119 |
1 files changed, 57 insertions, 62 deletions
diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index b554034b..a233fb6a 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -1,87 +1,83 @@ -SeafoamIslands5Script: ; 46799 (11:6799) +SeafoamIslands5Script: call EnableAutoTextBoxDrawing - ld a, [W_SEAFOAMISLANDS5CURSCRIPT] + ld a, [wSeafoamIslands5CurScript] ld hl, SeafoamIslands5ScriptPointers jp CallFunctionInTable -SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) +SeafoamIslands5Script_467a5: xor a - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ld [wJoyIgnore], a ret -SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) +SeafoamIslands5ScriptPointers: dw SeafoamIslands5Script0 dw SeafoamIslands5Script1 dw SeafoamIslands5Script2 dw SeafoamIslands5Script3 dw SeafoamIslands5Script4 -SeafoamIslands5Script4: ; 467b7 (11:67b7) - ld a, [W_ISINBATTLE] +SeafoamIslands5Script4: + ld a, [wIsInBattle] cp $ff jr z, SeafoamIslands5Script_467a5 call EndTrainerBattle ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret -SeafoamIslands5Script0: ; 467c7 (11:67c7) - ld a, [wd880] - and $3 - cp $3 +SeafoamIslands5Script0: + CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld hl, CoordsData_467fe + ld hl, .Coords call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr nc, .asm_467e6 - ld a, $40 - ld [wccd4], a - ld a, $2 + ld a, NPC_MOVEMENT_UP + ld [wSimulatedJoypadStatesEnd + 1], a + ld a, 2 jr .asm_467e8 .asm_467e6 - ld a, $1 + ld a, 1 .asm_467e8 ld [wSimulatedJoypadStatesIndex], a - ld a, $40 + ld a, D_UP ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret -CoordsData_467fe: ; 467fe (11:67fe) +.Coords db $11,$14 db $11,$15 db $10,$14 db $10,$15 db $FF -SeafoamIslands5Script1: ; 46807 (11:6807) +SeafoamIslands5Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz xor a ld [wJoyIgnore], a ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret -SeafoamIslands5Script2: ; 46816 (11:6816) - ld a, [wd881] - and $3 - cp $3 +SeafoamIslands5Script2: + CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ld a, $0 jr z, .asm_46849 - ld hl, CoordsData_4684d + ld hl, .Coords call ArePlayerCoordsInArray ld a, $0 jr nc, .asm_46849 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_46837 ld de, RLEMovementData_46859 @@ -96,27 +92,27 @@ SeafoamIslands5Script2: ; 46816 (11:6816) call StartSimulatingJoypadStates ld a, $3 .asm_46849 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret -CoordsData_4684d: ; 4684d (11:684d) +.Coords db $0E,$04 db $0E,$05 db $FF -RLEMovementData_46852: ; 46852 (11:6852) - db $40,$03 - db $10,$02 - db $40,$01 +RLEMovementData_46852: + db D_UP,$03 + db D_RIGHT,$02 + db D_UP,$01 db $FF -RLEMovementData_46859: ; 46859 (11:6859) - db $40,$03 - db $10,$03 - db $40,$01 +RLEMovementData_46859: + db D_UP,$03 + db D_RIGHT,$03 + db D_UP,$01 db $FF -SeafoamIslands5Script3: ; 46860 (11:6860) +SeafoamIslands5Script3: ld a, [wSimulatedJoypadStatesIndex] ld b, a cp $1 @@ -125,54 +121,53 @@ SeafoamIslands5Script3: ; 46860 (11:6860) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret -SeaFoamIslands5Script_46872: ; 46872 (11:6872) +SeaFoamIslands5Script_46872: xor a ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a jp ForceBikeOrSurf -SeafoamIslands5TextPointers: ; 4687c (11:687c) +SeafoamIslands5TextPointers: dw BoulderText dw BoulderText - dw SeafoamIslands5Text3 + dw ArticunoText dw SeafoamIslands5Text4 dw SeafoamIslands5Text5 -SeafoamIslands5TrainerHeaders: ; 46886 (11:6886) -SeafoamIslands5TrainerHeader0: ; 46886 (11:6886) - db $2 ; flag's bit +ArticunoTrainerHeader: + dbEventFlagBit EVENT_BEAT_ARTICUNO db ($0 << 4) ; trainer's view range - dw wd882 ; flag's byte - dw SeafoamIslands5BattleText2 ; 0x68a2 TextBeforeBattle - dw SeafoamIslands5BattleText2 ; 0x68a2 TextAfterBattle - dw SeafoamIslands5BattleText2 ; 0x68a2 TextEndBattle - dw SeafoamIslands5BattleText2 ; 0x68a2 TextEndBattle + dwEventFlagAddress EVENT_BEAT_ARTICUNO + dw ArticunoBattleText ; TextBeforeBattle + dw ArticunoBattleText ; TextAfterBattle + dw ArticunoBattleText ; TextEndBattle + dw ArticunoBattleText ; TextEndBattle db $ff -SeafoamIslands5Text3: ; 46893 (11:6893) - db $08 ; asm - ld hl, SeafoamIslands5TrainerHeader0 +ArticunoText: + TX_ASM + ld hl, ArticunoTrainerHeader call TalkToTrainer ld a, $4 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a jp TextScriptEnd -SeafoamIslands5BattleText2: ; 468a2 (11:68a2) - TX_FAR _SeafoamIslands5BattleText2 - db $8 +ArticunoBattleText: + TX_FAR _ArticunoBattleText + TX_ASM ld a, ARTICUNO call PlayCry call WaitForSoundToFinish jp TextScriptEnd -SeafoamIslands5Text4: ; 468b2 (11:68b2) +SeafoamIslands5Text4: TX_FAR _SeafoamIslands5Text4 db "@" -SeafoamIslands5Text5: ; 468b7 (11:68b7) +SeafoamIslands5Text5: TX_FAR _SeafoamIslands5Text5 db "@" |