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

1 files changed, 68 insertions, 66 deletions

diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm
index 610a0ca0..e4a61de5 100644
--- a/scripts/SSAnneB1FRooms.asm
+++ b/scripts/SSAnneB1FRooms.asm
@@ -8,154 +8,156 @@ SSAnneB1FRooms_Script:
 	ret
 
 SSAnneB1FRooms_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_SSANNEB1FROOMS_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SSANNEB1FROOMS_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_SSANNEB1FROOMS_END_BATTLE
 
 SSAnneB1FRooms_TextPointers:
-	dw SSAnne10Text1
-	dw SSAnne10Text2
-	dw SSAnne10Text3
-	dw SSAnne10Text4
-	dw SSAnne10Text5
-	dw SSAnne10Text6
-	dw SSAnne10Text7
-	dw SSAnne10Text8
-	dw PickUpItemText
-	dw PickUpItemText
-	dw PickUpItemText
+	def_text_pointers
+	dw_const SSAnneB1FRoomsSailor1Text,   TEXT_SSANNEB1FROOMS_SAILOR1
+	dw_const SSAnneB1FRoomsSailor2Text,   TEXT_SSANNEB1FROOMS_SAILOR2
+	dw_const SSAnneB1FRoomsSailor3Text,   TEXT_SSANNEB1FROOMS_SAILOR3
+	dw_const SSAnneB1FRoomsSailor4Text,   TEXT_SSANNEB1FROOMS_SAILOR4
+	dw_const SSAnneB1FRoomsSailor5Text,   TEXT_SSANNEB1FROOMS_SAILOR5
+	dw_const SSAnneB1FRoomsFisherText,    TEXT_SSANNEB1FROOMS_FISHER
+	dw_const SSAnneB1FRoomsSuperNerdText, TEXT_SSANNEB1FROOMS_SUPER_NERD
+	dw_const SSAnneB1FRoomsMachokeText,   TEXT_SSANNEB1FROOMS_MACHOKE
+	dw_const PickUpItemText,              TEXT_SSANNEB1FROOMS_ETHER
+	dw_const PickUpItemText,              TEXT_SSANNEB1FROOMS_TM_REST
+	dw_const PickUpItemText,              TEXT_SSANNEB1FROOMS_MAX_POTION
 
 SSAnne10TrainerHeaders:
 	def_trainers
 SSAnne10TrainerHeader0:
-	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnneB1FRoomsSailor1BattleText, SSAnneB1FRoomsSailor1EndBattleText, SSAnneB1FRoomsSailor1AfterBattleText
 SSAnne10TrainerHeader1:
-	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnne10BattleText2, SSAnne10EndBattleText2, SSAnne10AfterBattleText2
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnneB1FRoomsSailor2BattleText, SSAnneB1FRoomsSailor2EndBattleText, SSAnneB1FRoomsSailor2AfterBattleText
 SSAnne10TrainerHeader2:
-	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnne10BattleText3, SSAnne10EndBattleText3, SSAnne10AfterBattleText3
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnneB1FRoomsSailor3BattleText, SSAnneB1FRoomsSailor3EndBattleText, SSAnneB1FRoomsSailor3AfterBattleText
 SSAnne10TrainerHeader3:
-	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnne10BattleText4, SSAnne10EndBattleText4, SSAnne10AfterBattleText4
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnneB1FRoomsSailor4BattleText, SSAnneB1FRoomsSailor4EndBattleText, SSAnneB1FRoomsSailor4AfterBattleText
 SSAnne10TrainerHeader4:
-	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnne10BattleText5, SSAnne10EndBattleText5, SSAnne10AfterBattleText5
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnneB1FRoomsSailor5BattleText, SSAnneB1FRoomsSailor5EndBattleText, SSAnneB1FRoomsSailor5AfterBattleText
 SSAnne10TrainerHeader5:
-	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnne10BattleText6, SSAnne10EndBattleText6, SSAnne10AfterBattleText6
+	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnneB1FRoomsFisherBattleText, SSAnneB1FRoomsFisherEndBattleText, SSAnneB1FRoomsFisherAfterBattleText
 	db -1 ; end
 
-SSAnne10Text1:
+SSAnneB1FRoomsSailor1Text:
 	text_asm
 	ld hl, SSAnne10TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text2:
+SSAnneB1FRoomsSailor2Text:
 	text_asm
 	ld hl, SSAnne10TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text3:
+SSAnneB1FRoomsSailor3Text:
 	text_asm
 	ld hl, SSAnne10TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text4:
+SSAnneB1FRoomsSailor4Text:
 	text_asm
 	ld hl, SSAnne10TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text5:
+SSAnneB1FRoomsSailor5Text:
 	text_asm
 	ld hl, SSAnne10TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text6:
+SSAnneB1FRoomsFisherText:
 	text_asm
 	ld hl, SSAnne10TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SSAnne10Text8:
-	text_far _SSAnne10Text8
+SSAnneB1FRoomsMachokeText:
+	text_far _SSAnneB1FRoomsMachokeText
 	text_asm
 	ld a, MACHOKE
 	call PlayCry
 	jp TextScriptEnd
 
-SSAnne10BattleText1:
-	text_far _SSAnne10BattleText1
+SSAnneB1FRoomsSailor1BattleText:
+	text_far _SSAnneB1FRoomsSailor1BattleText
 	text_end
 
-SSAnne10EndBattleText1:
-	text_far _SSAnne10EndBattleText1
+SSAnneB1FRoomsSailor1EndBattleText:
+	text_far _SSAnneB1FRoomsSailor1EndBattleText
 	text_end
 
-SSAnne10AfterBattleText1:
-	text_far _SSAnne10AfterBattleText1
+SSAnneB1FRoomsSailor1AfterBattleText:
+	text_far _SSAnneB1FRoomsSailor1AfterBattleText
 	text_end
 
-SSAnne10BattleText2:
-	text_far _SSAnne10BattleText2
+SSAnneB1FRoomsSailor2BattleText:
+	text_far _SSAnneB1FRoomsSailor2BattleText
 	text_end
 
-SSAnne10EndBattleText2:
-	text_far _SSAnne10EndBattleText2
+SSAnneB1FRoomsSailor2EndBattleText:
+	text_far _SSAnneB1FRoomsSailor2EndBattleText
 	text_end
 
-SSAnne10AfterBattleText2:
-	text_far _SSAnne10AfterBattleText2
+SSAnneB1FRoomsSailor2AfterBattleText:
+	text_far _SSAnneB1FRoomsSailor2AfterBattleText
 	text_end
 
-SSAnne10BattleText3:
-	text_far _SSAnne10BattleText3
+SSAnneB1FRoomsSailor3BattleText:
+	text_far _SSAnneB1FRoomsSailor3BattleText
 	text_end
 
-SSAnne10EndBattleText3:
-	text_far _SSAnne10EndBattleText3
+SSAnneB1FRoomsSailor3EndBattleText:
+	text_far _SSAnneB1FRoomsSailor3EndBattleText
 	text_end
 
-SSAnne10AfterBattleText3:
-	text_far _SSAnne10AfterBattleText3
+SSAnneB1FRoomsSailor3AfterBattleText:
+	text_far _SSAnneB1FRoomsSailor3AfterBattleText
 	text_end
 
-SSAnne10BattleText4:
-	text_far _SSAnne10BattleText4
+SSAnneB1FRoomsSailor4BattleText:
+	text_far _SSAnneB1FRoomsSailor4BattleText
 	text_end
 
-SSAnne10EndBattleText4:
-	text_far _SSAnne10EndBattleText4
+SSAnneB1FRoomsSailor4EndBattleText:
+	text_far _SSAnneB1FRoomsSailor4EndBattleText
 	text_end
 
-SSAnne10AfterBattleText4:
-	text_far _SSAnne10AfterBattleText4
+SSAnneB1FRoomsSailor4AfterBattleText:
+	text_far _SSAnneB1FRoomsSailor4AfterBattleText
 	text_end
 
-SSAnne10BattleText5:
-	text_far _SSAnne10BattleText5
+SSAnneB1FRoomsSailor5BattleText:
+	text_far _SSAnneB1FRoomsSailor5BattleText
 	text_end
 
-SSAnne10EndBattleText5:
-	text_far _SSAnne10EndBattleText5
+SSAnneB1FRoomsSailor5EndBattleText:
+	text_far _SSAnneB1FRoomsSailor5EndBattleText
 	text_end
 
-SSAnne10AfterBattleText5:
-	text_far _SSAnne10AfterBattleText5
+SSAnneB1FRoomsSailor5AfterBattleText:
+	text_far _SSAnneB1FRoomsSailor5AfterBattleText
 	text_end
 
-SSAnne10BattleText6:
-	text_far _SSAnne10BattleText6
+SSAnneB1FRoomsFisherBattleText:
+	text_far _SSAnneB1FRoomsFisherBattleText
 	text_end
 
-SSAnne10EndBattleText6:
-	text_far _SSAnne10EndBattleText6
+SSAnneB1FRoomsFisherEndBattleText:
+	text_far _SSAnneB1FRoomsFisherEndBattleText
 	text_end
 
-SSAnne10AfterBattleText6:
-	text_far _SSAnne10AfterBattleText6
+SSAnneB1FRoomsFisherAfterBattleText:
+	text_far _SSAnneB1FRoomsFisherAfterBattleText
 	text_end
 
-SSAnne10Text7:
-	text_far _SSAnne10Text7
+SSAnneB1FRoomsSuperNerdText:
+	text_far _SSAnneB1FRoomsSuperNerdText
 	text_end