summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconstants/event_constants.asm24
-rwxr-xr-xscripts/powerplant.asm124
-rwxr-xr-xscripts/seafoamislands1.asm6
-rwxr-xr-xscripts/seafoamislands2.asm6
-rwxr-xr-xscripts/seafoamislands3.asm6
-rwxr-xr-xscripts/seafoamislands4.asm22
-rwxr-xr-xscripts/seafoamislands5.asm61
-rwxr-xr-xscripts/unknowndungeon1.asm4
-rwxr-xr-xscripts/unknowndungeon2.asm4
-rwxr-xr-xscripts/unknowndungeon3.asm34
-rwxr-xr-xscripts/victoryroad1.asm32
-rwxr-xr-xscripts/victoryroad2.asm92
-rwxr-xr-xscripts/victoryroad3.asm54
-rw-r--r--text/maps/seafoam_islands_b4f.asm2
-rw-r--r--text/maps/unknown_dungeon_b1f.asm2
-rw-r--r--text/maps/victory_road_2f.asm2
16 files changed, 237 insertions, 238 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index f284c967..47448d09 100755
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -1121,15 +1121,15 @@ const_value = 0
const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45E, (D7D2, bit 6)
const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 ; 45F, (D7D2, bit 7)
const EVENT_460 ; 460, (D7D3, bit 0)
- const EVENT_BEAT_POWER_PLANT_TRAINER_0 ; 461, (D7D3, bit 1)
- const EVENT_BEAT_POWER_PLANT_TRAINER_1 ; 462, (D7D3, bit 2)
- const EVENT_BEAT_POWER_PLANT_TRAINER_2 ; 463, (D7D3, bit 3)
- const EVENT_BEAT_POWER_PLANT_TRAINER_3 ; 464, (D7D3, bit 4)
- const EVENT_BEAT_POWER_PLANT_TRAINER_4 ; 465, (D7D3, bit 5)
- const EVENT_BEAT_POWER_PLANT_TRAINER_5 ; 466, (D7D3, bit 6)
- const EVENT_BEAT_POWER_PLANT_TRAINER_6 ; 467, (D7D3, bit 7)
- const EVENT_BEAT_POWER_PLANT_TRAINER_7 ; 468, (D7D4, bit 0)
- const EVENT_BEAT_POWER_PLANT_TRAINER_8 ; 469, (D7D4, bit 1)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_2 ; 463, (D7D3, bit 3)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_3 ; 464, (D7D3, bit 4)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_4 ; 465, (D7D3, bit 5)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_5 ; 466, (D7D3, bit 6)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_6 ; 467, (D7D3, bit 7)
+ const EVENT_BEAT_POWER_PLANT_VOLTORB_7 ; 468, (D7D4, bit 0)
+ const EVENT_BEAT_ZAPDOS ; 469, (D7D4, bit 1)
const EVENT_46A ; 46A, (D7D4, bit 2)
const EVENT_46B ; 46B, (D7D4, bit 3)
const EVENT_46C ; 46C, (D7D4, bit 4)
@@ -1342,7 +1342,7 @@ const_value = 0
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53B, (D7EE, bit 3)
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53C, (D7EE, bit 4)
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 ; 53D, (D7EE, bit 5)
- const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 ; 53E, (D7EE, bit 6)
+ const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6)
const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7)
const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0)
const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1)
@@ -2241,7 +2241,7 @@ const_value = 0
const EVENT_8BE ; 8BE, (D85E, bit 6)
const EVENT_8BF ; 8BF, (D85E, bit 7)
const EVENT_8C0 ; 8C0, (D85F, bit 0)
- const EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 ; 8C1, (D85F, bit 1)
+ const EVENT_BEAT_MEWTWO ; 8C1, (D85F, bit 1)
const EVENT_8C2 ; 8C2, (D85F, bit 2)
const EVENT_8C3 ; 8C3, (D85F, bit 3)
const EVENT_8C4 ; 8C4, (D85F, bit 4)
@@ -2522,7 +2522,7 @@ const_value = 0
const EVENT_9D7 ; 9D7, (D881, bit 7)
const EVENT_9D8 ; 9D8, (D882, bit 0)
const EVENT_9D9 ; 9D9, (D882, bit 1)
- const EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 ; 9DA, (D882, bit 2)
+ const EVENT_BEAT_ARTICUNO ; 9DA, (D882, bit 2)
const EVENT_9DB ; 9DB, (D882, bit 3)
const EVENT_9DC ; 9DC, (D882, bit 4)
const EVENT_9DD ; 9DD, (D882, bit 5)
diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm
index 1470a091..c7a5625f 100755
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@@ -1,110 +1,110 @@
-PowerPlantScript: ; 1e2c6 (7:62c6)
+PowerPlantScript:
call EnableAutoTextBoxDrawing
ld hl, PowerPlantTrainerHeaders
- ld de, PowerPlantScriptPointers
+ ld de, .ScriptPointers
ld a, [wPowerPlantCurScript]
call ExecuteCurMapScriptInTable
ld [wPowerPlantCurScript], a
ret
-PowerPlantScriptPointers: ; 1e2d9 (7:62d9)
+.ScriptPointers
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-PowerPlantTextPointers: ; 1e2df (7:62df)
- dw PowerPlantText1
- dw PowerPlantText2
- dw PowerPlantText3
- dw PowerPlantText4
- dw PowerPlantText5
- dw PowerPlantText6
- dw PowerPlantText7
- dw PowerPlantText8
- dw PowerPlantText9
+PowerPlantTextPointers:
+ dw Voltorb0Text
+ dw Voltorb1Text
+ dw Voltorb2Text
+ dw Voltorb3Text
+ dw Voltorb4Text
+ dw Voltorb5Text
+ dw Voltorb6Text
+ dw Voltorb7Text
+ dw ZapdosText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
-PowerPlantTrainerHeaders: ; 1e2fb (7:62fb)
-PowerPlantTrainerHeader0: ; 1e2fb (7:62fb)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0
+PowerPlantTrainerHeaders:
+Voltorb0TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader1: ; 1e307 (7:6307)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1
+Voltorb1TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader2: ; 1e313 (7:6313)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2
+Voltorb2TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader3: ; 1e31f (7:631f)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3
+Voltorb3TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader4: ; 1e32b (7:632b)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4
+Voltorb4TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader5: ; 1e337 (7:6337)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5
+Voltorb5TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader6: ; 1e343 (7:6343)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6
+Voltorb6TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader7: ; 1e34f (7:634f)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
+Voltorb7TrainerHeader:
+ dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
+ dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
dw VoltorbBattleText ; TextEndBattle
-PowerPlantTrainerHeader8: ; 1e35b (7:635b)
- dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
+ZapdosTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_ZAPDOS, 1
db 0 ; view range
- dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
+ dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1
dw ZapdosBattleText ; TextBeforeBattle
dw ZapdosBattleText ; TextAfterBattle
dw ZapdosBattleText ; TextEndBattle
@@ -112,62 +112,62 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b)
db $ff
-InitVoltorbBattle: ; 1e368 (7:6368)
+InitVoltorbBattle:
call TalkToTrainer
ld a, [wCurMapScript]
ld [wPowerPlantCurScript], a
jp TextScriptEnd
-PowerPlantText1: ; 1e374 (7:6374)
+Voltorb0Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader0
+ ld hl, Voltorb0TrainerHeader
jr InitVoltorbBattle
-PowerPlantText2: ; 1e37a (7:637a)
+Voltorb1Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader1
+ ld hl, Voltorb1TrainerHeader
jr InitVoltorbBattle
-PowerPlantText3: ; 1e380 (7:6380)
+Voltorb2Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader2
+ ld hl, Voltorb2TrainerHeader
jr InitVoltorbBattle
-PowerPlantText4: ; 1e386 (7:6386)
+Voltorb3Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader3
+ ld hl, Voltorb3TrainerHeader
jr InitVoltorbBattle
-PowerPlantText5: ; 1e38c (7:638c)
+Voltorb4Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader4
+ ld hl, Voltorb4TrainerHeader
jr InitVoltorbBattle
-PowerPlantText6: ; 1e392 (7:6392)
+Voltorb5Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader5
+ ld hl, Voltorb5TrainerHeader
jr InitVoltorbBattle
-PowerPlantText7: ; 1e398 (7:6398)
+Voltorb6Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader6
+ ld hl, Voltorb6TrainerHeader
jr InitVoltorbBattle
-PowerPlantText8: ; 1e39e (7:639e)
+Voltorb7Text:
TX_ASM
- ld hl, PowerPlantTrainerHeader7
+ ld hl, Voltorb7TrainerHeader
jr InitVoltorbBattle
-PowerPlantText9: ; 1e3a4 (7:63a4)
+ZapdosText:
TX_ASM
- ld hl, PowerPlantTrainerHeader8
+ ld hl, ZapdosTrainerHeader
jr InitVoltorbBattle
-VoltorbBattleText: ; 1e3aa (7:63aa)
+VoltorbBattleText:
TX_FAR _VoltorbBattleText
db "@"
-ZapdosBattleText: ; 1e3af (7:63af)
+ZapdosBattleText:
TX_FAR _ZapdosBattleText
TX_ASM
ld a, ZAPDOS
diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm
index f9a2e7fc..52561fa7 100755
--- a/scripts/seafoamislands1.asm
+++ b/scripts/seafoamislands1.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1Script: ; 447e9 (11:47e9)
+SeafoamIslands1Script:
call EnableAutoTextBoxDrawing
SetEvent EVENT_IN_SEAFOAM_ISLANDS
ld hl, wFlags_0xcd60
@@ -37,11 +37,11 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
ld hl, Seafoam1HolesCoords
jp IsPlayerOnDungeonWarp
-Seafoam1HolesCoords: ; 44846 (11:4846)
+Seafoam1HolesCoords:
db $06,$11
db $06,$18
db $ff
-SeafoamIslands1TextPointers: ; 4484b (11:484b)
+SeafoamIslands1TextPointers:
dw BoulderText
dw BoulderText
diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm
index 2c2962f8..50024bad 100755
--- a/scripts/seafoamislands2.asm
+++ b/scripts/seafoamislands2.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2Script: ; 46315 (11:6315)
+SeafoamIslands2Script:
call EnableAutoTextBoxDrawing
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -36,11 +36,11 @@ SeafoamIslands2Script: ; 46315 (11:6315)
ld hl, Seafoam2HolesCoords
jp IsPlayerOnDungeonWarp
-Seafoam2HolesCoords: ; 4636d (11:636d)
+Seafoam2HolesCoords:
db $06,$12
db $06,$17
db $ff
-SeafoamIslands2TextPointers: ; 46372 (11:6372)
+SeafoamIslands2TextPointers:
dw BoulderText
dw BoulderText
diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm
index 6dda7f37..4a7848a4 100755
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3Script: ; 46451 (11:6451)
+SeafoamIslands3Script:
call EnableAutoTextBoxDrawing
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -36,11 +36,11 @@ SeafoamIslands3Script: ; 46451 (11:6451)
ld hl, Seafoam3HolesCoords
jp IsPlayerOnDungeonWarp
-Seafoam3HolesCoords: ; 464a9 (11:64a9)
+Seafoam3HolesCoords:
db $06,$13
db $06,$16
db $ff
-SeafoamIslands3TextPointers: ; 464ae (11:64ae)
+SeafoamIslands3TextPointers:
dw BoulderText
dw BoulderText
diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm
index e3234b0a..34873004 100755
--- a/scripts/seafoamislands4.asm
+++ b/scripts/seafoamislands4.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4Script: ; 4658d (11:658d)
+SeafoamIslands4Script:
call EnableAutoTextBoxDrawing
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -44,18 +44,18 @@ SeafoamIslands4Script: ; 4658d (11:658d)
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)
+SeafoamIslands4Script0:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z
ld a, [wYCoord]
@@ -76,13 +76,13 @@ SeafoamIslands4Script0: ; 46603 (11:6603)
ld [wSeafoamIslands4CurScript], a
ret
-RLEMovement46632: ; 46632 (11:6632)
+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
@@ -90,7 +90,7 @@ SeafoamIslands4Script1: ; 46639 (11:6639)
ld [wSeafoamIslands4CurScript], a
ret
-SeafoamIslands4Script2: ; 46644 (11:6644)
+SeafoamIslands4Script2:
CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
ret z
ld a, [wXCoord]
@@ -119,20 +119,20 @@ SeafoamIslands4Script2: ; 46644 (11:6644)
ld [wSeafoamIslands4CurScript], a
ret
-RLEData_4667f: ; 4667f (11:667f)
+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)
+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
@@ -140,7 +140,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f)
ld [wSeafoamIslands4CurScript], a
ret
-SeafoamIslands4TextPointers: ; 4669a (11:669a)
+SeafoamIslands4TextPointers:
dw BoulderText
dw BoulderText
dw BoulderText
diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm
index 98c27666..a233fb6a 100755
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -1,23 +1,23 @@
-SeafoamIslands5Script: ; 46799 (11:6799)
+SeafoamIslands5Script:
call EnableAutoTextBoxDrawing
ld a, [wSeafoamIslands5CurScript]
ld hl, SeafoamIslands5ScriptPointers
jp CallFunctionInTable
-SeafoamIslands5Script_467a5: ; 467a5 (11:67a5)
+SeafoamIslands5Script_467a5:
xor 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)
+SeafoamIslands5Script4:
ld a, [wIsInBattle]
cp $ff
jr z, SeafoamIslands5Script_467a5
@@ -26,10 +26,10 @@ SeafoamIslands5Script4: ; 467b7 (11:67b7)
ld [wSeafoamIslands5CurScript], a
ret
-SeafoamIslands5Script0: ; 467c7 (11:67c7)
+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]
@@ -52,14 +52,14 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
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
@@ -69,11 +69,11 @@ SeafoamIslands5Script1: ; 46807 (11:6807)
ld [wSeafoamIslands5CurScript], a
ret
-SeafoamIslands5Script2: ; 46816 (11:6816)
+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
@@ -95,24 +95,24 @@ SeafoamIslands5Script2: ; 46816 (11:6816)
ld [wSeafoamIslands5CurScript], a
ret
-CoordsData_4684d: ; 4684d (11:684d)
+.Coords
db $0E,$04
db $0E,$05
db $FF
-RLEMovementData_46852: ; 46852 (11:6852)
+RLEMovementData_46852:
db D_UP,$03
db D_RIGHT,$02
db D_UP,$01
db $FF
-RLEMovementData_46859: ; 46859 (11:6859)
+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
@@ -124,51 +124,50 @@ SeafoamIslands5Script3: ; 46860 (11:6860)
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)
- 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: ; 46893 (11:6893)
+ArticunoText:
TX_ASM
- ld hl, SeafoamIslands5TrainerHeader0
+ ld hl, ArticunoTrainerHeader
call TalkToTrainer
ld a, $4
ld [wSeafoamIslands5CurScript], a
jp TextScriptEnd
-SeafoamIslands5BattleText2: ; 468a2 (11:68a2)
- TX_FAR _SeafoamIslands5BattleText2
+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 "@"
diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm
index 696ddafa..9d7f120e 100755
--- a/scripts/unknowndungeon1.asm
+++ b/scripts/unknowndungeon1.asm
@@ -1,7 +1,7 @@
-UnknownDungeon1Script: ; 74d0c (1d:4d0c)
+UnknownDungeon1Script:
jp EnableAutoTextBoxDrawing
-UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f)
+UnknownDungeon1TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm
index f3cbb6a5..3ed00a45 100755
--- a/scripts/unknowndungeon2.asm
+++ b/scripts/unknowndungeon2.asm
@@ -1,7 +1,7 @@
-UnknownDungeon2Script: ; 45e0b (11:5e0b)
+UnknownDungeon2Script:
jp EnableAutoTextBoxDrawing
-UnknownDungeon2TextPointers: ; 45e0e (11:5e0e)
+UnknownDungeon2TextPointers:
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm
index c5818032..2790694b 100755
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@@ -1,42 +1,42 @@
-UnknownDungeon3Script: ; 45ef0 (11:5ef0)
+UnknownDungeon3Script:
call EnableAutoTextBoxDrawing
ld hl, UnknownDungeon3TrainerHeaders
- ld de, UnknownDungeon3ScriptPointers
+ ld de, .ScriptPointers
ld a, [wUnknownDungeon3CurScript]
call ExecuteCurMapScriptInTable
ld [wUnknownDungeon3CurScript], a
ret
-UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03)
+.ScriptPointers
dw CheckFightingMapTrainers
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-UnknownDungeon3TextPointers: ; 45f09 (11:5f09)
- dw UnknownDungeon3Text1
+UnknownDungeon3TextPointers:
+ dw MewtwoText
dw PickUpItemText
dw PickUpItemText
-UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f)
-UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f)
- dbEventFlagBit EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0
+UnknownDungeon3TrainerHeaders:
+MewtwoTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_MEWTWO
db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0
- dw UnknownDungeon3MewtwoText ; TextBeforeBattle
- dw UnknownDungeon3MewtwoText ; TextAfterBattle
- dw UnknownDungeon3MewtwoText ; TextEndBattle
- dw UnknownDungeon3MewtwoText ; TextEndBattle
+ dwEventFlagAddress EVENT_BEAT_MEWTWO
+ dw MewtwoBattleText ; TextBeforeBattle
+ dw MewtwoBattleText ; TextAfterBattle
+ dw MewtwoBattleText ; TextEndBattle
+ dw MewtwoBattleText ; TextEndBattle
db $ff
-UnknownDungeon3Text1: ; 45f1c (11:5f1c)
+MewtwoText:
TX_ASM
- ld hl, UnknownDungeon3TrainerHeader0
+ ld hl, MewtwoTrainerHeader
call TalkToTrainer
jp TextScriptEnd
-UnknownDungeon3MewtwoText: ; 45f26 (11:5f26)
- TX_FAR _UnknownDungeon3MewtwoText
+MewtwoBattleText:
+ TX_FAR _MewtwoBattleText
TX_ASM
ld a, MEWTWO
call PlayCry
diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm
index af0c3c3e..8ec6725b 100755
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -1,4 +1,4 @@
-VictoryRoad1Script: ; 5da0a (17:5a0a)
+VictoryRoad1Script:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -18,12 +18,12 @@ VictoryRoad1Script: ; 5da0a (17:5a0a)
lb bc, 6, 4
predef_jump ReplaceTileBlock
-VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a)
+VictoryRoad1ScriptPointers:
dw VictoryRoad1Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-VictoryRoad1Script0: ; 5da40 (17:5a40)
+VictoryRoad1Script0:
CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_5da5c
@@ -34,10 +34,10 @@ VictoryRoad1Script0: ; 5da40 (17:5a40)
SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
ret
-CoordsData_5da5c: ; 5da5c (17:5a5c)
+CoordsData_5da5c:
db $0D,$11,$FF
-VictoryRoad1TextPointers: ; 5da5f (17:5a5f)
+VictoryRoad1TextPointers:
dw VictoryRoad1Text1
dw VictoryRoad1Text2
dw PickUpItemText
@@ -46,8 +46,8 @@ VictoryRoad1TextPointers: ; 5da5f (17:5a5f)
dw BoulderText
dw BoulderText
-VictoryRoad1TrainerHeaders: ; 5da6d (17:5a6d)
-VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d)
+VictoryRoad1TrainerHeaders:
+VictoryRoad1TrainerHeader0:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
@@ -56,7 +56,7 @@ VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d)
dw VictoryRoad1EndBattleText1 ; TextEndBattle
dw VictoryRoad1EndBattleText1 ; TextEndBattle
-VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79)
+VictoryRoad1TrainerHeader1:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
db ($2 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1
@@ -67,38 +67,38 @@ VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79)
db $ff
-VictoryRoad1Text1: ; 5da86 (17:5a86)
+VictoryRoad1Text1:
TX_ASM
ld hl, VictoryRoad1TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad1Text2: ; 5da90 (17:5a90)
+VictoryRoad1Text2:
TX_ASM
ld hl, VictoryRoad1TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad1BattleText1: ; 5da9a (17:5a9a)
+VictoryRoad1BattleText1:
TX_FAR _VictoryRoad1BattleText1
db "@"
-VictoryRoad1EndBattleText1: ; 5da9f (17:5a9f)
+VictoryRoad1EndBattleText1:
TX_FAR _VictoryRoad1EndBattleText1
db "@"
-VictoryRoad1AfterBattleText1: ; 5daa4 (17:5aa4)
+VictoryRoad1AfterBattleText1:
TX_FAR _VictoryRoad1AfterBattleText1
db "@"
-VictoryRoad1BattleText2: ; 5daa9 (17:5aa9)
+VictoryRoad1BattleText2:
TX_FAR _VictoryRoad1BattleText2
db "@"
-VictoryRoad1EndBattleText2: ; 5daae (17:5aae)
+VictoryRoad1EndBattleText2:
TX_FAR _VictoryRoad1EndBattleText2
db "@"
-VictoryRoad1AfterBattleText2: ; 5dab3 (17:5ab3)
+VictoryRoad1AfterBattleText2:
TX_FAR _VictoryRoad1AfterBattleText2
db "@"
diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm
index c1fc6dc7..5a3413ee 100755
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -1,4 +1,4 @@
-VictoryRoad2Script: ; 5179d (14:579d)
+VictoryRoad2Script:
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
@@ -15,10 +15,10 @@ VictoryRoad2Script: ; 5179d (14:579d)
ld [wVictoryRoad2CurScript], a
ret
-VictoryRoad2Script_517c4: ; 517c4 (14:57c4)
+VictoryRoad2Script_517c4:
ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
-VictoryRoad2Script_517c9: ; 517c9 (14:57c9)
+VictoryRoad2Script_517c9:
CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1
jr z, .asm_517da
push af
@@ -32,17 +32,17 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9)
ld a, $1d
lb bc, 7, 11
-VictoryRoad2Script_517e2: ; 517e2 (14:57e2)
+VictoryRoad2Script_517e2:
ld [wNewTileBlockID], a
predef ReplaceTileBlock
ret
-VictoryRoad2ScriptPointers: ; 517eb (14:57eb)
+VictoryRoad2ScriptPointers:
dw VictoryRoad2Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-VictoryRoad2Script0: ; 517f1 (14:57f1)
+VictoryRoad2Script0:
ld hl, CoordsData_51816
call CheckBoulderCoords
jp nc, CheckFightingMapTrainers
@@ -63,18 +63,18 @@ VictoryRoad2Script0: ; 517f1 (14:57f1)
set 5, [hl]
ret
-CoordsData_51816: ; 51816 (14:5816)
+CoordsData_51816:
db $10,$01
db $10,$09
db $FF
-VictoryRoad2TextPointers: ; 5181b (14:581b)
+VictoryRoad2TextPointers:
dw VictoryRoad2Text1
dw VictoryRoad2Text2
dw VictoryRoad2Text3
dw VictoryRoad2Text4
dw VictoryRoad2Text5
- dw VictoryRoad2Text6
+ dw MoltresText
dw PickUpItemText
dw PickUpItemText
dw PickUpItemText
@@ -83,8 +83,8 @@ VictoryRoad2TextPointers: ; 5181b (14:581b)
dw BoulderText
dw BoulderText
-VictoryRoad2TrainerHeaders: ; 51835 (14:5835)
-VictoryRoad2TrainerHeader0: ; 51835 (14:5835)
+VictoryRoad2TrainerHeaders:
+VictoryRoad2TrainerHeader0:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
@@ -93,7 +93,7 @@ VictoryRoad2TrainerHeader0: ; 51835 (14:5835)
dw VictoryRoad2EndBattleText1 ; TextEndBattle
dw VictoryRoad2EndBattleText1 ; TextEndBattle
-VictoryRoad2TrainerHeader2: ; 51841 (14:5841)
+VictoryRoad2TrainerHeader2:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
@@ -102,7 +102,7 @@ VictoryRoad2TrainerHeader2: ; 51841 (14:5841)
dw VictoryRoad2EndBattleText2 ; TextEndBattle
dw VictoryRoad2EndBattleText2 ; TextEndBattle
-VictoryRoad2TrainerHeader3: ; 5184d (14:584d)
+VictoryRoad2TrainerHeader3:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
@@ -111,7 +111,7 @@ VictoryRoad2TrainerHeader3: ; 5184d (14:584d)
dw VictoryRoad2EndBattleText3 ; TextEndBattle
dw VictoryRoad2EndBattleText3 ; TextEndBattle
-VictoryRoad2TrainerHeader4: ; 51859 (14:5859)
+VictoryRoad2TrainerHeader4:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
db ($1 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
@@ -120,7 +120,7 @@ VictoryRoad2TrainerHeader4: ; 51859 (14:5859)
dw VictoryRoad2EndBattleText4 ; TextEndBattle
dw VictoryRoad2EndBattleText4 ; TextEndBattle
-VictoryRoad2TrainerHeader5: ; 51865 (14:5865)
+VictoryRoad2TrainerHeader5:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
db ($3 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
@@ -129,117 +129,117 @@ VictoryRoad2TrainerHeader5: ; 51865 (14:5865)
dw VictoryRoad2EndBattleText5 ; TextEndBattle
dw VictoryRoad2EndBattleText5 ; TextEndBattle
-VictoryRoad2TrainerHeader6: ; 51871 (14:5871)
- dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6
+MoltresTrainerHeader:
+ dbEventFlagBit EVENT_BEAT_MOLTRES
db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6
- dw VictoryRoad2BattleText6 ; TextBeforeBattle
- dw VictoryRoad2BattleText6 ; TextAfterBattle
- dw VictoryRoad2BattleText6 ; TextEndBattle
- dw VictoryRoad2BattleText6 ; TextEndBattle
+ dwEventFlagAddress EVENT_BEAT_MOLTRES
+ dw MoltresBattleText ; TextBeforeBattle
+ dw MoltresBattleText ; TextAfterBattle
+ dw MoltresBattleText ; TextEndBattle
+ dw MoltresBattleText ; TextEndBattle
db $ff
-VictoryRoad2Text1: ; 5187e (14:587e)
+VictoryRoad2Text1:
TX_ASM
ld hl, VictoryRoad2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text2: ; 51888 (14:5888)
+VictoryRoad2Text2:
TX_ASM
ld hl, VictoryRoad2TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text3: ; 51892 (14:5892)
+VictoryRoad2Text3:
TX_ASM
ld hl, VictoryRoad2TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text4: ; 5189c (14:589c)
+VictoryRoad2Text4:
TX_ASM
ld hl, VictoryRoad2TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text5: ; 518a6 (14:58a6)
+VictoryRoad2Text5:
TX_ASM
ld hl, VictoryRoad2TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2Text6: ; 518b0 (14:58b0)
+MoltresText:
TX_ASM
- ld hl, VictoryRoad2TrainerHeader6
+ ld hl, MoltresTrainerHeader
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad2BattleText6: ; 518ba (14:58ba)
- TX_FAR _VictoryRoad2BattleText6
+MoltresBattleText:
+ TX_FAR _MoltresBattleText
TX_ASM
ld a, MOLTRES
call PlayCry
call WaitForSoundToFinish
jp TextScriptEnd
-VictoryRoad2BattleText1: ; 518ca (14:58ca)
+VictoryRoad2BattleText1:
TX_FAR _VictoryRoad2BattleText1
db "@"
-VictoryRoad2EndBattleText1: ; 518cf (14:58cf)
+VictoryRoad2EndBattleText1:
TX_FAR _VictoryRoad2EndBattleText1
db "@"
-VictoryRoad2AfterBattleText1: ; 518d4 (14:58d4)
+VictoryRoad2AfterBattleText1:
TX_FAR _VictoryRoad2AfterBattleText1
db "@"
-VictoryRoad2BattleText2: ; 518d9 (14:58d9)
+VictoryRoad2BattleText2:
TX_FAR _VictoryRoad2BattleText2
db "@"
-VictoryRoad2EndBattleText2: ; 518de (14:58de)
+VictoryRoad2EndBattleText2:
TX_FAR _VictoryRoad2EndBattleText2
db "@"
-VictoryRoad2AfterBattleText2: ; 518e3 (14:58e3)
+VictoryRoad2AfterBattleText2:
TX_FAR _VictoryRoad2AfterBattleText2
db "@"
-VictoryRoad2BattleText3: ; 518e8 (14:58e8)
+VictoryRoad2BattleText3:
TX_FAR _VictoryRoad2BattleText3
db "@"
-VictoryRoad2EndBattleText3: ; 518ed (14:58ed)
+VictoryRoad2EndBattleText3:
TX_FAR _VictoryRoad2EndBattleText3
db "@"
-VictoryRoad2AfterBattleText3: ; 518f2 (14:58f2)
+VictoryRoad2AfterBattleText3:
TX_FAR _VictoryRoad2AfterBattleText3
db "@"
-VictoryRoad2BattleText4: ; 518f7 (14:58f7)
+VictoryRoad2BattleText4:
TX_FAR _VictoryRoad2BattleText4
db "@"
-VictoryRoad2EndBattleText4: ; 518fc (14:58fc)
+VictoryRoad2EndBattleText4:
TX_FAR _VictoryRoad2EndBattleText4
db "@"
-VictoryRoad2AfterBattleText4: ; 51901 (14:5901)
+VictoryRoad2AfterBattleText4:
TX_FAR _VictoryRoad2AfterBattleText4
db "@"
-VictoryRoad2BattleText5: ; 51906 (14:5906)
+VictoryRoad2BattleText5:
TX_FAR _VictoryRoad2BattleText5
db "@"
-VictoryRoad2EndBattleText5: ; 5190b (14:590b)
+VictoryRoad2EndBattleText5:
TX_FAR _VictoryRoad2EndBattleText5
db "@"
-VictoryRoad2AfterBattleText5: ; 51910 (14:5910)
+VictoryRoad2AfterBattleText5:
TX_FAR _VictoryRoad2AfterBattleText5
db "@"
diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm
index 4cdf3fb0..ef638a0f 100755
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -1,4 +1,4 @@
-VictoryRoad3Script: ; 44980 (11:4980)
+VictoryRoad3Script:
call VictoryRoad3Script_44996
call EnableAutoTextBoxDrawing
ld hl, VictoryRoad3TrainerHeaders
@@ -8,7 +8,7 @@ VictoryRoad3Script: ; 44980 (11:4980)
ld [wVictoryRoad3CurScript], a
ret
-VictoryRoad3Script_44996: ; 44996 (11:4996)
+VictoryRoad3Script_44996:
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
@@ -20,12 +20,12 @@ VictoryRoad3Script_44996: ; 44996 (11:4996)
lb bc, 5, 3
predef_jump ReplaceTileBlock
-VictoryRoad3ScriptPointers: ; 449b1 (11:49b1)
+VictoryRoad3ScriptPointers:
dw VictoryRoad3Script0
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
-VictoryRoad3Script0: ; 449b7 (11:49b7)
+VictoryRoad3Script0:
ld hl, wFlags_0xcd60
bit 7, [hl]
res 7, [hl]
@@ -50,7 +50,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
ld [wMissableObjectIndex], a
predef_jump ShowObject
-.coordsData_449f9: ; 449f9 (11:49f9)
+.coordsData_449f9:
db $05,$03
db $0F,$17
db $FF
@@ -74,7 +74,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
jp z, CheckFightingMapTrainers
ret
-VictoryRoad3TextPointers: ; 44a24 (11:4a24)
+VictoryRoad3TextPointers:
dw VictoryRoad3Text1
dw VictoryRoad3Text2
dw VictoryRoad3Text3
@@ -86,8 +86,8 @@ VictoryRoad3TextPointers: ; 44a24 (11:4a24)
dw BoulderText
dw BoulderText
-VictoryRoad3TrainerHeaders: ; 44a38 (11:4a38)
-VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38)
+VictoryRoad3TrainerHeaders:
+VictoryRoad3TrainerHeader0:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
db ($1 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
@@ -96,7 +96,7 @@ VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38)
dw VictoryRoad3EndBattleText2 ; TextEndBattle
dw VictoryRoad3EndBattleText2 ; TextEndBattle
-VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44)
+VictoryRoad3TrainerHeader2:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
@@ -105,7 +105,7 @@ VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44)
dw VictoryRoad3EndBattleText3 ; TextEndBattle
dw VictoryRoad3EndBattleText3 ; TextEndBattle
-VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50)
+VictoryRoad3TrainerHeader3:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
@@ -114,7 +114,7 @@ VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50)
dw VictoryRoad3EndBattleText4 ; TextEndBattle
dw VictoryRoad3EndBattleText4 ; TextEndBattle
-VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c)
+VictoryRoad3TrainerHeader4:
dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
db ($4 << 4) ; trainer's view range
dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
@@ -125,74 +125,74 @@ VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c)
db $ff
-VictoryRoad3Text1: ; 44a69 (11:4a69)
+VictoryRoad3Text1:
TX_ASM
ld hl, VictoryRoad3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3Text2: ; 44a73 (11:4a73)
+VictoryRoad3Text2:
TX_ASM
ld hl, VictoryRoad3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3Text3: ; 44a7d (11:4a7d)
+VictoryRoad3Text3:
TX_ASM
ld hl, VictoryRoad3TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3Text4: ; 44a87 (11:4a87)
+VictoryRoad3Text4:
TX_ASM
ld hl, VictoryRoad3TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-VictoryRoad3BattleText2: ; 44a91 (11:4a91)
+VictoryRoad3BattleText2:
TX_FAR _VictoryRoad3BattleText2
db "@"
-VictoryRoad3EndBattleText2: ; 44a96 (11:4a96)
+VictoryRoad3EndBattleText2:
TX_FAR _VictoryRoad3EndBattleText2
db "@"
-VictoryRoad3AfterBattleText2: ; 44a9b (11:4a9b)
+VictoryRoad3AfterBattleText2:
TX_FAR _VictoryRoad3AfterBattleText2
db "@"
-VictoryRoad3BattleText3: ; 44aa0 (11:4aa0)
+VictoryRoad3BattleText3:
TX_FAR _VictoryRoad3BattleText3
db "@"
-VictoryRoad3EndBattleText3: ; 44aa5 (11:4aa5)
+VictoryRoad3EndBattleText3:
TX_FAR _VictoryRoad3EndBattleText3
db "@"
-VictoryRoad3AfterBattleText3: ; 44aaa (11:4aaa)
+VictoryRoad3AfterBattleText3:
TX_FAR _VictoryRoad3AfterBattleText3
db "@"
-VictoryRoad3BattleText4: ; 44aaf (11:4aaf)
+VictoryRoad3BattleText4:
TX_FAR _VictoryRoad3BattleText4
db "@"
-VictoryRoad3EndBattleText4: ; 44ab4 (11:4ab4)
+VictoryRoad3EndBattleText4:
TX_FAR _VictoryRoad3EndBattleText4
db "@"
-VictoryRoad3AfterBattleText4: ; 44ab9 (11:4ab9)
+VictoryRoad3AfterBattleText4:
TX_FAR _VictoryRoad3AfterBattleText4
db "@"
-VictoryRoad3BattleText5: ; 44abe (11:4abe)
+VictoryRoad3BattleText5:
TX_FAR _VictoryRoad3BattleText5
db "@"
-VictoryRoad3EndBattleText5: ; 44ac3 (11:4ac3)
+VictoryRoad3EndBattleText5:
TX_FAR _VictoryRoad3EndBattleText5
db "@"
-VictoryRoad3AfterBattleText5: ; 44ac8 (11:4ac8)
+VictoryRoad3AfterBattleText5:
TX_FAR _VictoryRoad3AfterBattleText5
db "@"
diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm
index c4649f4f..dccb43c0 100644
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/seafoam_islands_b4f.asm
@@ -1,4 +1,4 @@
-_SeafoamIslands5BattleText2::
+_ArticunoBattleText::
text "Gyaoo!@@"
_SeafoamIslands5Text4::
diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm
index bea7df28..4db8467f 100644
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/unknown_dungeon_b1f.asm
@@ -1,3 +1,3 @@
-_UnknownDungeon3MewtwoText::
+_MewtwoBattleText::
text "Mew!@@"
diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm
index 390d8d54..bc1b6cd9 100644
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/victory_road_2f.asm
@@ -1,4 +1,4 @@
-_VictoryRoad2BattleText6::
+_MoltresBattleText::
text "Gyaoo!@@"
_VictoryRoad2BattleText1::
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-05 17:22:17 +0000