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

1 files changed, 91 insertions, 89 deletions

diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm
index 74cad978..0626ffdb 100644
--- a/scripts/SilphCo6F.asm
+++ b/scripts/SilphCo6F.asm
@@ -1,5 +1,5 @@
 SilphCo6F_Script:
-	call SilphCo6Script_1a1bf
+	call SilphCo6F_GateCallbackScript
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo6TrainerHeaders
 	ld de, SilphCo6F_ScriptPointers
@@ -8,14 +8,14 @@ SilphCo6F_Script:
 	ld [wSilphCo6FCurScript], a
 	ret
 
-SilphCo6Script_1a1bf:
+SilphCo6F_GateCallbackScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
-	ld hl, SilphCo6GateCoords
-	call SilphCo4Script_19d5d
-	call SilphCo6Script_1a1e6
+	ld hl, .GateCoordinates
+	call SilphCo4F_SetCardKeyDoorYScript
+	call SilphCo6F_UnlockedDoorEventScript
 	CheckEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR
 	ret nz
 	ld a, $5f
@@ -23,11 +23,11 @@ SilphCo6Script_1a1bf:
 	lb bc, 6, 2
 	predef_jump ReplaceTileBlock
 
-SilphCo6GateCoords:
+.GateCoordinates:
 	dbmapcoord  2,  6
 	db -1 ; end
 
-SilphCo6Script_1a1e6:
+SilphCo6F_UnlockedDoorEventScript:
 	ldh a, [hUnlockedSilphCoDoors]
 	and a
 	ret z
@@ -35,167 +35,169 @@ SilphCo6Script_1a1e6:
 	ret
 
 SilphCo6F_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_SILPHCO6F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO6F_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_SILPHCO6F_END_BATTLE
 
 SilphCo6F_TextPointers:
-	dw SilphCo6Text1
-	dw SilphCo6Text2
-	dw SilphCo6Text3
-	dw SilphCo6Text4
-	dw SilphCo6Text5
-	dw SilphCo6Text6
-	dw SilphCo6Text7
-	dw SilphCo6Text8
-	dw PickUpItemText
-	dw PickUpItemText
+	def_text_pointers
+	dw_const SilphCo6FSilphWorkerM1Text, TEXT_SILPHCO6F_SILPH_WORKER_M1
+	dw_const SilphCo6FSilphWorkerM2Text, TEXT_SILPHCO6F_SILPH_WORKER_M2
+	dw_const SilphCo6FSilphWorkerF1Text, TEXT_SILPHCO6F_SILPH_WORKER_F1
+	dw_const SilphCo6FSilphWorkerF2Text, TEXT_SILPHCO6F_SILPH_WORKER_F2
+	dw_const SilphCo6FSilphWorkerM3Text, TEXT_SILPHCO6F_SILPH_WORKER_M3
+	dw_const SilphCo6FRocket1Text,       TEXT_SILPHCO6F_ROCKET1
+	dw_const SilphCo6FScientistText,     TEXT_SILPHCO6F_SCIENTIST
+	dw_const SilphCo6FRocket2Text,       TEXT_SILPHCO6F_ROCKET2
+	dw_const PickUpItemText,             TEXT_SILPHCO6F_HP_UP
+	dw_const PickUpItemText,             TEXT_SILPHCO6F_X_ACCURACY
 
 SilphCo6TrainerHeaders:
 	def_trainers 6
 SilphCo6TrainerHeader0:
-	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6BattleText2, SilphCo6EndBattleText2, SilphCo6AfterBattleText2
+	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6FRocket1BattleText, SilphCo6Rocket1EndBattleText, SilphCo6Rocket1AfterBattleText
 SilphCo6TrainerHeader1:
-	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6BattleText3, SilphCo6EndBattleText3, SilphCo6AfterBattleText3
+	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6FScientistBattleText, SilphCo6FScientistEndBattleText, SilphCo6FScientistAfterBattleText
 SilphCo6TrainerHeader2:
-	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4
+	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 2, SilphCo6FRocket2BattleText, SilphCo6FRocket2EndBattleText, SilphCo6FRocket2AfterBattleText
 	db -1 ; end
 
-SilphCo6Script_1a22f:
+SilphCo6FBeatGiovanniPrintDEOrPrintHLScript:
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
-	jr nz, .asm_1a238
-	jr .asm_1a23a
-.asm_1a238
+	jr nz, .beat_giovanni
+	jr .print_text
+.beat_giovanni
 	ld h, d
 	ld l, e
-.asm_1a23a
+.print_text
 	jp PrintText
 
-SilphCo6Text1:
+SilphCo6FSilphWorkerM1Text:
 	text_asm
-	ld hl, SilphCo6Text_1a24a
-	ld de, SilphCo6Text_1a24f
-	call SilphCo6Script_1a22f
+	ld hl, .TookOverTheBuildingText
+	ld de, .BackToWorkText
+	call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript
 	jp TextScriptEnd
 
-SilphCo6Text_1a24a:
-	text_far _SilphCo6Text_1a24a
+.TookOverTheBuildingText:
+	text_far _SilphCo6FSilphWorkerM1TookOverTheBuildingText
 	text_end
 
-SilphCo6Text_1a24f:
-	text_far _SilphCo6Text_1a24f
+.BackToWorkText:
+	text_far _SilphCo6FSilphWorkerM1BackToWorkText
 	text_end
 
-SilphCo6Text2:
+SilphCo6FSilphWorkerM2Text:
 	text_asm
-	ld hl, SilphCo6Text_1a261
-	ld de, SilphCo6Text_1a266
-	call SilphCo6Script_1a22f
+	ld hl, .HelpMePleaseText
+	ld de, .WeGotEngagedText
+	call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript
 	jp TextScriptEnd
 
-SilphCo6Text_1a261:
-	text_far _SilphCo6Text_1a261
+.HelpMePleaseText:
+	text_far _SilphCo6FSilphWorkerMHelpMePleaseText
 	text_end
 
-SilphCo6Text_1a266:
-	text_far _SilphCo6Text_1a266
+.WeGotEngagedText:
+	text_far _SilphCo6FSilphWorkerMWeGotEngagedText
 	text_end
 
-SilphCo6Text3:
+SilphCo6FSilphWorkerF1Text:
 	text_asm
-	ld hl, SilphCo6Text_1a278
-	ld de, SilphCo6Text_1a27d
-	call SilphCo6Script_1a22f
+	ld hl, .SuchACowardText
+	ld de, .HaveToMarryHimText
+	call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript
 	jp TextScriptEnd
 
-SilphCo6Text_1a278:
-	text_far _SilphCo6Text_1a278
+.SuchACowardText:
+	text_far _SilphCo6FSilphWorkerF1SuchACowardText
 	text_end
 
-SilphCo6Text_1a27d:
-	text_far _SilphCo6Text_1a27d
+.HaveToMarryHimText:
+	text_far _SilphCo6FSilphWorkerF1HaveToMarryHimText
 	text_end
 
-SilphCo6Text4:
+SilphCo6FSilphWorkerF2Text:
 	text_asm
-	ld hl, SilphCo6Text_1a28f
-	ld de, SilphCo6Text_1a294
-	call SilphCo6Script_1a22f
+	ld hl, .TeamRocketConquerWorldText
+	ld de, .TeamRocketRanText
+	call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript
 	jp TextScriptEnd
 
-SilphCo6Text_1a28f:
-	text_far _SilphCo6Text_1a28f
+.TeamRocketConquerWorldText:
+	text_far _SilphCo6FSilphWorkerF2TeamRocketConquerWorldText
 	text_end
 
-SilphCo6Text_1a294:
-	text_far _SilphCo6Text_1a294
+.TeamRocketRanText:
+	text_far _SilphCo6FSilphWorkerF2TeamRocketRanText
 	text_end
 
-SilphCo6Text5:
+SilphCo6FSilphWorkerM3Text:
 	text_asm
-	ld hl, SilphCo6Text_1a2a6
-	ld de, SilphCo6Text_1a2ab
-	call SilphCo6Script_1a22f
+	ld hl, .TargetedSilphText
+	ld de, .WorkForSilphText
+	call SilphCo6FBeatGiovanniPrintDEOrPrintHLScript
 	jp TextScriptEnd
 
-SilphCo6Text_1a2a6:
-	text_far _SilphCo6Text_1a2a6
+.TargetedSilphText:
+	text_far _SilphCo6FSilphWorkerM3TargetedSilphText
 	text_end
 
-SilphCo6Text_1a2ab:
-	text_far _SilphCo6Text_1a2ab
+.WorkForSilphText:
+	text_far _SilphCo6FSilphWorkerM3WorkForSilphText
 	text_end
 
-SilphCo6Text6:
+SilphCo6FRocket1Text:
 	text_asm
 	ld hl, SilphCo6TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText2:
-	text_far _SilphCo6BattleText2
+SilphCo6FRocket1BattleText:
+	text_far _SilphCo6FRocket1BattleText
 	text_end
 
-SilphCo6EndBattleText2:
-	text_far _SilphCo6EndBattleText2
+SilphCo6Rocket1EndBattleText:
+	text_far _SilphCo6Rocket1EndBattleText
 	text_end
 
-SilphCo6AfterBattleText2:
-	text_far _SilphCo6AfterBattleText2
+SilphCo6Rocket1AfterBattleText:
+	text_far _SilphCo6Rocket1AfterBattleText
 	text_end
 
-SilphCo6Text7:
+SilphCo6FScientistText:
 	text_asm
 	ld hl, SilphCo6TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText3:
-	text_far _SilphCo6BattleText3
+SilphCo6FScientistBattleText:
+	text_far _SilphCo6FScientistBattleText
 	text_end
 
-SilphCo6EndBattleText3:
-	text_far _SilphCo6EndBattleText3
+SilphCo6FScientistEndBattleText:
+	text_far _SilphCo6FScientistEndBattleText
 	text_end
 
-SilphCo6AfterBattleText3:
-	text_far _SilphCo6AfterBattleText3
+SilphCo6FScientistAfterBattleText:
+	text_far _SilphCo6FScientistAfterBattleText
 	text_end
 
-SilphCo6Text8:
+SilphCo6FRocket2Text:
 	text_asm
 	ld hl, SilphCo6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo6BattleText4:
-	text_far _SilphCo6BattleText4
+SilphCo6FRocket2BattleText:
+	text_far _SilphCo6FRocket2BattleText
 	text_end
 
-SilphCo6EndBattleText4:
-	text_far _SilphCo6EndBattleText4
+SilphCo6FRocket2EndBattleText:
+	text_far _SilphCo6FRocket2EndBattleText
 	text_end
 
-SilphCo6AfterBattleText4:
-	text_far _SilphCo6AfterBattleText4
+SilphCo6FRocket2AfterBattleText:
+	text_far _SilphCo6FRocket2AfterBattleText
 	text_end