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

1 files changed, 62 insertions, 62 deletions

diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm
index 1470a091..c7a5625f 100755
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@@ -1,110 +1,110 @@
-PowerPlantScript: ; 1e2c6 (7:62c6)
+PowerPlantScript:
 	call EnableAutoTextBoxDrawing
 	ld hl, PowerPlantTrainerHeaders
-	ld de, PowerPlantScriptPointers
+	ld de, .ScriptPointers
 	ld a, [wPowerPlantCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wPowerPlantCurScript], a
 	ret
 
-PowerPlantScriptPointers: ; 1e2d9 (7:62d9)
+.ScriptPointers
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PowerPlantTextPointers: ; 1e2df (7:62df)
-	dw PowerPlantText1
-	dw PowerPlantText2
-	dw PowerPlantText3
-	dw PowerPlantText4
-	dw PowerPlantText5
-	dw PowerPlantText6
-	dw PowerPlantText7
-	dw PowerPlantText8
-	dw PowerPlantText9
+PowerPlantTextPointers:
+	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
 
-PowerPlantTrainerHeaders: ; 1e2fb (7:62fb)
-PowerPlantTrainerHeader0: ; 1e2fb (7:62fb)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0
+PowerPlantTrainerHeaders:
+Voltorb0TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader1: ; 1e307 (7:6307)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1
+Voltorb1TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader2: ; 1e313 (7:6313)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2
+Voltorb2TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader3: ; 1e31f (7:631f)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3
+Voltorb3TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader4: ; 1e32b (7:632b)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4
+Voltorb4TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader5: ; 1e337 (7:6337)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5
+Voltorb5TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader6: ; 1e343 (7:6343)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6
+Voltorb6TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader7: ; 1e34f (7:634f)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
+Voltorb7TrainerHeader:
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
-PowerPlantTrainerHeader8: ; 1e35b (7:635b)
-	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
+ZapdosTrainerHeader:
+	dbEventFlagBit EVENT_BEAT_ZAPDOS, 1
 	db 0 ; view range
-	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1
 	dw ZapdosBattleText ; TextBeforeBattle
 	dw ZapdosBattleText ; TextAfterBattle
 	dw ZapdosBattleText ; TextEndBattle
@@ -112,62 +112,62 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b)
 
 	db $ff
 
-InitVoltorbBattle: ; 1e368 (7:6368)
+InitVoltorbBattle:
 	call TalkToTrainer
 	ld a, [wCurMapScript]
 	ld [wPowerPlantCurScript], a
 	jp TextScriptEnd
 
-PowerPlantText1: ; 1e374 (7:6374)
+Voltorb0Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader0
+	ld hl, Voltorb0TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText2: ; 1e37a (7:637a)
+Voltorb1Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader1
+	ld hl, Voltorb1TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText3: ; 1e380 (7:6380)
+Voltorb2Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader2
+	ld hl, Voltorb2TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText4: ; 1e386 (7:6386)
+Voltorb3Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader3
+	ld hl, Voltorb3TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText5: ; 1e38c (7:638c)
+Voltorb4Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader4
+	ld hl, Voltorb4TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText6: ; 1e392 (7:6392)
+Voltorb5Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader5
+	ld hl, Voltorb5TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText7: ; 1e398 (7:6398)
+Voltorb6Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader6
+	ld hl, Voltorb6TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText8: ; 1e39e (7:639e)
+Voltorb7Text:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader7
+	ld hl, Voltorb7TrainerHeader
 	jr InitVoltorbBattle
 
-PowerPlantText9: ; 1e3a4 (7:63a4)
+ZapdosText:
 	TX_ASM
-	ld hl, PowerPlantTrainerHeader8
+	ld hl, ZapdosTrainerHeader
 	jr InitVoltorbBattle
 
-VoltorbBattleText: ; 1e3aa (7:63aa)
+VoltorbBattleText:
 	TX_FAR _VoltorbBattleText
 	db "@"
 
-ZapdosBattleText: ; 1e3af (7:63af)
+ZapdosBattleText:
 	TX_FAR _ZapdosBattleText
 	TX_ASM
 	ld a, ZAPDOS