Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 46 insertions, 46 deletions

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 "@"