Merge pull request #196 from Rangi42/polishedmaps

Rename map files, labels, and constants to be consistent and work with Polished Map

1 files changed, 0 insertions, 302 deletions

diff --git a/scripts/route14.asm b/scripts/route14.asm
deleted file mode 100755
index c929451f..00000000
--- a/scripts/route14.asm
+++ /dev/null
@@ -1,302 +0,0 @@
-Route14Script:
-	call EnableAutoTextBoxDrawing
-	ld hl, Route14TrainerHeader0
-	ld de, Route14ScriptPointers
-	ld a, [wRoute14CurScript]
-	call ExecuteCurMapScriptInTable
-	ld [wRoute14CurScript], a
-	ret
-
-Route14ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-
-Route14TextPointers:
-	dw Route14Text1
-	dw Route14Text2
-	dw Route14Text3
-	dw Route14Text4
-	dw Route14Text5
-	dw Route14Text6
-	dw Route14Text7
-	dw Route14Text8
-	dw Route14Text9
-	dw Route14Text10
-	dw Route14Text11
-
-Route14TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_0
-	dw Route14BattleText1 ; TextBeforeBattle
-	dw Route14AfterBattleText1 ; TextAfterBattle
-	dw Route14EndBattleText1 ; TextEndBattle
-	dw Route14EndBattleText1 ; TextEndBattle
-
-Route14TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_1
-	dw Route14BattleText2 ; TextBeforeBattle
-	dw Route14AfterBattleText2 ; TextAfterBattle
-	dw Route14EndBattleText2 ; TextEndBattle
-	dw Route14EndBattleText2 ; TextEndBattle
-
-Route14TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_2
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_2
-	dw Route14BattleText3 ; TextBeforeBattle
-	dw Route14AfterBattleText3 ; TextAfterBattle
-	dw Route14EndBattleText3 ; TextEndBattle
-	dw Route14EndBattleText3 ; TextEndBattle
-
-Route14TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_3
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_3
-	dw Route14BattleText4 ; TextBeforeBattle
-	dw Route14AfterBattleText4 ; TextAfterBattle
-	dw Route14EndBattleText4 ; TextEndBattle
-	dw Route14EndBattleText4 ; TextEndBattle
-
-Route14TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_4
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_4
-	dw Route14BattleText5 ; TextBeforeBattle
-	dw Route14AfterBattleText5 ; TextAfterBattle
-	dw Route14EndBattleText5 ; TextEndBattle
-	dw Route14EndBattleText5 ; TextEndBattle
-
-Route14TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_5
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_5
-	dw Route14BattleText6 ; TextBeforeBattle
-	dw Route14AfterBattleText6 ; TextAfterBattle
-	dw Route14EndBattleText6 ; TextEndBattle
-	dw Route14EndBattleText6 ; TextEndBattle
-
-Route14TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_6
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_6
-	dw Route14BattleText7 ; TextBeforeBattle
-	dw Route14AfterBattleText7 ; TextAfterBattle
-	dw Route14EndBattleText7 ; TextEndBattle
-	dw Route14EndBattleText7 ; TextEndBattle
-
-Route14TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_7, 1
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_7, 1
-	dw Route14BattleText8 ; TextBeforeBattle
-	dw Route14AfterBattleText8 ; TextAfterBattle
-	dw Route14EndBattleText8 ; TextEndBattle
-	dw Route14EndBattleText8 ; TextEndBattle
-
-Route14TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_8, 1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_8, 1
-	dw Route14BattleText9 ; TextBeforeBattle
-	dw Route14AfterBattleText9 ; TextAfterBattle
-	dw Route14EndBattleText9 ; TextEndBattle
-	dw Route14EndBattleText9 ; TextEndBattle
-
-Route14TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_9, 1
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_9, 1
-	dw Route14BattleText10 ; TextBeforeBattle
-	dw Route14AfterBattleText10 ; TextAfterBattle
-	dw Route14EndBattleText10 ; TextEndBattle
-	dw Route14EndBattleText10 ; TextEndBattle
-
-	db $ff
-
-Route14Text1:
-	TX_ASM
-	ld hl, Route14TrainerHeader0
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText1:
-	TX_FAR _Route14BattleText1
-	db "@"
-
-Route14EndBattleText1:
-	TX_FAR _Route14EndBattleText1
-	db "@"
-
-Route14AfterBattleText1:
-	TX_FAR _Route14AfterBattleText1
-	db "@"
-
-Route14Text2:
-	TX_ASM
-	ld hl, Route14TrainerHeader1
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText2:
-	TX_FAR _Route14BattleText2
-	db "@"
-
-Route14EndBattleText2:
-	TX_FAR _Route14EndBattleText2
-	db "@"
-
-Route14AfterBattleText2:
-	TX_FAR _Route14AfterBattleText2
-	db "@"
-
-Route14Text3:
-	TX_ASM
-	ld hl, Route14TrainerHeader2
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText3:
-	TX_FAR _Route14BattleText3
-	db "@"
-
-Route14EndBattleText3:
-	TX_FAR _Route14EndBattleText3
-	db "@"
-
-Route14AfterBattleText3:
-	TX_FAR _Route14AfterBattleText3
-	db "@"
-
-Route14Text4:
-	TX_ASM
-	ld hl, Route14TrainerHeader3
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText4:
-	TX_FAR _Route14BattleText4
-	db "@"
-
-Route14EndBattleText4:
-	TX_FAR _Route14EndBattleText4
-	db "@"
-
-Route14AfterBattleText4:
-	TX_FAR _Route14AfterBattleText4
-	db "@"
-
-Route14Text5:
-	TX_ASM
-	ld hl, Route14TrainerHeader4
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText5:
-	TX_FAR _Route14BattleText5
-	db "@"
-
-Route14EndBattleText5:
-	TX_FAR _Route14EndBattleText5
-	db "@"
-
-Route14AfterBattleText5:
-	TX_FAR _Route14AfterBattleText5
-	db "@"
-
-Route14Text6:
-	TX_ASM
-	ld hl, Route14TrainerHeader5
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText6:
-	TX_FAR _Route14BattleText6
-	db "@"
-
-Route14EndBattleText6:
-	TX_FAR _Route14EndBattleText6
-	db "@"
-
-Route14AfterBattleText6:
-	TX_FAR _Route14AfterBattleText6
-	db "@"
-
-Route14Text7:
-	TX_ASM
-	ld hl, Route14TrainerHeader6
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText7:
-	TX_FAR _Route14BattleText7
-	db "@"
-
-Route14EndBattleText7:
-	TX_FAR _Route14EndBattleText7
-	db "@"
-
-Route14AfterBattleText7:
-	TX_FAR _Route14AfterBattleText7
-	db "@"
-
-Route14Text8:
-	TX_ASM
-	ld hl, Route14TrainerHeader7
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText8:
-	TX_FAR _Route14BattleText8
-	db "@"
-
-Route14EndBattleText8:
-	TX_FAR _Route14EndBattleText8
-	db "@"
-
-Route14AfterBattleText8:
-	TX_FAR _Route14AfterBattleText8
-	db "@"
-
-Route14Text9:
-	TX_ASM
-	ld hl, Route14TrainerHeader8
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText9:
-	TX_FAR _Route14BattleText9
-	db "@"
-
-Route14EndBattleText9:
-	TX_FAR _Route14EndBattleText9
-	db "@"
-
-Route14AfterBattleText9:
-	TX_FAR _Route14AfterBattleText9
-	db "@"
-
-Route14Text10:
-	TX_ASM
-	ld hl, Route14TrainerHeader9
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route14BattleText10:
-	TX_FAR _Route14BattleText10
-	db "@"
-
-Route14EndBattleText10:
-	TX_FAR _Route14EndBattleText10
-	db "@"
-
-Route14AfterBattleText10:
-	TX_FAR _Route14AfterBattleText10
-	db "@"
-
-Route14Text11:
-	TX_FAR _Route14Text11
-	db "@"