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, 259 deletions

diff --git a/scripts/route16.asm b/scripts/route16.asm
deleted file mode 100755
index 20431608..00000000
--- a/scripts/route16.asm
+++ /dev/null
@@ -1,259 +0,0 @@
-Route16Script:
-	call EnableAutoTextBoxDrawing
-	ld hl, Route16TrainerHeader0
-	ld de, Route16ScriptPointers
-	ld a, [wRoute16CurScript]
-	call ExecuteCurMapScriptInTable
-	ld [wRoute16CurScript], a
-	ret
-
-Route16Script_59946:
-	xor a
-	ld [wJoyIgnore], a
-	ld [wRoute16CurScript], a
-	ld [wCurMapScript], a
-	ret
-
-Route16ScriptPointers:
-	dw Route16Script0
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw Route16Script3
-
-Route16Script0:
-	CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX
-	jp nz, CheckFightingMapTrainers
-	CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX
-	ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX
-	jp z, CheckFightingMapTrainers
-	ld a, $a
-	ld [hSpriteIndexOrTextID], a
-	call DisplayTextID
-	ld a, SNORLAX
-	ld [wCurOpponent], a
-	ld a, 30
-	ld [wCurEnemyLVL], a
-	ld a, HS_ROUTE_16_SNORLAX
-	ld [wMissableObjectIndex], a
-	predef HideObject
-	call UpdateSprites
-	ld a, $3
-	ld [wRoute16CurScript], a
-	ld [wCurMapScript], a
-	ret
-
-Route16Script3:
-	ld a, [wIsInBattle]
-	cp $ff
-	jp z, Route16Script_59946
-	call UpdateSprites
-	ld a, [wBattleResult]
-	cp $2
-	jr z, .asm_599a8
-	ld a, $b
-	ld [hSpriteIndexOrTextID], a
-	call DisplayTextID
-.asm_599a8
-	SetEvent EVENT_BEAT_ROUTE16_SNORLAX
-	call Delay3
-	ld a, $0
-	ld [wRoute16CurScript], a
-	ld [wCurMapScript], a
-	ret
-
-Route16TextPointers:
-	dw Route16Text1
-	dw Route16Text2
-	dw Route16Text3
-	dw Route16Text4
-	dw Route16Text5
-	dw Route16Text6
-	dw Route16Text7
-	dw Route16Text8
-	dw Route16Text9
-	dw Route16Text10
-	dw Route16Text11
-
-Route16TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_0
-	dw Route16BattleText1 ; TextBeforeBattle
-	dw Route16AfterBattleText1 ; TextAfterBattle
-	dw Route16EndBattleText1 ; TextEndBattle
-	dw Route16EndBattleText1 ; TextEndBattle
-
-Route16TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_1
-	dw Route16BattleText2 ; TextBeforeBattle
-	dw Route16AfterBattleText2 ; TextAfterBattle
-	dw Route16EndBattleText2 ; TextEndBattle
-	dw Route16EndBattleText2 ; TextEndBattle
-
-Route16TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_2
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_2
-	dw Route16BattleText3 ; TextBeforeBattle
-	dw Route16AfterBattleText3 ; TextAfterBattle
-	dw Route16EndBattleText3 ; TextEndBattle
-	dw Route16EndBattleText3 ; TextEndBattle
-
-Route16TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_3
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_3
-	dw Route16BattleText4 ; TextBeforeBattle
-	dw Route16AfterBattleText4 ; TextAfterBattle
-	dw Route16EndBattleText4 ; TextEndBattle
-	dw Route16EndBattleText4 ; TextEndBattle
-
-Route16TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_4
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_4
-	dw Route16BattleText5 ; TextBeforeBattle
-	dw Route16AfterBattleText5 ; TextAfterBattle
-	dw Route16EndBattleText5 ; TextEndBattle
-	dw Route16EndBattleText5 ; TextEndBattle
-
-Route16TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_5
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_5
-	dw Route16BattleText6 ; TextBeforeBattle
-	dw Route16AfterBattleText6 ; TextAfterBattle
-	dw Route16EndBattleText6 ; TextEndBattle
-	dw Route16EndBattleText6 ; TextEndBattle
-
-	db $ff
-
-Route16Text1:
-	TX_ASM
-	ld hl, Route16TrainerHeader0
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route16BattleText1:
-	TX_FAR _Route16BattleText1
-	db "@"
-
-Route16EndBattleText1:
-	TX_FAR _Route16EndBattleText1
-	db "@"
-
-Route16AfterBattleText1:
-	TX_FAR _Route16AfterBattleText1
-	db "@"
-
-Route16Text2:
-	TX_ASM
-	ld hl, Route16TrainerHeader1
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route16BattleText2:
-	TX_FAR _Route16BattleText2
-	db "@"
-
-Route16EndBattleText2:
-	TX_FAR _Route16EndBattleText2
-	db "@"
-
-Route16AfterBattleText2:
-	TX_FAR _Route16AfterBattleText2
-	db "@"
-
-Route16Text3:
-	TX_ASM
-	ld hl, Route16TrainerHeader2
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route16BattleText3:
-	TX_FAR _Route16BattleText3
-	db "@"
-
-Route16EndBattleText3:
-	TX_FAR _Route16EndBattleText3
-	db "@"
-
-Route16AfterBattleText3:
-	TX_FAR _Route16AfterBattleText3
-	db "@"
-
-Route16Text4:
-	TX_ASM
-	ld hl, Route16TrainerHeader3
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route16BattleText4:
-	TX_FAR _Route16BattleText4
-	db "@"
-
-Route16EndBattleText4:
-	TX_FAR _Route16EndBattleText4
-	db "@"
-
-Route16AfterBattleText4:
-	TX_FAR _Route16AfterBattleText4
-	db "@"
-
-Route16Text5:
-	TX_ASM
-	ld hl, Route16TrainerHeader4
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route16BattleText5:
-	TX_FAR _Route16BattleText5
-	db "@"
-
-Route16EndBattleText5:
-	TX_FAR _Route16EndBattleText5
-	db "@"
-
-Route16AfterBattleText5:
-	TX_FAR _Route16AfterBattleText5
-	db "@"
-
-Route16Text6:
-	TX_ASM
-	ld hl, Route16TrainerHeader5
-	call TalkToTrainer
-	jp TextScriptEnd
-
-Route16BattleText6:
-	TX_FAR _Route16BattleText6
-	db "@"
-
-Route16EndBattleText6:
-	TX_FAR _Route16EndBattleText6
-	db "@"
-
-Route16AfterBattleText6:
-	TX_FAR _Route16AfterBattleText6
-	db "@"
-
-Route16Text7:
-	TX_FAR _Route16Text7
-	db "@"
-
-Route16Text10:
-	TX_FAR _Route16Text10
-	db "@"
-
-Route16Text11:
-	TX_FAR _Route16Text11
-	db "@"
-
-Route16Text8:
-	TX_FAR _Route16Text8
-	db "@"
-
-Route16Text9:
-	TX_FAR _Route16Text9
-	db "@"