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

1 files changed, 84 insertions, 82 deletions

diff --git a/scripts/ViridianForest.asm b/scripts/ViridianForest.asm
index e9790a37..d8a570cd 100644
--- a/scripts/ViridianForest.asm
+++ b/scripts/ViridianForest.asm
@@ -8,166 +8,168 @@ ViridianForest_Script:
 	ret
 
 ViridianForest_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_VIRIDIANFOREST_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VIRIDIANFOREST_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_VIRIDIANFOREST_END_BATTLE
 
 ViridianForest_TextPointers:
-	dw ViridianForestText1
-	dw ViridianForestText2
-	dw ViridianForestText3
-	dw ViridianForestText4
-	dw ViridianForestText5
-	dw ViridianForestText6
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
-	dw ViridianForestText10
-	dw ViridianForestText11
-	dw ViridianForestText12
-	dw ViridianForestText13
-	dw ViridianForestText14
-	dw ViridianForestText15
-	dw ViridianForestText16
+	def_text_pointers
+	dw_const ViridianForestYoungster1Text,      TEXT_VIRIDIANFOREST_YOUNGSTER1
+	dw_const ViridianForestYoungster2Text,      TEXT_VIRIDIANFOREST_YOUNGSTER2
+	dw_const ViridianForestYoungster3Text,      TEXT_VIRIDIANFOREST_YOUNGSTER3
+	dw_const ViridianForestYoungster4Text,      TEXT_VIRIDIANFOREST_YOUNGSTER4
+	dw_const ViridianForestCooltrainerFText,    TEXT_VIRIDIANFOREST_COOLTRAINER_F
+	dw_const ViridianForestYoungster5Text,      TEXT_VIRIDIANFOREST_YOUNGSTER5
+	dw_const PickUpItemText,                    TEXT_VIRIDIANFOREST_POTION1
+	dw_const PickUpItemText,                    TEXT_VIRIDIANFOREST_POTION2
+	dw_const PickUpItemText,                    TEXT_VIRIDIANFOREST_POKE_BALL
+	dw_const ViridianForestYoungster6Text,      TEXT_VIRIDIANFOREST_YOUNGSTER6
+	dw_const ViridianForestTrainerTips1Text,    TEXT_VIRIDIANFOREST_TRAINER_TIPS1
+	dw_const ViridianForestUseAntidoteSignText, TEXT_VIRIDIANFOREST_USE_ANTIDOTE_SIGN
+	dw_const ViridianForestTrainerTips2Text,    TEXT_VIRIDIANFOREST_TRAINER_TIPS2
+	dw_const ViridianForestTrainerTips3Text,    TEXT_VIRIDIANFOREST_TRAINER_TIPS3
+	dw_const ViridianForestTrainerTips4Text,    TEXT_VIRIDIANFOREST_TRAINER_TIPS4
+	dw_const ViridianForestLeavingSignText,     TEXT_VIRIDIANFOREST_LEAVING_SIGN
 
 ViridianForestTrainerHeaders:
 	def_trainers 2
 ViridianForestTrainerHeader0:
-	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestBattleText1, ViridianForestEndBattleText1, ViridianForestAfterBattleText1
+	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestYoungster2BattleText, ViridianForestYoungster2EndBattleText, ViridianForestYoungster2AfterBattleText
 ViridianForestTrainerHeader1:
-	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestBattleText2, ViridianForestEndBattleText2, ViridianForestAfterBattleText2
+	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestYoungster3BattleText, ViridianForestYoungster3EndBattleText, ViridianForestYoungster3AfterBattleText
 ViridianForestTrainerHeader2:
-	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestBattleText3, ViridianForestEndBattleText3, ViridianForestAfterBattleText3
+	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestYoungster4BattleText, ViridianForestYoungster4EndBattleText, ViridianForestYoungster4AfterBattleText
 ViridianForestTrainerHeader3:
-	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3, 0, ViridianForestBattleText4, ViridianForestEndBattleText4, ViridianForestAfterBattleText4
+	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_3, 0, ViridianForestCooltrainerFBattleText, ViridianForestCooltrainerFEndBattleText, ViridianForestCooltrainerFAfterBattleText
 ViridianForestTrainerHeader4:
-	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4, 4, ViridianForestBattleText5, ViridianForestEndBattleText5, ViridianForestAfterBattleText5
+	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_4, 4, ViridianForestYoungster5BattleText, ViridianForestYoungster5EndBattleText, ViridianForestYoungster5AfterBattleText
 	db -1 ; end
 
-ViridianForestText1:
-	text_far _ViridianForestText1
+ViridianForestYoungster1Text:
+	text_far _ViridianForestYoungster1Text
 	text_end
 
-ViridianForestText2:
+ViridianForestYoungster2Text:
 	text_asm
 	ld hl, ViridianForestTrainerHeader0
 	jr ViridianForestTalkToTrainer
 
-ViridianForestText3:
+ViridianForestYoungster3Text:
 	text_asm
 	ld hl, ViridianForestTrainerHeader1
 	jr ViridianForestTalkToTrainer
 
-ViridianForestText4:
+ViridianForestYoungster4Text:
 	text_asm
 	ld hl, ViridianForestTrainerHeader2
 	jr ViridianForestTalkToTrainer
 
-ViridianForestText5:
+ViridianForestCooltrainerFText:
 	text_asm
 	ld hl, ViridianForestTrainerHeader3
 	jr ViridianForestTalkToTrainer
 
-ViridianForestText6:
+ViridianForestYoungster5Text:
 	text_asm
 	ld hl, ViridianForestTrainerHeader4
 ViridianForestTalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
-ViridianForestBattleText1:
-	text_far _ViridianForestBattleText1
+ViridianForestYoungster2BattleText:
+	text_far _ViridianForestYoungster2BattleText
 	text_end
 
-ViridianForestEndBattleText1:
-	text_far _ViridianForestEndBattleText1
+ViridianForestYoungster2EndBattleText:
+	text_far _ViridianForestYoungster2EndBattleText
 	text_end
 
-ViridianForestAfterBattleText1:
-	text_far _ViridianFrstAfterBattleText1
+ViridianForestYoungster2AfterBattleText:
+	text_far _ViridianForestYoungster2AfterBattleText
 	text_end
 
-ViridianForestBattleText2:
-	text_far _ViridianForestBattleText2
+ViridianForestYoungster3BattleText:
+	text_far _ViridianForestYoungster3BattleText
 	text_end
 
-ViridianForestEndBattleText2:
-	text_far _ViridianForestEndBattleText2
+ViridianForestYoungster3EndBattleText:
+	text_far _ViridianForestYoungster3EndBattleText
 	text_end
 
-ViridianForestAfterBattleText2:
-	text_far _ViridianFrstAfterBattleText2
+ViridianForestYoungster3AfterBattleText:
+	text_far _ViridianForestYoungster3AfterBattleText
 	text_end
 
-ViridianForestBattleText3:
-	text_far _ViridianForestBattleText3
+ViridianForestYoungster4BattleText:
+	text_far _ViridianForestYoungster4BattleText
 	text_end
 
-ViridianForestEndBattleText3:
-	text_far _ViridianForestEndBattleText3
+ViridianForestYoungster4EndBattleText:
+	text_far _ViridianForestYoungster4EndBattleText
 	text_end
 
-ViridianForestAfterBattleText3:
-	text_far _ViridianFrstAfterBattleText3
+ViridianForestYoungster4AfterBattleText:
+	text_far _ViridianForestYoungster4AfterBattleText
 	text_end
 
-ViridianForestBattleText4:
-	text_far _ViridianForestBattleTextPikaGirl
+ViridianForestCooltrainerFBattleText:
+	text_far _ViridianForestCooltrainerFBattleText
 	text_end
 
-ViridianForestEndBattleText4:
-	text_far _ViridianForestEndBattleTextPikaGirl
+ViridianForestCooltrainerFEndBattleText:
+	text_far _ViridianForestCooltrainerFEndBattleText
 	text_end
 
-ViridianForestAfterBattleText4:
-	text_far _ViridianForestAfterBattleTextPikaGirl
+ViridianForestCooltrainerFAfterBattleText:
+	text_far _ViridianForestCooltrainerFAfterBattleText
 	text_end
 
-ViridianForestBattleText5:
-	text_far _ViridianForestBattleTextSamurai
+ViridianForestYoungster5BattleText:
+	text_far _ViridianForestYoungster5BattleText
 	text_end
 
-ViridianForestEndBattleText5:
-	text_far _ViridianForestEndBattleTextSamurai
+ViridianForestYoungster5EndBattleText:
+	text_far _ViridianForestYoungster5EndBattleText
 	text_end
 
-ViridianForestAfterBattleText5:
-	text_far _ViridianForestAfterBattleTextSamurai
+ViridianForestYoungster5AfterBattleText:
+	text_far _ViridianForestYoungster5AfterBattleText
 	text_end
 
-ViridianForestText10:
-	text_far _ViridianForestText8
+ViridianForestYoungster6Text:
+	text_far _ViridianForestYoungster6Text
 	text_end
 
-ViridianForestText11:
+ViridianForestTrainerTips1Text:
 	text_asm
-	ld hl, Func_f2528
-	jp ViridianForestScript_6120d
+	ld hl, ViridianForestPrintTrainerTips1Text
+	jp ViridianForestSign_Common
 
-ViridianForestText12:
+ViridianForestUseAntidoteSignText:
 	text_asm
-	ld hl, Func_f2534
-	jp ViridianForestScript_6120d
+	ld hl, ViridianForestPrintUseAntidoteSignText
+	jp ViridianForestSign_Common
 
-ViridianForestText13:
+ViridianForestTrainerTips2Text:
 	text_asm
-	ld hl, Func_f2540
-	jp ViridianForestScript_6120d
+	ld hl, ViridianForestPrintTrainerTips2Text
+	jp ViridianForestSign_Common
 
-ViridianForestText14:
+ViridianForestTrainerTips3Text:
 	text_asm
-	ld hl, Func_f254c
-	jp ViridianForestScript_6120d
+	ld hl, ViridianForestPrintTrainerTips3Text
+	jp ViridianForestSign_Common
 
-ViridianForestText15:
+ViridianForestTrainerTips4Text:
 	text_asm
-	ld hl, Func_f2558
-	jp ViridianForestScript_6120d
+	ld hl, ViridianForestPrintTrainerTips4Text
+	jp ViridianForestSign_Common
 
-ViridianForestText16:
+ViridianForestLeavingSignText:
 	text_asm
-	ld hl, Func_f2528
-ViridianForestScript_6120d:
-	ld b, BANK(Func_f2528)
+	ld hl, ViridianForestPrintTrainerTips1Text ; supposed to be ViridianForestPrintLeavingSignText
+ViridianForestSign_Common:
+	ld b, BANK(ViridianForestPrintTrainerTips1Text)
 	call Bankswitch
 	jp TextScriptEnd