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

1 files changed, 65 insertions, 63 deletions

diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm
index 03cb49f4..f2e99586 100644
--- a/scripts/PokemonTower6F.asm
+++ b/scripts/PokemonTower6F.asm
@@ -7,70 +7,71 @@ PokemonTower6F_Script:
 	ld [wPokemonTower6FCurScript], a
 	ret
 
-PokemonTower6Script_60b02:
+PokemonTower6FSetDefaultScript:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wPokemonTower6FCurScript], a
-	ld [wCurMapScript], a
+	ld [wPokemonTower6FCurScript], a ; SCRIPT_POKEMONTOWER6F_DEFAULT
+	ld [wCurMapScript], a ; SCRIPT_POKEMONTOWER6F_DEFAULT
 	ret
 
 PokemonTower6F_ScriptPointers:
-	dw PokemonTower6Script0
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw PokemonTower6Script3
-	dw PokemonTower6Script4
+	def_script_pointers
+	dw_const PokemonTower6FDefaultScript,           SCRIPT_POKEMONTOWER6F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER6F_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_POKEMONTOWER6F_END_BATTLE
+	dw_const PokemonTower6FPlayerMovingScript,      SCRIPT_POKEMONTOWER6F_PLAYER_MOVING
+	dw_const PokemonTower6FMarowakBattleScript,     SCRIPT_POKEMONTOWER6F_MAROWAK_BATTLE
 
-PokemonTower6Script0:
+PokemonTower6FDefaultScript:
 	CheckEvent EVENT_BEAT_GHOST_MAROWAK
 	jp nz, CheckFightingMapTrainers
-	ld hl, CoordsData_60b45
+	ld hl, PokemonTower6FMarowakCoords
 	call ArePlayerCoordsInArray
 	jp nc, CheckFightingMapTrainers
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $6
+	ld a, TEXT_POKEMONTOWER6F_BEGONE
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, RESTLESS_SOUL
 	ld [wCurOpponent], a
 	ld a, 30
 	ld [wCurEnemyLVL], a
-	ld a, $4
+	ld a, SCRIPT_POKEMONTOWER6F_MAROWAK_BATTLE
 	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-CoordsData_60b45:
+PokemonTower6FMarowakCoords:
 	dbmapcoord 10, 16
 	db -1 ; end
 
-PokemonTower6Script4:
+PokemonTower6FMarowakBattleScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, PokemonTower6Script_60b02
-	ld a, $ff
+	jp z, PokemonTower6FSetDefaultScript
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wd72d]
 	bit 6, a
 	ret nz
 	call UpdateSprites
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wBattleResult]
 	and a
-	jr nz, .asm_60b82
+	jr nz, .did_not_defeat
 	SetEvent EVENT_BEAT_GHOST_MAROWAK
-	ld a, $7
+	ld a, TEXT_POKEMONTOWER6F_MAROWAK_DEPARTED
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
 	ld [wJoyIgnore], a
-	ld a, $0
+	ld a, SCRIPT_POKEMONTOWER6F_DEFAULT
 	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
-.asm_60b82
+.did_not_defeat
 	ld a, $1
 	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $10
@@ -80,12 +81,12 @@ PokemonTower6Script4:
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ld hl, wd730
 	set 7, [hl]
-	ld a, $3
+	ld a, SCRIPT_POKEMONTOWER6F_PLAYER_MOVING
 	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6Script3:
+PokemonTower6FPlayerMovingScript:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
@@ -96,99 +97,100 @@ PokemonTower6Script3:
 	ret
 
 PokemonTower6F_TextPointers:
-	dw PokemonTower6Text1
-	dw PokemonTower6Text2
-	dw PokemonTower6Text3
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PokemonTower6Text6
-	dw PokemonTower6Text7
+	def_text_pointers
+	dw_const PokemonTower6FChanneler1Text,      TEXT_POKEMONTOWER6F_CHANNELER1
+	dw_const PokemonTower6FChanneler2Text,      TEXT_POKEMONTOWER6F_CHANNELER2
+	dw_const PokemonTower6FChanneler3Text,      TEXT_POKEMONTOWER6F_CHANNELER3
+	dw_const PickUpItemText,                    TEXT_POKEMONTOWER6F_RARE_CANDY
+	dw_const PickUpItemText,                    TEXT_POKEMONTOWER6F_X_ACCURACY
+	dw_const PokemonTower6FBeGoneText,          TEXT_POKEMONTOWER6F_BEGONE
+	dw_const PokemonTower6FMarowakDepartedText, TEXT_POKEMONTOWER6F_MAROWAK_DEPARTED
 
 PokemonTower6TrainerHeaders:
 	def_trainers
 PokemonTower6TrainerHeader0:
-	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_0, 3, PokemonTower6BattleText1, PokemonTower6EndBattleText1, PokemonTower6AfterBattleText1
+	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_0, 3, PokemonTower6FChanneler1BattleText, PokemonTower6FChanneler1EndBattleText, PokemonTower6FChanneler1AfterBattleText
 PokemonTower6TrainerHeader1:
-	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_1, 3, PokemonTower6BattleText2, PokemonTower6EndBattleText2, PokemonTower6AfterBattleText2
+	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_1, 3, PokemonTower6FChanneler2BattleText, PokemonTower6FChanneler2EndBattleText, PokemonTower6FChanneler2AfterBattleText
 PokemonTower6TrainerHeader2:
-	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_2, 2, PokemonTower6BattleText3, PokemonTower6EndBattleText3, PokemonTower6AfterBattleText3
+	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_2, 2, PokemonTower6FChanneler3BattleText, PokemonTower6FChanneler3EndBattleText, PokemonTower6FChanneler3AfterBattleText
 	db -1 ; end
 
-PokemonTower6Text1:
+PokemonTower6FChanneler1Text:
 	text_asm
 	ld hl, PokemonTower6TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower6Text2:
+PokemonTower6FChanneler2Text:
 	text_asm
 	ld hl, PokemonTower6TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower6Text3:
+PokemonTower6FChanneler3Text:
 	text_asm
 	ld hl, PokemonTower6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PokemonTower6Text7:
+PokemonTower6FMarowakDepartedText:
 	text_asm
-	ld hl, PokemonTower2Text_60c1f
+	ld hl, PokemonTower6FGhostWasCubonesMotherText
 	call PrintText
 	ld a, RESTLESS_SOUL
 	call PlayCry
 	call WaitForSoundToFinish
 	ld c, 30
 	call DelayFrames
-	ld hl, PokemonTower2Text_60c24
+	ld hl, PokemonTower6FSoulWasCalmedText
 	call PrintText
 	jp TextScriptEnd
 
-PokemonTower2Text_60c1f:
-	text_far _PokemonTower2Text_60c1f
+PokemonTower6FGhostWasCubonesMotherText:
+	text_far _PokemonTower6FGhostWasCubonesMotherText
 	text_end
 
-PokemonTower2Text_60c24:
-	text_far _PokemonTower2Text_60c24
+PokemonTower6FSoulWasCalmedText:
+	text_far _PokemonTower6FSoulWasCalmedText
 	text_end
 
-PokemonTower6BattleText1:
-	text_far _PokemonTower6BattleText1
+PokemonTower6FChanneler1BattleText:
+	text_far _PokemonTower6FChanneler1BattleText
 	text_end
 
-PokemonTower6EndBattleText1:
-	text_far _PokemonTower6EndBattleText1
+PokemonTower6FChanneler1EndBattleText:
+	text_far _PokemonTower6FChanneler1EndBattleText
 	text_end
 
-PokemonTower6AfterBattleText1:
-	text_far _PokemonTower6AfterBattleText1
+PokemonTower6FChanneler1AfterBattleText:
+	text_far _PokemonTower6FChanneler1AfterBattleText
 	text_end
 
-PokemonTower6BattleText2:
-	text_far _PokemonTower6BattleText2
+PokemonTower6FChanneler2BattleText:
+	text_far _PokemonTower6FChanneler2BattleText
 	text_end
 
-PokemonTower6EndBattleText2:
-	text_far _PokemonTower6EndBattleText2
+PokemonTower6FChanneler2EndBattleText:
+	text_far _PokemonTower6FChanneler2EndBattleText
 	text_end
 
-PokemonTower6AfterBattleText2:
-	text_far _PokemonTower6AfterBattleText2
+PokemonTower6FChanneler2AfterBattleText:
+	text_far _PokemonTower6FChanneler2AfterBattleText
 	text_end
 
-PokemonTower6BattleText3:
-	text_far _PokemonTower6BattleText3
+PokemonTower6FChanneler3BattleText:
+	text_far _PokemonTower6FChanneler3BattleText
 	text_end
 
-PokemonTower6EndBattleText3:
-	text_far _PokemonTower6EndBattleText3
+PokemonTower6FChanneler3EndBattleText:
+	text_far _PokemonTower6FChanneler3EndBattleText
 	text_end
 
-PokemonTower6AfterBattleText3:
-	text_far _PokemonTower6AfterBattleText3
+PokemonTower6FChanneler3AfterBattleText:
+	text_far _PokemonTower6FChanneler3AfterBattleText
 	text_end
 
-PokemonTower6Text6:
-	text_far _PokemonTower6Text6
+PokemonTower6FBeGoneText:
+	text_far _PokemonTower6FBeGoneText
 	text_end