Merge pull request #50 from dannye/master

merge pokered

1 files changed, 37 insertions, 38 deletions

diff --git a/scripts/route25.asm b/scripts/Route25.asm
index cc2e1d9d..c3c11ed5 100755
--- a/scripts/route25.asm
+++ b/scripts/Route25.asm
@@ -1,7 +1,7 @@
-Route25Script:
+Route25_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route25TrainerHeaders
-	ld de, Route25ScriptPointers
+	ld hl, Route25TrainerHeader0
+	ld de, Route25_ScriptPointers
 	ld a, [wRoute25CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute25CurScript], a
@@ -46,12 +46,12 @@ Route25Script_515e1:
 .asm_5165c
 	ret
 
-Route25ScriptPointers:
+Route25_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route25TextPointers:
+Route25_TextPointers:
 	dw Route25Text1
 	dw Route25Text2
 	dw Route25Text3
@@ -64,7 +64,6 @@ Route25TextPointers:
 	dw PickUpItemText
 	dw Route25Text11
 
-Route25TrainerHeaders:
 Route25TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -74,73 +73,73 @@ Route25TrainerHeader0:
 	dw Route25EndBattleText1 ; TextEndBattle
 	dw Route25EndBattleText1 ; TextEndBattle
 
-Route25TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
+Route25TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1
 	dw Route25BattleText2 ; TextBeforeBattle
 	dw Route25AfterBattleText2 ; TextAfterBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 
-Route25TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
+Route25TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
 	dw Route25BattleText3 ; TextBeforeBattle
 	dw Route25AfterBattleText3 ; TextAfterBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 
-Route25TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
+Route25TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
 	dw Route25BattleText4 ; TextBeforeBattle
 	dw Route25AfterBattleText4 ; TextAfterBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 
-Route25TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
+Route25TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
 	dw Route25BattleText5 ; TextBeforeBattle
 	dw Route25AfterBattleText5 ; TextAfterBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 
-Route25TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
+Route25TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
 	dw Route25BattleText6 ; TextBeforeBattle
 	dw Route25AfterBattleText6 ; TextAfterBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 
-Route25TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7
+Route25TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
 	dw Route25BattleText7 ; TextBeforeBattle
 	dw Route25AfterBattleText7 ; TextAfterBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 
-Route25TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
+Route25TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1
 	dw Route25BattleText8 ; TextBeforeBattle
 	dw Route25AfterBattleText8 ; TextAfterBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 
-Route25TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1
+Route25TrainerHeader8:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	dw Route25BattleText9 ; TextBeforeBattle
 	dw Route25AfterBattleText9 ; TextAfterBattle
 	dw Route25EndBattleText9 ; TextEndBattle
@@ -156,49 +155,49 @@ Route25Text1:
 
 Route25Text2:
 	TX_ASM
-	ld hl, Route25TrainerHeader2
+	ld hl, Route25TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text3:
 	TX_ASM
-	ld hl, Route25TrainerHeader3
+	ld hl, Route25TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text4:
 	TX_ASM
-	ld hl, Route25TrainerHeader4
+	ld hl, Route25TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text5:
 	TX_ASM
-	ld hl, Route25TrainerHeader5
+	ld hl, Route25TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text6:
 	TX_ASM
-	ld hl, Route25TrainerHeader6
+	ld hl, Route25TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text7:
 	TX_ASM
-	ld hl, Route25TrainerHeader7
+	ld hl, Route25TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text8:
 	TX_ASM
-	ld hl, Route25TrainerHeader8
+	ld hl, Route25TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text9:
 	TX_ASM
-	ld hl, Route25TrainerHeader9
+	ld hl, Route25TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd