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

1 files changed, 51 insertions, 49 deletions

diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm
index 67056e07..568d79d2 100644
--- a/scripts/PowerPlant.asm
+++ b/scripts/PowerPlant.asm
@@ -8,105 +8,107 @@ PowerPlant_Script:
 	ret
 
 PowerPlant_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_POWERPLANT_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POWERPLANT_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_POWERPLANT_END_BATTLE
 
 PowerPlant_TextPointers:
-	dw Voltorb0Text
-	dw Voltorb1Text
-	dw Voltorb2Text
-	dw Voltorb3Text
-	dw Voltorb4Text
-	dw Voltorb5Text
-	dw Voltorb6Text
-	dw Voltorb7Text
-	dw ZapdosText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
+	def_text_pointers
+	dw_const PowerPlantVoltorb1Text,   TEXT_POWERPLANT_VOLTORB1
+	dw_const PowerPlantVoltorb2Text,   TEXT_POWERPLANT_VOLTORB2
+	dw_const PowerPlantVoltorb3Text,   TEXT_POWERPLANT_VOLTORB3
+	dw_const PowerPlantElectrode1Text, TEXT_POWERPLANT_ELECTRODE1
+	dw_const PowerPlantVoltorb4Text,   TEXT_POWERPLANT_VOLTORB4
+	dw_const PowerPlantVoltorb5Text,   TEXT_POWERPLANT_VOLTORB5
+	dw_const PowerPlantElectrode2Text, TEXT_POWERPLANT_ELECTRODE2
+	dw_const PowerPlantVoltorb6Text,   TEXT_POWERPLANT_VOLTORB6
+	dw_const PowerPlantZapdosText,     TEXT_POWERPLANT_ZAPDOS
+	dw_const PickUpItemText,           TEXT_POWERPLANT_CARBOS
+	dw_const PickUpItemText,           TEXT_POWERPLANT_HP_UP
+	dw_const PickUpItemText,           TEXT_POWERPLANT_RARE_CANDY
+	dw_const PickUpItemText,           TEXT_POWERPLANT_TM_THUNDER
+	dw_const PickUpItemText,           TEXT_POWERPLANT_TM_REFLECT
 
 PowerPlantTrainerHeaders:
 	def_trainers
 Voltorb0TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb1TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_1, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb2TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_2, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_2, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb3TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_3, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_3, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb4TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_4, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_4, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb5TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_5, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_5, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb6TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 Voltorb7TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 0, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText, PowerPlantVoltorbBattleText
 ZapdosTrainerHeader:
-	trainer EVENT_BEAT_ZAPDOS, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText
+	trainer EVENT_BEAT_ZAPDOS, 0, PowerPlantZapdosBattleText, PowerPlantZapdosBattleText, PowerPlantZapdosBattleText
 	db -1 ; end
 
-InitVoltorbBattle:
+PowerPlantInitBattleScript:
 	call TalkToTrainer
 	ld a, [wCurMapScript]
 	ld [wPowerPlantCurScript], a
 	jp TextScriptEnd
 
-Voltorb0Text:
+PowerPlantVoltorb1Text:
 	text_asm
 	ld hl, Voltorb0TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb1Text:
+PowerPlantVoltorb2Text:
 	text_asm
 	ld hl, Voltorb1TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb2Text:
+PowerPlantVoltorb3Text:
 	text_asm
 	ld hl, Voltorb2TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb3Text:
+PowerPlantElectrode1Text:
 	text_asm
 	ld hl, Voltorb3TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb4Text:
+PowerPlantVoltorb4Text:
 	text_asm
 	ld hl, Voltorb4TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb5Text:
+PowerPlantVoltorb5Text:
 	text_asm
 	ld hl, Voltorb5TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb6Text:
+PowerPlantElectrode2Text:
 	text_asm
 	ld hl, Voltorb6TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-Voltorb7Text:
+PowerPlantVoltorb6Text:
 	text_asm
 	ld hl, Voltorb7TrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-ZapdosText:
+PowerPlantZapdosText:
 	text_asm
 	ld hl, ZapdosTrainerHeader
-	jr InitVoltorbBattle
+	jr PowerPlantInitBattleScript
 
-VoltorbBattleText:
-	text_far _VoltorbBattleText
+PowerPlantVoltorbBattleText:
+	text_far _PowerPlantVoltorbBattleText
 	text_end
 
-ZapdosBattleText:
-	text_far _ZapdosBattleText
+PowerPlantZapdosBattleText:
+	text_far _PowerPlantZapdosBattleText
 	text_asm
 	ld a, ZAPDOS
 	call PlayCry