Merge pull request #50 from dannye/master

merge pokered

1 files changed, 52 insertions, 53 deletions

diff --git a/scripts/route20.asm b/scripts/Route20.asm
index 012c9c53..081a723e 100755
--- a/scripts/route20.asm
+++ b/scripts/Route20.asm
@@ -1,9 +1,9 @@
-Route20Script:
+Route20_Script:
 	CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS
 	call nz, Route20Script_50cc6
 	call EnableAutoTextBoxDrawing
 	ld hl, Route20TrainerHeader0
-	ld de, Route20ScriptPointers
+	ld de, Route20_ScriptPointers
 	ld a, [wRoute20CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute20CurScript], a
@@ -12,9 +12,9 @@ Route20Script:
 Route20Script_50cc6:
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	jr z, .asm_50cef
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
 	call Route20Script_50d0c
 	ld hl, .MissableObjectIDs
 .asm_50cdc
@@ -27,24 +27,24 @@ Route20Script_50cc6:
 	jr .asm_50cdc
 
 .MissableObjectIDs:
-	db HS_SEAFOAM_ISLANDS_2_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_2_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_3_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_3_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_4_BOULDER_3
-	db HS_SEAFOAM_ISLANDS_4_BOULDER_4
+	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
+	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	db $FF
 
 .asm_50cef
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	call Route20Script_50d14
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	call Route20Script_50d14
 	ret
 
@@ -56,12 +56,12 @@ Route20Script_50d14:
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route20ScriptPointers:
+Route20_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route20TextPointers:
+Route20_TextPointers:
 	dw Route20Text1
 	dw Route20Text2
 	dw Route20Text3
@@ -75,7 +75,6 @@ Route20TextPointers:
 	dw Route20Text11
 	dw Route20Text12
 
-Route20TrainerHeaders:
 Route20TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -85,82 +84,82 @@ Route20TrainerHeader0:
 	dw Route20EndBattleText1 ; TextEndBattle
 	dw Route20EndBattleText1 ; TextEndBattle
 
-Route20TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
+Route20TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1
 	dw Route20BattleText2 ; TextBeforeBattle
 	dw Route20AfterBattleText2 ; TextAfterBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 
-Route20TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
+Route20TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
 	dw Route20BattleText3 ; TextBeforeBattle
 	dw Route20AfterBattleText3 ; TextAfterBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 
-Route20TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
+Route20TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
 	dw Route20BattleText4 ; TextBeforeBattle
 	dw Route20AfterBattleText4 ; TextAfterBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 
-Route20TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
+Route20TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
 	dw Route20BattleText5 ; TextBeforeBattle
 	dw Route20AfterBattleText5 ; TextAfterBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 
-Route20TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
+Route20TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
 	dw Route20BattleText6 ; TextBeforeBattle
 	dw Route20AfterBattleText6 ; TextAfterBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 
-Route20TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7
+Route20TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
 	dw Route20BattleText7 ; TextBeforeBattle
 	dw Route20AfterBattleText7 ; TextAfterBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 
-Route20TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
+Route20TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1
 	dw Route20BattleText8 ; TextBeforeBattle
 	dw Route20AfterBattleText8 ; TextAfterBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 
-Route20TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
+Route20TrainerHeader8:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	dw Route20BattleText9 ; TextBeforeBattle
 	dw Route20AfterBattleText9 ; TextAfterBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 
-Route20TrainerHeader10:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1
+Route20TrainerHeader9:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	dw Route20BattleText10 ; TextBeforeBattle
 	dw Route20AfterBattleText10 ; TextAfterBattle
 	dw Route20EndBattleText10 ; TextEndBattle
@@ -176,55 +175,55 @@ Route20Text1:
 
 Route20Text2:
 	TX_ASM
-	ld hl, Route20TrainerHeader2
+	ld hl, Route20TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text3:
 	TX_ASM
-	ld hl, Route20TrainerHeader3
+	ld hl, Route20TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text4:
 	TX_ASM
-	ld hl, Route20TrainerHeader4
+	ld hl, Route20TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text5:
 	TX_ASM
-	ld hl, Route20TrainerHeader5
+	ld hl, Route20TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text6:
 	TX_ASM
-	ld hl, Route20TrainerHeader6
+	ld hl, Route20TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text7:
 	TX_ASM
-	ld hl, Route20TrainerHeader7
+	ld hl, Route20TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text8:
 	TX_ASM
-	ld hl, Route20TrainerHeader8
+	ld hl, Route20TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text9:
 	TX_ASM
-	ld hl, Route20TrainerHeader9
+	ld hl, Route20TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text10:
 	TX_ASM
-	ld hl, Route20TrainerHeader10
+	ld hl, Route20TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd