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

1 files changed, 46 insertions, 44 deletions

diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm
index 016535c2..a2f4eaa3 100644
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -31,33 +31,34 @@ PewterGymResetScripts:
 	ret
 
 PewterGym_ScriptPointers:
-	dw CheckFightingMapTrainers
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw PewterGymBrockPostBattle
+	def_script_pointers
+	dw_const CheckFightingMapTrainers,              SCRIPT_PEWTERGYM_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_PEWTERGYM_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_PEWTERGYM_END_BATTLE
+	dw_const PewterGymBrockPostBattle,              SCRIPT_PEWTERGYM_BROCK_POST_BATTLE
 
 PewterGymBrockPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PewterGymResetScripts
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 ; fallthrough
 PewterGymScriptReceiveTM34:
-	ld a, $4
+	ld a, TEXT_PEWTERGYM_BROCK_WAIT_TAKE_THIS
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_BEAT_BROCK
 	lb bc, TM_BIDE, 1
 	call GiveItem
 	jr nc, .BagFull
-	ld a, $5
+	ld a, TEXT_PEWTERGYM_RECEIVED_TM34
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM34
 	jr .gymVictory
 .BagFull
-	ld a, $6
+	ld a, TEXT_PEWTERGYM_TM34_NO_ROOM
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 .gymVictory
@@ -81,20 +82,21 @@ PewterGymScriptReceiveTM34:
 	jp PewterGymResetScripts
 
 PewterGym_TextPointers:
-	dw BrockText
-	dw PewterGymTrainerText1
-	dw PewterGymGuideText
-	dw BeforeReceivedTM34Text
-	dw ReceivedTM34Text
-	dw TM34NoRoomText
+	def_text_pointers
+	dw_const PewterGymBrockText,             TEXT_PEWTERGYM_BROCK
+	dw_const PewterGymCooltrainerMText,      TEXT_PEWTERGYM_COOLTRAINER_M
+	dw_const PewterGymGuideText,             TEXT_PEWTERGYM_GYM_GUIDE
+	dw_const PewterGymBrockWaitTakeThisText, TEXT_PEWTERGYM_BROCK_WAIT_TAKE_THIS
+	dw_const PewterGymReceivedTM34Text,      TEXT_PEWTERGYM_RECEIVED_TM34
+	dw_const PewterGymTM34NoRoomText,        TEXT_PEWTERGYM_TM34_NO_ROOM
 
 PewterGymTrainerHeaders:
 	def_trainers 2
 PewterGymTrainerHeader0:
-	trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1
+	trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymCooltrainerMBattleText, PewterGymCooltrainerMEndBattleText, PewterGymCooltrainerMAfterBattleText
 	db -1 ; end
 
-BrockText:
+PewterGymBrockText:
 	text_asm
 	CheckEvent EVENT_BEAT_BROCK
 	jr z, .beforeBeat
@@ -104,17 +106,17 @@ BrockText:
 	call DisableWaitingAfterTextDisplay
 	jr .done
 .afterBeat
-	ld hl, BrockPostBattleAdviceText
+	ld hl, .PostBattleAdviceText
 	call PrintText
 	jr .done
 .beforeBeat
-	ld hl, BrockPreBattleText
+	ld hl, .PreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, ReceivedBoulderBadgeText
-	ld de, ReceivedBoulderBadgeText
+	ld hl, PewterGymBrockReceivedBoulderBadgeText
+	ld de, PewterGymBrockReceivedBoulderBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -124,56 +126,56 @@ BrockText:
 	ld [wGymLeaderNo], a
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $3
+	ld a, SCRIPT_PEWTERGYM_BROCK_POST_BATTLE
 	ld [wPewterGymCurScript], a
 	ld [wCurMapScript], a
 .done
 	jp TextScriptEnd
 
-BrockPreBattleText:
-	text_far _BrockPreBattleText
+.PreBattleText:
+	text_far _PewterGymBrockPreBattleText
 	text_end
 
-BrockPostBattleAdviceText:
-	text_far _BrockPostBattleAdviceText
+.PostBattleAdviceText:
+	text_far _PewterGymBrockPostBattleAdviceText
 	text_end
 
-BeforeReceivedTM34Text:
-	text_far _BeforeReceivedTM34Text
+PewterGymBrockWaitTakeThisText:
+	text_far _PewterGymBrockWaitTakeThisText
 	text_end
 
-ReceivedTM34Text:
-	text_far _ReceivedTM34Text
+PewterGymReceivedTM34Text:
+	text_far _PewterGymReceivedTM34Text
 	sound_get_item_1
 	text_far _TM34ExplanationText
 	text_end
 
-TM34NoRoomText:
-	text_far _TM34NoRoomText
+PewterGymTM34NoRoomText:
+	text_far _PewterGymTM34NoRoomText
 	text_end
 
-ReceivedBoulderBadgeText:
-	text_far _ReceivedBoulderBadgeText
+PewterGymBrockReceivedBoulderBadgeText:
+	text_far _PewterGymBrockReceivedBoulderBadgeText
 	sound_get_item_1
-	text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used
+	text_far _PewterGymBrockBoulderBadgeInfoText ; Text to tell that the flash technique can be used
 	text_end
 
-PewterGymTrainerText1:
+PewterGymCooltrainerMText:
 	text_asm
 	ld hl, PewterGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-PewterGymBattleText1:
-	text_far _PewterGymBattleText1
+PewterGymCooltrainerMBattleText:
+	text_far _PewterGymCooltrainerMBattleText
 	text_end
 
-PewterGymEndBattleText1:
-	text_far _PewterGymEndBattleText1
+PewterGymCooltrainerMEndBattleText:
+	text_far _PewterGymCooltrainerMEndBattleText
 	text_end
 
-PewterGymAfterBattleText1:
-	text_far _PewterGymAfterBattleText1
+PewterGymCooltrainerMAfterBattleText:
+	text_far _PewterGymCooltrainerMAfterBattleText
 	text_end
 
 PewterGymGuideText:
@@ -194,7 +196,7 @@ PewterGymGuideText:
 	call PrintText
 	jr .PewterGymGuideAdviceText
 .PewterGymGuideBeginAdviceText
-	ld hl, PewterGymText_5c524
+	ld hl, PewterGymGuideFreeServiceText
 	call PrintText
 .PewterGymGuideAdviceText
 	ld hl, PewterGymGuideAdviceText
@@ -222,8 +224,8 @@ PewterGymGuideAdviceText:
 	text_far _PewterGymGuideAdviceText
 	text_end
 
-PewterGymText_5c524:
-	text_far _PewterGymText_5c524
+PewterGymGuideFreeServiceText:
+	text_far _PewterGymGuideFreeServiceText
 	text_end
 
 PewterGymGuidePostBattleText: