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

1 files changed, 55 insertions, 53 deletions

diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm
index 4d89befb..6482993d 100644
--- a/scripts/PokemonTower5F.asm
+++ b/scripts/PokemonTower5F.asm
@@ -8,24 +8,25 @@ PokemonTower5F_Script:
 	ret
 
 PokemonTower5F_ScriptPointers:
-	dw PokemonTower5Script0
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const PokemonTower5FDefaultScript,           SCRIPT_POKEMONTOWER5F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER5F_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_POKEMONTOWER5F_END_BATTLE
 
-PokemonTower5Script0:
-	ld hl, CoordsData_60992
+PokemonTower5FDefaultScript:
+	ld hl, PokemonTower5FPurifiedZoneCoords
 	call ArePlayerCoordsInArray
-	jr c, .asm_60960
+	jr c, .in_purified_zone
 	ld hl, wd72e
 	res 4, [hl]
 	ResetEvent EVENT_IN_PURIFIED_ZONE
 	jp CheckFightingMapTrainers
-.asm_60960
+.in_purified_zone
 	CheckAndSetEvent EVENT_IN_PURIFIED_ZONE
 	ret nz
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld hl, wd72e
 	set 4, [hl]
@@ -34,14 +35,14 @@ PokemonTower5Script0:
 	call Delay3
 	call Delay3
 	call GBFadeInFromWhite
-	ld a, $7
+	ld a, TEXT_POKEMONTOWER5F_PURIFIEDZONE
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
 	ld [wJoyIgnore], a
 	ret
 
-CoordsData_60992:
+PokemonTower5FPurifiedZoneCoords:
 	dbmapcoord 10,  8
 	dbmapcoord 11,  8
 	dbmapcoord 10,  9
@@ -49,102 +50,103 @@ CoordsData_60992:
 	db -1 ; end
 
 PokemonTower5F_TextPointers:
-	dw PokemonTower5Text1
-	dw PokemonTower5Text2
-	dw PokemonTower5Text3
-	dw PokemonTower5Text4
-	dw PokemonTower5Text5
-	dw PickUpItemText
-	dw PokemonTower5Text7
+	def_text_pointers
+	dw_const PokemonTower5FChanneler1Text,   TEXT_POKEMONTOWER5F_CHANNELER1
+	dw_const PokemonTower5FChanneler2Text,   TEXT_POKEMONTOWER5F_CHANNELER2
+	dw_const PokemonTower5FChanneler3Text,   TEXT_POKEMONTOWER5F_CHANNELER3
+	dw_const PokemonTower5FChanneler4Text,   TEXT_POKEMONTOWER5F_CHANNELER4
+	dw_const PokemonTower5FChanneler5Text,   TEXT_POKEMONTOWER5F_CHANNELER5
+	dw_const PickUpItemText,                 TEXT_POKEMONTOWER5F_NUGGET
+	dw_const PokemonTower5FPurifiedZoneText, TEXT_POKEMONTOWER5F_PURIFIEDZONE
 
 PokemonTower5TrainerHeaders:
 	def_trainers 2
 PokemonTower5TrainerHeader0:
-	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_0, 2, PokemonTower5BattleText1, PokemonTower5EndBattleText1, PokemonTower5AfterBattleText1
+	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_0, 2, PokemonTower5FChanneler2BattleText, PokemonTower5FChanneler2EndBattleText, PokemonTower5FChanneler2AfterBattleText
 PokemonTower5TrainerHeader1:
-	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_1, 3, PokemonTower5BattleText2, PokemonTower5EndBattleText2, PokemonTower5AfterBattleText2
+	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_1, 3, PokemonTower5FChanneler3BattleText, PokemonTower5FChanneler3EndBattleText, PokemonTower5FChanneler3AfterBattleText
 PokemonTower5TrainerHeader2:
-	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_2, 2, PokemonTower5BattleText3, PokemonTower5EndBattleText3, PokemonTower5AfterBattleText3
+	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_2, 2, PokemonTower5FChanneler4BattleText, PokemonTower5FChanneler4EndBattleText, PokemonTower5FChanneler4AfterBattleText
 PokemonTower5TrainerHeader3:
-	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_3, 2, PokemonTower5BattleText4, PokemonTower5EndBattleText4, PokemonTower5AfterBattleText4
+	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_3, 2, PokemonTower5FChanneler5BattleText, PokemonTower5FChanneler5EndBattleText, PokemonTower5FChanneler5AfterBattleText
 	db -1 ; end
 
-PokemonTower5Text1:
-	text_far _PokemonTower5Text1
+PokemonTower5FChanneler1Text:
+	text_far _PokemonTower5FChanneler1Text
 	text_end
 
-PokemonTower5Text2:
+PokemonTower5FChanneler2Text:
 	text_asm
 	ld hl, PokemonTower5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText1:
-	text_far _PokemonTower5BattleText1
+PokemonTower5FChanneler2BattleText:
+	text_far _PokemonTower5FChanneler2BattleText
 	text_end
 
-PokemonTower5EndBattleText1:
-	text_far _PokemonTower5EndBattleText1
+PokemonTower5FChanneler2EndBattleText:
+	text_far _PokemonTower5FChanneler2EndBattleText
 	text_end
 
-PokemonTower5AfterBattleText1:
-	text_far _PokemonTower5AfterBattleText1
+PokemonTower5FChanneler2AfterBattleText:
+	text_far _PokemonTower5FChanneler2AfterBattleText
 	text_end
 
-PokemonTower5Text3:
+PokemonTower5FChanneler3Text:
 	text_asm
 	ld hl, PokemonTower5TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText2:
-	text_far _PokemonTower5BattleText2
+PokemonTower5FChanneler3BattleText:
+	text_far _PokemonTower5FChanneler3BattleText
 	text_end
 
-PokemonTower5EndBattleText2:
-	text_far _PokemonTower5EndBattleText2
+PokemonTower5FChanneler3EndBattleText:
+	text_far _PokemonTower5FChanneler3EndBattleText
 	text_end
 
-PokemonTower5AfterBattleText2:
-	text_far _PokemonTower5AfterBattleText2
+PokemonTower5FChanneler3AfterBattleText:
+	text_far _PokemonTower5FChanneler3AfterBattleText
 	text_end
 
-PokemonTower5Text4:
+PokemonTower5FChanneler4Text:
 	text_asm
 	ld hl, PokemonTower5TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText3:
-	text_far _PokemonTower5BattleText3
+PokemonTower5FChanneler4BattleText:
+	text_far _PokemonTower5FChanneler4BattleText
 	text_end
 
-PokemonTower5EndBattleText3:
-	text_far _PokemonTower5EndBattleText3
+PokemonTower5FChanneler4EndBattleText:
+	text_far _PokemonTower5FChanneler4EndBattleText
 	text_end
 
-PokemonTower5AfterBattleText3:
-	text_far _PokemonTower5AfterBattleText3
+PokemonTower5FChanneler4AfterBattleText:
+	text_far _PokemonTower5FChanneler4AfterBattleText
 	text_end
 
-PokemonTower5Text5:
+PokemonTower5FChanneler5Text:
 	text_asm
 	ld hl, PokemonTower5TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower5BattleText4:
-	text_far _PokemonTower5BattleText4
+PokemonTower5FChanneler5BattleText:
+	text_far _PokemonTower5FChanneler5BattleText
 	text_end
 
-PokemonTower5EndBattleText4:
-	text_far _PokemonTower5EndBattleText4
+PokemonTower5FChanneler5EndBattleText:
+	text_far _PokemonTower5FChanneler5EndBattleText
 	text_end
 
-PokemonTower5AfterBattleText4:
-	text_far _PokemonTower5AfterBattleText4
+PokemonTower5FChanneler5AfterBattleText:
+	text_far _PokemonTower5FChanneler5AfterBattleText
 	text_end
 
-PokemonTower5Text7:
-	text_far _PokemonTower5Text7
+PokemonTower5FPurifiedZoneText:
+	text_far _PokemonTower5FPurifiedZoneText
 	text_end