summaryrefslogtreecommitdiff
path: root/scripts/seafoamislands5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/seafoamislands5.asm')
-rwxr-xr-xscripts/seafoamislands5.asm35
1 files changed, 17 insertions, 18 deletions
diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm
index af1672a7..478946fa 100755
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -8,7 +8,7 @@ SeafoamIslands5Script_467a5:
xor a
ld [wJoyIgnore], a
ld [wSeafoamIslands5CurScript], a
- ld [W_CURMAPSCRIPT], a
+ ld [wCurMapScript], a
ret
SeafoamIslands5ScriptPointers:
@@ -30,7 +30,7 @@ SeafoamIslands5Script4:
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, [wCoordIndex]
@@ -53,7 +53,7 @@ SeafoamIslands5Script0:
ld [wSeafoamIslands5CurScript], a
ret
-CoordsData_467fe:
+.Coords
db $11,$14
db $11,$15
db $10,$14
@@ -74,7 +74,7 @@ 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
@@ -96,7 +96,7 @@ SeafoamIslands5Script2:
ld [wSeafoamIslands5CurScript], a
ret
-CoordsData_4684d:
+.Coords
db $0E,$04
db $0E,$05
db $FF
@@ -134,32 +134,31 @@ SeaFoamIslands5Script_46872:
SeafoamIslands5TextPointers:
dw BoulderText
dw BoulderText
- dw SeafoamIslands5Text3
+ dw ArticunoText
dw SeafoamIslands5Text4
dw SeafoamIslands5Text5
-SeafoamIslands5TrainerHeaders:
-SeafoamIslands5TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0
+ArticunoTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_ARTICUNO
db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0
- dw SeafoamIslands5BattleText2 ; TextBeforeBattle
- dw SeafoamIslands5BattleText2 ; TextAfterBattle
- dw SeafoamIslands5BattleText2 ; TextEndBattle
- dw SeafoamIslands5BattleText2 ; TextEndBattle
+ dwEventFlagAddress EVENT_BEAT_ARTICUNO
+ dw ArticunoBattleText ; TextBeforeBattle
+ dw ArticunoBattleText ; TextAfterBattle
+ dw ArticunoBattleText ; TextEndBattle
+ dw ArticunoBattleText ; TextEndBattle
db $ff
-SeafoamIslands5Text3:
+ArticunoText:
TX_ASM
- ld hl, SeafoamIslands5TrainerHeader0
+ ld hl, ArticunoTrainerHeader
call TalkToTrainer
ld a, $4
ld [wSeafoamIslands5CurScript], a
jp TextScriptEnd
-SeafoamIslands5BattleText2:
- TX_FAR _SeafoamIslands5BattleText2
+ArticunoBattleText:
+ TX_FAR _ArticunoBattleText
TX_ASM
ld a, ARTICUNO
call PlayCry