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

Doesn't build.

1 files changed, 52 insertions, 52 deletions

diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm
index ec4f89b3..48f291e1 100755
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@@ -22,89 +22,89 @@ PowerPlantTextPointers: ; 1e2df (7:62df)
 	dw PowerPlantText7
 	dw PowerPlantText8
 	dw PowerPlantText9
-	dw Predef5CText
-	dw Predef5CText
-	dw Predef5CText
-	dw Predef5CText
-	dw Predef5CText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
+	dw PickUpItemText
 
 PowerPlantTrainerHeaders: ; 1e2fb (7:62fb)
 PowerPlantTrainerHeader0: ; 1e2fb (7:62fb)
-	db 1 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader1: ; 1e307 (7:6307)
-	db 2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader2: ; 1e313 (7:6313)
-	db 3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader3: ; 1e31f (7:631f)
-	db 4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader4: ; 1e32b (7:632b)
-	db 5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader5: ; 1e337 (7:6337)
-	db 6 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader6: ; 1e343 (7:6343)
-	db 7 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader7: ; 1e34f (7:634f)
-	db 8 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1
 	dw VoltorbBattleText ; TextBeforeBattle
 	dw VoltorbBattleText ; TextAfterBattle
 	dw VoltorbBattleText ; TextEndBattle
 	dw VoltorbBattleText ; TextEndBattle
 
 PowerPlantTrainerHeader8: ; 1e35b (7:635b)
-	db 9 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
 	db 0 ; view range
-	dw wd7d3 ; flag's byte
+	dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1
 	dw ZapdosBattleText ; TextBeforeBattle
 	dw ZapdosBattleText ; TextAfterBattle
 	dw ZapdosBattleText ; TextEndBattle
@@ -112,56 +112,56 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b)
 
 	db $ff
 
-asm_234cc: ; 1e368 (7:6368)
+InitVoltorbBattle: ; 1e368 (7:6368)
 	call TalkToTrainer
 	ld a, [W_CURMAPSCRIPT]
 	ld [W_POWERPLANTCURSCRIPT], a
 	jp TextScriptEnd
 
 PowerPlantText1: ; 1e374 (7:6374)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader0 ; $62fb
-	jr asm_234cc ; 0x1e378 $ee
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader0
+	jr InitVoltorbBattle
 
 PowerPlantText2: ; 1e37a (7:637a)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader1 ; $6307
-	jr asm_234cc ; 0x1e37e $e8
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader1
+	jr InitVoltorbBattle
 
 PowerPlantText3: ; 1e380 (7:6380)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader2 ; $6313
-	jr asm_234cc ; 0x1e384 $e2
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader2
+	jr InitVoltorbBattle
 
 PowerPlantText4: ; 1e386 (7:6386)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader3 ; $631f
-	jr asm_234cc ; 0x1e38a $dc
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader3
+	jr InitVoltorbBattle
 
 PowerPlantText5: ; 1e38c (7:638c)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader4 ; $632b
-	jr asm_234cc ; 0x1e390 $d6
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader4
+	jr InitVoltorbBattle
 
 PowerPlantText6: ; 1e392 (7:6392)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader5 ; $6337
-	jr asm_234cc ; 0x1e396 $d0
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader5
+	jr InitVoltorbBattle
 
 PowerPlantText7: ; 1e398 (7:6398)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader6 ; $6343
-	jr asm_234cc ; 0x1e39c $ca
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader6
+	jr InitVoltorbBattle
 
 PowerPlantText8: ; 1e39e (7:639e)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader7 ; $634f
-	jr asm_234cc ; 0x1e3a2 $c4
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader7
+	jr InitVoltorbBattle
 
 PowerPlantText9: ; 1e3a4 (7:63a4)
-	db $8 ; asm
-	ld hl, PowerPlantTrainerHeader8 ; $635b
-	jr asm_234cc ; 0x1e3a8 $be
+	TX_ASM
+	ld hl, PowerPlantTrainerHeader8
+	jr InitVoltorbBattle
 
 VoltorbBattleText: ; 1e3aa (7:63aa)
 	TX_FAR _VoltorbBattleText
@@ -169,7 +169,7 @@ VoltorbBattleText: ; 1e3aa (7:63aa)
 
 ZapdosBattleText: ; 1e3af (7:63af)
 	TX_FAR _ZapdosBattleText
-	db $8
+	TX_ASM
 	ld a, ZAPDOS
 	call PlayCry
 	call WaitForSoundToFinish