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

scripts/AgathasRoom.asm

@@ -1,7 +1,7 @@
 AgathasRoom_Script:
 	call AgathaShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, AgathaTrainerHeader0
+	ld hl, AgathasRoomTrainerHeaders
 	ld de, AgathasRoom_ScriptPointers
 	ld a, [wAgathasRoomCurScript]
 	call ExecuteCurMapScriptInTable
@@ -120,13 +120,15 @@ AgathasRoom_TextPointers:
 	dw AgathaText1
 	dw AgathaDontRunAwayText
 
-AgathaTrainerHeader0:
+AgathasRoomTrainerHeaders:
+	def_trainers
+AgathasRoomTrainerHeader0:
 	trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText
 	db -1 ; end
 
 AgathaText1:
 	text_asm
-	ld hl, AgathaTrainerHeader0
+	ld hl, AgathasRoomTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/BrunosRoom.asm

@@ -1,7 +1,7 @@
 BrunosRoom_Script:
 	call BrunoShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, BrunoTrainerHeader0
+	ld hl, BrunosRoomTrainerHeaders
 	ld de, BrunosRoom_ScriptPointers
 	ld a, [wBrunosRoomCurScript]
 	call ExecuteCurMapScriptInTable
@@ -117,13 +117,15 @@ BrunosRoom_TextPointers:
 	dw BrunoText1
 	dw BrunoDontRunAwayText
 
-BrunoTrainerHeader0:
+BrunosRoomTrainerHeaders:
+	def_trainers
+BrunosRoomTrainerHeader0:
 	trainer EVENT_BEAT_BRUNOS_ROOM_TRAINER_0, 0, BrunoBeforeBattleText, BrunoEndBattleText, BrunoAfterBattleText
 	db -1 ; end
 
 BrunoText1:
 	text_asm
-	ld hl, BrunoTrainerHeader0
+	ld hl, BrunosRoomTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/CeladonGym.asm

@@ -4,7 +4,7 @@ CeladonGym_Script:
 	res 6, [hl]
 	call nz, .LoadNames
 	call EnableAutoTextBoxDrawing
-	ld hl, CeladonGymTrainerHeader0
+	ld hl, CeladonGymTrainerHeaders
 	ld de, CeladonGym_ScriptPointers
 	ld a, [wCeladonGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,7 +22,7 @@ CeladonGym_Script:
 .LeaderName:
 	db "ERIKA@"
 
-CeladonGymText_48943:
+CeladonGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCeladonGymCurScript], a
@@ -33,16 +33,16 @@ CeladonGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw CeladonGymScript3
+	dw CeladonGymErikaPostBattle
 
-CeladonGymScript3:
+CeladonGymErikaPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, CeladonGymText_48943
+	jp z, CeladonGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-CeladonGymText_48963:
+CeladonGymReceiveTM21:
 	ld a, $9
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -68,21 +68,23 @@ CeladonGymText_48963:
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6
 
-	jp CeladonGymText_48943
+	jp CeladonGymResetScripts
 
 CeladonGym_TextPointers:
-	dw CeladonGymText1
-	dw CeladonGymText2
-	dw CeladonGymText3
-	dw CeladonGymText4
-	dw CeladonGymText5
-	dw CeladonGymText6
-	dw CeladonGymText7
-	dw CeladonGymText8
-	dw CeladonGymText9
-	dw TM21Text
+	dw ErikaText
+	dw CeladonGymTrainerText1
+	dw CeladonGymTrainerText2
+	dw CeladonGymTrainerText3
+	dw CeladonGymTrainerText4
+	dw CeladonGymTrainerText5
+	dw CeladonGymTrainerText6
+	dw CeladonGymTrainerText7
+	dw ErikaRainbowBadgeInfoText
+	dw ReceivedTM21Text
 	dw TM21NoRoomText
 
+CeladonGymTrainerHeaders:
+	def_trainers 2
 CeladonGymTrainerHeader0:
 	trainer EVENT_BEAT_CELADON_GYM_TRAINER_0, 2, CeladonGymBattleText2, CeladonGymEndBattleText2, CeladonGymAfterBattleText2
 CeladonGymTrainerHeader1:
@@ -96,30 +98,30 @@ CeladonGymTrainerHeader4:
 CeladonGymTrainerHeader5:
 	trainer EVENT_BEAT_CELADON_GYM_TRAINER_5, 2, CeladonGymBattleText7, CeladonGymEndBattleText7, CeladonGymAfterBattleText7
 CeladonGymTrainerHeader6:
-	trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 1, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8
+	trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8
 	db -1 ; end
 
-CeladonGymText1:
+ErikaText:
 	text_asm
 	CheckEvent EVENT_BEAT_ERIKA
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM21
-	jr nz, .afterVictory
-	call z, CeladonGymText_48963
+	jr nz, .afterBeat
+	call z, CeladonGymReceiveTM21
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.afterVictory
-	ld hl, CeladonGymText_48a68
+.afterBeat
+	ld hl, ErikaPostBattleAdviceText
 	call PrintText
 	jr .done
-.beginBattle
-	ld hl, CeladonGymText_48a5e
+.beforeBeat
+	ld hl, ErikaPreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, CeladonGymText_48a63
-	ld de, CeladonGymText_48a63
+	ld hl, ReceivedRainbowBadgeText
+	ld de, ReceivedRainbowBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -133,23 +135,23 @@ CeladonGymText1:
 .done
 	jp TextScriptEnd
 
-CeladonGymText_48a5e:
-	text_far _CeladonGymText_48a5e
+ErikaPreBattleText:
+	text_far _ErikaPreBattleText
 	text_end
 
-CeladonGymText_48a63:
-	text_far _CeladonGymText_48a63
+ReceivedRainbowBadgeText:
+	text_far _ReceivedRainbowBadgeText
 	text_end
 
-CeladonGymText_48a68:
-	text_far _CeladonGymText_48a68
+ErikaPostBattleAdviceText:
+	text_far _ErikaPostBattleAdviceText
 	text_end
 
-CeladonGymText9:
-	text_far _CeladonGymText9
+ErikaRainbowBadgeInfoText:
+	text_far _ErikaRainbowBadgeInfoText
 	text_end
 
-TM21Text:
+ReceivedTM21Text:
 	text_far _ReceivedTM21Text
 	sound_get_item_1
 	text_far _TM21ExplanationText
@@ -159,7 +161,7 @@ TM21NoRoomText:
 	text_far _TM21NoRoomText
 	text_end
 
-CeladonGymText2:
+CeladonGymTrainerText1:
 	text_asm
 	ld hl, CeladonGymTrainerHeader0
 	call TalkToTrainer
@@ -177,7 +179,7 @@ CeladonGymAfterBattleText2:
 	text_far _CeladonGymAfterBattleText2
 	text_end
 
-CeladonGymText3:
+CeladonGymTrainerText2:
 	text_asm
 	ld hl, CeladonGymTrainerHeader1
 	call TalkToTrainer
@@ -195,7 +197,7 @@ CeladonGymAfterBattleText3:
 	text_far _CeladonGymAfterBattleText3
 	text_end
 
-CeladonGymText4:
+CeladonGymTrainerText3:
 	text_asm
 	ld hl, CeladonGymTrainerHeader2
 	call TalkToTrainer
@@ -213,7 +215,7 @@ CeladonGymAfterBattleText4:
 	text_far _CeladonGymAfterBattleText4
 	text_end
 
-CeladonGymText5:
+CeladonGymTrainerText4:
 	text_asm
 	ld hl, CeladonGymTrainerHeader3
 	call TalkToTrainer
@@ -231,7 +233,7 @@ CeladonGymAfterBattleText5:
 	text_far _CeladonGymAfterBattleText5
 	text_end
 
-CeladonGymText6:
+CeladonGymTrainerText5:
 	text_asm
 	ld hl, CeladonGymTrainerHeader4
 	call TalkToTrainer
@@ -249,7 +251,7 @@ CeladonGymAfterBattleText6:
 	text_far _CeladonGymAfterBattleText6
 	text_end
 
-CeladonGymText7:
+CeladonGymTrainerText6:
 	text_asm
 	ld hl, CeladonGymTrainerHeader5
 	call TalkToTrainer
@@ -267,7 +269,7 @@ CeladonGymAfterBattleText7:
 	text_far _CeladonGymAfterBattleText7
 	text_end
 
-CeladonGymText8:
+CeladonGymTrainerText7:
 	text_asm
 	ld hl, CeladonGymTrainerHeader6
 	call TalkToTrainer

scripts/CeruleanCaveB1F.asm

@@ -1,6 +1,6 @@
 CeruleanCaveB1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, MewtwoTrainerHeader
+	ld hl, CeruleanCaveB1FTrainerHeaders
 	ld de, CeruleanCaveB1F_ScriptPointers
 	ld a, [wCeruleanCaveB1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -17,6 +17,8 @@ CeruleanCaveB1F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+CeruleanCaveB1FTrainerHeaders:
+	def_trainers
 MewtwoTrainerHeader:
 	trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText
 	db -1 ; end

scripts/CeruleanCity.asm

@@ -40,18 +40,18 @@ IF DEF(_DEBUG)
 	ret nz
 ENDC
 	CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
-	jr nz, .asm_194f7
+	jr nz, .skipRocketThiefEncounter
 	ld hl, CeruleanCityCoords1
 	call ArePlayerCoordsInArray
-	jr nc, .asm_194f7
+	jr nc, .skipRocketThiefEncounter
 	ld a, [wCoordIndex]
 	cp $1
 	ld a, PLAYER_DIR_UP
 	ld b, SPRITE_FACING_DOWN
-	jr nz, .asm_194e6
+	jr nz, .playerBelowRocketThief
 	ld a, PLAYER_DIR_DOWN
 	ld b, SPRITE_FACING_UP
-.asm_194e6
+.playerBelowRocketThief
 	ld [wPlayerMovingDirection], a
 	ld a, b
 	ld [wSprite02StateData1FacingDirection], a
@@ -59,7 +59,7 @@ ENDC
 	ld a, $2
 	ldh [hSpriteIndexOrTextID], a
 	jp DisplayTextID
-.asm_194f7
+.skipRocketThiefEncounter
 	CheckEvent EVENT_BEAT_CERULEAN_RIVAL
 	ret nz
 	ld hl, CeruleanCityCoords2
@@ -67,11 +67,11 @@ ENDC
 	ret nc
 	ld a, [wWalkBikeSurfState]
 	and a
-	jr z, .asm_19512
+	jr z, .walking
 	ld a, SFX_STOP_ALL_MUSIC
 ;	ld [wNewSoundID], a
 	call PlaySound
-.asm_19512
+.walking
 	ld c, 0 ; BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
@@ -80,15 +80,15 @@ ENDC
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, [wXCoord]
-	cp 20
-	jr z, .asm_19535
+	cp 20 ; is the player standing on the right side of the bridge?
+	jr z, .playerOnRightSideOfBridge
 	ld a, $1
 	ldh [hSpriteIndex], a
 	ld a, SPRITESTATEDATA2_MAPX
 	ldh [hSpriteDataOffset], a
 	call GetPointerWithinSpriteStateData2
 	ld [hl], 25
-.asm_19535
+.playerOnRightSideOfBridge
 	ld a, HS_CERULEAN_RIVAL
 	ld [wMissableObjectIndex], a
 	predef ShowObject
@@ -183,13 +183,13 @@ CeruleanCityScript2:
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
 	ld a, [wXCoord]
-	cp 20
-	jr nz, .asm_195f0
+	cp 20 ; is the player standing on the right side of the bridge?
+	jr nz, .playerOnRightSideOfBridge
 	ld de, CeruleanCityMovement4
-	jr .asm_195f3
-.asm_195f0
+	jr .skip
+.playerOnRightSideOfBridge
 	ld de, CeruleanCityMovement3
-.asm_195f3
+.skip
 	ld a, $1
 	ldh [hSpriteIndex], a
 	call MoveSprite
@@ -284,7 +284,7 @@ CeruleanCityText_19677:
 CeruleanCityText2:
 	text_asm
 	CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
-	jr nz, .asm_4ca20
+	jr nz, .beatRocketThief
 	ld hl, CeruleanCityText_196d9
 	call PrintText
 	ld hl, wd72d
@@ -300,7 +300,7 @@ CeruleanCityText2:
 	ld a, $4
 	ld [wCeruleanCityCurScript], a
 	jp TextScriptEnd
-.asm_4ca20
+.beatRocketThief
 	ld hl, CeruleanCityText_196f3
 	call PrintText
 	lb bc, TM_DIG, 1
@@ -361,21 +361,22 @@ CeruleanCityText6:
 CeruleanCityText7:
 	text_asm
 	ldh a, [hRandomAdd]
-	cp 180
-	jr c, .asm_e9fc9
+	cp 180 ; 76/256 chance of 1st dialogue
+	jr c, .notFirstText
 	ld hl, CeruleanCityText_19730
 	call PrintText
-	jr .asm_d486e
-.asm_e9fc9
-	cp 100
-	jr c, .asm_df99b
+	jr .end
+.notFirstText
+	cp 100 ; 80/256 chance of 2nd dialogue
+	jr c, .notSecondText
 	ld hl, CeruleanCityText_19735
 	call PrintText
-	jr .asm_d486e
-.asm_df99b
+	jr .end
+.notSecondText
+	; 100/256 chance of 3rd dialogue
 	ld hl, CeruleanCityText_1973a
 	call PrintText
-.asm_d486e
+.end
 	jp TextScriptEnd
 
 CeruleanCityText_19730:
@@ -393,27 +394,28 @@ CeruleanCityText_1973a:
 CeruleanCityText8:
 	text_asm
 	ldh a, [hRandomAdd]
-	cp 180
-	jr c, .asm_e28da
+	cp 180 ; 76/256 chance of 1st dialogue
+	jr c, .notFirstText
 	ld hl, CeruleanCityText_1976f
 	call PrintText
-	jr .asm_f2f38
-.asm_e28da
-	cp 120
-	jr c, .asm_15d08
+	jr .end
+.notFirstText
+	cp 120 ; 60/256 chance of 2nd dialogue
+	jr c, .notSecondText
 	ld hl, CeruleanCityText_19774
 	call PrintText
-	jr .asm_f2f38
-.asm_15d08
-	cp 60
-	jr c, .asm_d7fea
+	jr .end
+.notSecondText
+	cp 60 ; 60/256 chance of 3rd dialogue
+	jr c, .notThirdText
 	ld hl, CeruleanCityText_19779
 	call PrintText
-	jr .asm_f2f38
-.asm_d7fea
+	jr .end
+.notThirdText
+	; 60/256 chance of 4th dialogue
 	ld hl, CeruleanCityText_1977e
 	call PrintText
-.asm_f2f38
+.end
 	jp TextScriptEnd
 
 CeruleanCityText_1976f:

scripts/CeruleanGym.asm

@@ -4,7 +4,7 @@ CeruleanGym_Script:
 	res 6, [hl]
 	call nz, .LoadNames
 	call EnableAutoTextBoxDrawing
-	ld hl, CeruleanGymTrainerHeader0
+	ld hl, CeruleanGymTrainerHeaders
 	ld de, CeruleanGym_ScriptPointers
 	ld a, [wCeruleanGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,7 +22,7 @@ CeruleanGym_Script:
 .LeaderName:
 	db "MISTY@"
 
-CeruleanGymScript_5c6ed:
+CeruleanGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCeruleanGymCurScript], a
@@ -33,16 +33,16 @@ CeruleanGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw CeruleanGymScript3
+	dw CeruleanGymMistyPostBattle
 
-CeruleanGymScript3:
+CeruleanGymMistyPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, CeruleanGymScript_5c6ed
+	jp z, CeruleanGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-CeruleanGymScript_5c70d:
+CeruleanGymReceiveTM11:
 	ld a, $5
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -68,44 +68,46 @@ CeruleanGymScript_5c70d:
 	; deactivate gym trainers
 	SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1
 
-	jp CeruleanGymScript_5c6ed
+	jp CeruleanGymResetScripts
 
 CeruleanGym_TextPointers:
-	dw CeruleanGymText1
-	dw CeruleanGymText2
-	dw CeruleanGymText3
-	dw CeruleanGymText4
-	dw CeruleanGymText5
-	dw CeruleanGymText6
-	dw CeruleanGymText7
+	dw MistyText
+	dw CeruleanGymTrainerText1
+	dw CeruleanGymTrainerText2
+	dw CeruleanGymGuideText
+	dw MistyCascadeBadgeInfoText
+	dw ReceivedTM11Text
+	dw TM11NoRoomText
 
+CeruleanGymTrainerHeaders:
+	def_trainers 2
 CeruleanGymTrainerHeader0:
 	trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_0, 3, CeruleanGymBattleText1, CeruleanGymEndBattleText1, CeruleanGymAfterBattleText1
 CeruleanGymTrainerHeader1:
 	trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2
 	db -1 ; end
 
-CeruleanGymText1:
+MistyText:
 	text_asm
 	CheckEvent EVENT_BEAT_MISTY
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM11
-	jr nz, .afterVictory
-	call z, CeruleanGymScript_5c70d
+	jr nz, .afterBeat
+	call z, CeruleanGymReceiveTM11
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.afterVictory
-	ld hl, CeruleanGymText_5c7c3
+.afterBeat
+	ld hl, TM11ExplanationText
 	call PrintText
 	jr .done
-.beginBattle
-	ld hl, CeruleanGymText_5c7be
+.beforeBeat
+	ld hl, MistyPreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, CeruleanGymText_5c7d8
-	ld de, CeruleanGymText_5c7d8
+	ld hl, ReceivedCascadeBadgeText
+	ld de, ReceivedCascadeBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -120,34 +122,34 @@ CeruleanGymText1:
 .done
 	jp TextScriptEnd
 
-CeruleanGymText_5c7be:
-	text_far _CeruleanGymText_5c7be
+MistyPreBattleText:
+	text_far _MistyPreBattleText
 	text_end
 
-CeruleanGymText_5c7c3:
-	text_far _CeruleanGymText_5c7c3
+TM11ExplanationText:
+	text_far _TM11ExplanationText
 	text_end
 
-CeruleanGymText5:
-	text_far _CeruleanGymText_5c7c8
+MistyCascadeBadgeInfoText:
+	text_far _MistyCascadeBadgeInfoText
 	text_end
 
-CeruleanGymText6:
+ReceivedTM11Text:
 	text_far _ReceivedTM11Text
 	sound_get_item_1
 	text_end
 
-CeruleanGymText7:
-	text_far _CeruleanGymText_5c7d3
+TM11NoRoomText:
+	text_far _TM11NoRoomText
 	text_end
 
-CeruleanGymText_5c7d8:
-	text_far _CeruleanGymText_5c7d8
+ReceivedCascadeBadgeText:
+	text_far _ReceivedCascadeBadgeText
 	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
 	text_promptbutton
 	text_end
 
-CeruleanGymText2:
+CeruleanGymTrainerText1:
 	text_asm
 	ld hl, CeruleanGymTrainerHeader0
 	call TalkToTrainer
@@ -165,7 +167,7 @@ CeruleanGymAfterBattleText1:
 	text_far _CeruleanGymAfterBattleText1
 	text_end
 
-CeruleanGymText3:
+CeruleanGymTrainerText2:
 	text_asm
 	ld hl, CeruleanGymTrainerHeader1
 	call TalkToTrainer
@@ -183,23 +185,23 @@ CeruleanGymAfterBattleText2:
 	text_far _CeruleanGymAfterBattleText2
 	text_end
 
-CeruleanGymText4:
+CeruleanGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_MISTY
-	jr nz, .asm_5c821
-	ld hl, CeruleanGymText_5c82a
+	jr nz, .afterBeat
+	ld hl, CeruleanGymGuidePreBattleText
 	call PrintText
-	jr .asm_5c827
-.asm_5c821
-	ld hl, CeruleanGymText_5c82f
+	jr .done
+.afterBeat
+	ld hl, CeruleanGymGuidePostBattleText
 	call PrintText
-.asm_5c827
+.done
 	jp TextScriptEnd
 
-CeruleanGymText_5c82a:
-	text_far _CeruleanGymText_5c82a
+CeruleanGymGuidePreBattleText:
+	text_far _CeruleanGymGuidePreBattleText
 	text_end
 
-CeruleanGymText_5c82f:
-	text_far _CeruleanGymText_5c82f
+CeruleanGymGuidePostBattleText:
+	text_far _CeruleanGymGuidePostBattleText
 	text_end

scripts/CinnabarGym.asm

@@ -1,11 +1,11 @@
 CinnabarGym_Script:
-	call CinnabarGymScript_75759
+	call CinnabarGymSetMapAndTiles
 	call EnableAutoTextBoxDrawing
 	ld hl, CinnabarGym_ScriptPointers
 	ld a, [wCinnabarGymCurScript]
 	jp CallFunctionInTable
 
-CinnabarGymScript_75759:
+CinnabarGymSetMapAndTiles:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -29,7 +29,7 @@ CinnabarGymScript_75759:
 .LeaderName:
 	db "BLAINE@"
 
-CinnabarGymScript_75792:
+CinnabarGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wCinnabarGymCurScript], a
@@ -37,7 +37,7 @@ CinnabarGymScript_75792:
 	ld [wOpponentAfterWrongAnswer], a
 	ret
 
-CinnabarGymScript_757a0:
+CinnabarGymSetTrainerHeader:
 	ldh a, [hSpriteIndexOrTextID]
 	ld [wTrainerHeaderFlagBit], a
 	ret
@@ -46,7 +46,7 @@ CinnabarGym_ScriptPointers:
 	dw CinnabarGymScript0
 	dw CinnabarGymScript1
 	dw CinnabarGymScript2
-	dw CinnabarGymScript3
+	dw CinnabarGymBlainePostBattle
 
 CinnabarGymScript0:
 	ld a, [wOpponentAfterWrongAnswer]
@@ -57,25 +57,25 @@ CinnabarGymScript0:
 	jr nz, .asm_757c3
 	ld a, PLAYER_DIR_DOWN
 	ld [wPlayerMovingDirection], a
-	ld de, MovementData_757d7
-	jr .asm_757cb
+	ld de, MovementNpcToLeftAndUp
+	jr .MoveSprite
 .asm_757c3
-	ld de, MovementData_757da
+	ld de, MovementNpcToLeft
 	ld a, PLAYER_DIR_RIGHT
 	ld [wPlayerMovingDirection], a
-.asm_757cb
+.MoveSprite
 	call MoveSprite
 	ld a, $1
 	ld [wCinnabarGymCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-MovementData_757d7:
+MovementNpcToLeftAndUp:
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
 	db -1 ; end
 
-MovementData_757da:
+MovementNpcToLeft:
 	db NPC_MOVEMENT_LEFT
 	db -1 ; end
 
@@ -96,7 +96,7 @@ CinnabarGymFlagAction:
 CinnabarGymScript2:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, CinnabarGymScript_75792
+	jp z, CinnabarGymResetScripts
 	ld a, [wTrainerHeaderFlagBit]
 	ldh [hGymGateIndex], a
 	AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2
@@ -135,13 +135,14 @@ CinnabarGymScript2:
 	ld [wCurMapScript], a
 	ret
 
-CinnabarGymScript3:
+CinnabarGymBlainePostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, CinnabarGymScript_75792
+	jp z, CinnabarGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
-CinnabarGymScript3_75857:
+; fallthrough
+CinnabarGymReceiveTM38:
 	ld a, $a
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -170,19 +171,19 @@ CinnabarGymScript3_75857:
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 
-	jp CinnabarGymScript_75792
+	jp CinnabarGymResetScripts
 
 CinnabarGym_TextPointers:
-	dw CinnabarGymText1
-	dw CinnabarGymText2
-	dw CinnabarGymText3
-	dw CinnabarGymText4
-	dw CinnabarGymText5
-	dw CinnabarGymText6
-	dw CinnabarGymText7
-	dw CinnabarGymText8
-	dw CinnabarGymText9
-	dw BlaineBadgeText
+	dw BlaineText
+	dw CinnabarGymTrainerText1
+	dw CinnabarGymTrainerText2
+	dw CinnabarGymTrainerText3
+	dw CinnabarGymTrainerText4
+	dw CinnabarGymTrainerText5
+	dw CinnabarGymTrainerText6
+	dw CinnabarGymTrainerText7
+	dw CinnabarGymGuideText
+	dw BlaineVolcanoBadgeInfoText
 	dw ReceivedTM38Text
 	dw TM38NoRoomText
 
@@ -206,45 +207,45 @@ CinnabarGymScript_758b7:
 	ld [wCurMapScript], a
 	jp TextScriptEnd
 
-CinnabarGymText1:
+BlaineText:
 	text_asm
 	CheckEvent EVENT_BEAT_BLAINE
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM38
-	jr nz, .afterVictory
-	call z, CinnabarGymScript3_75857
+	jr nz, .afterBeat
+	call z, CinnabarGymReceiveTM38
 	call DisableWaitingAfterTextDisplay
 	jp TextScriptEnd
-.afterVictory
-	ld hl, BlaineFireBlastText
+.afterBeat
+	ld hl, BlainePostBattleAdviceText
 	call PrintText
 	jp TextScriptEnd
-.beginBattle
-	ld hl, BlaineBattleText
+.beforeBeat
+	ld hl, BlainePreBattleText
 	call PrintText
-	ld hl, BlaineEndBattleText
-	ld de, BlaineEndBattleText
+	ld hl, ReceivedVolcanoBadgeText
+	ld de, ReceivedVolcanoBadgeText
 	call SaveEndBattleTextPointers
 	ld a, $7
 	ld [wGymLeaderNo], a
 	jp CinnabarGymScript_758b7
 
-BlaineBattleText:
-	text_far _BlaineBattleText
+BlainePreBattleText:
+	text_far _BlainePreBattleText
 	text_end
 
-BlaineEndBattleText:
-	text_far _BlaineEndBattleText
+ReceivedVolcanoBadgeText:
+	text_far _ReceivedVolcanoBadgeText
 	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
 	text_waitbutton
 	text_end
 
-BlaineFireBlastText:
-	text_far _BlaineFireBlastText
+BlainePostBattleAdviceText:
+	text_far _BlainePostBattleAdviceText
 	text_end
 
-BlaineBadgeText:
-	text_far _BlaineBadgeText
+BlaineVolcanoBadgeInfoText:
+	text_far _BlaineVolcanoBadgeInfoText
 	text_end
 
 ReceivedTM38Text:
@@ -257,218 +258,218 @@ TM38NoRoomText:
 	text_far _TM38NoRoomText
 	text_end
 
-CinnabarGymText2:
+CinnabarGymTrainerText1:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0
 	jr nz, .asm_46bb4
-	ld hl, CinnabarGymText_7595f
+	ld hl, CinnabarGymBattleText2
 	call PrintText
-	ld hl, CinnabarGymText_75964
-	ld de, CinnabarGymText_75964
+	ld hl, CinnabarGymEndBattleText2
+	ld de, CinnabarGymEndBattleText2
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_46bb4
-	ld hl, CinnabarGymText_75969
+	ld hl, CinnabarGymAfterBattleText2
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_7595f:
-	text_far _CinnabarGymText_7595f
+CinnabarGymBattleText2:
+	text_far _CinnabarGymBattleText2
 	text_end
 
-CinnabarGymText_75964:
-	text_far _CinnabarGymText_75964
+CinnabarGymEndBattleText2:
+	text_far _CinnabarGymEndBattleText2
 	text_end
 
-CinnabarGymText_75969:
-	text_far _CinnabarGymText_75969
+CinnabarGymAfterBattleText2:
+	text_far _CinnabarGymAfterBattleText2
 	text_end
 
-CinnabarGymText3:
+CinnabarGymTrainerText2:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1
 	jr nz, .asm_4b406
-	ld hl, CinnabarGymText_75994
+	ld hl, CinnabarGymBattleText1
 	call PrintText
-	ld hl, CinnabarGymText_75999
-	ld de, CinnabarGymText_75999
+	ld hl, CinnabarGymEndBattleText1
+	ld de, CinnabarGymEndBattleText1
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_4b406
-	ld hl, CinnabarGymText_7599e
+	ld hl, CinnabarGymAfterBattleText1
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75994:
-	text_far _CinnabarGymText_75994
+CinnabarGymBattleText1:
+	text_far _CinnabarGymBattleText1
 	text_end
 
-CinnabarGymText_75999:
-	text_far _CinnabarGymText_75999
+CinnabarGymEndBattleText1:
+	text_far _CinnabarGymEndBattleText1
 	text_end
 
-CinnabarGymText_7599e:
-	text_far _CinnabarGymText_7599e
+CinnabarGymAfterBattleText1:
+	text_far _CinnabarGymAfterBattleText1
 	text_end
 
-CinnabarGymText4:
+CinnabarGymTrainerText3:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2
-	jr nz, .asm_c0673
-	ld hl, CinnabarGymText_759c9
+	jr nz, .afterBeat
+	ld hl, CinnabarGymBattleText3
 	call PrintText
-	ld hl, CinnabarGymText_759ce
-	ld de, CinnabarGymText_759ce
+	ld hl, CinnabarGymEndBattleText3
+	ld de, CinnabarGymEndBattleText3
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
-.asm_c0673
-	ld hl, CinnabarGymText_759d3
+.afterBeat
+	ld hl, CinnabarGymAfterBattleText3
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_759c9:
-	text_far _CinnabarGymText_759c9
+CinnabarGymBattleText3:
+	text_far _CinnabarGymBattleText3
 	text_end
 
-CinnabarGymText_759ce:
-	text_far _CinnabarGymText_759ce
+CinnabarGymEndBattleText3:
+	text_far _CinnabarGymEndBattleText3
 	text_end
 
-CinnabarGymText_759d3:
-	text_far _CinnabarGymText_759d3
+CinnabarGymAfterBattleText3:
+	text_far _CinnabarGymAfterBattleText3
 	text_end
 
-CinnabarGymText5:
+CinnabarGymTrainerText4:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3
-	jr nz, .asm_5cfd7
-	ld hl, CinnabarGymText_759fe
+	jr nz, .afterBeat
+	ld hl, CinnabarGymBattleText4
 	call PrintText
-	ld hl, CinnabarGymText_75a03
-	ld de, CinnabarGymText_75a03
+	ld hl, CinnabarGymEndBattleText4
+	ld de, CinnabarGymEndBattleText4
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
-.asm_5cfd7
-	ld hl, CinnabarGymText_75a08
+.afterBeat
+	ld hl, CinnabarGymAfterBattleText4
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_759fe:
-	text_far _CinnabarGymText_759fe
+CinnabarGymBattleText4:
+	text_far _CinnabarGymBattleText4
 	text_end
 
-CinnabarGymText_75a03:
-	text_far _CinnabarGymText_75a03
+CinnabarGymEndBattleText4:
+	text_far _CinnabarGymEndBattleText4
 	text_end
 
-CinnabarGymText_75a08:
-	text_far _CinnabarGymText_75a08
+CinnabarGymAfterBattleText4:
+	text_far _CinnabarGymAfterBattleText4
 	text_end
 
-CinnabarGymText6:
+CinnabarGymTrainerText5:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4
-	jr nz, .asm_776b4
-	ld hl, CinnabarGymText_75a33
+	jr nz, .afterBeat
+	ld hl, CinnabarGymBattleText5
 	call PrintText
-	ld hl, CinnabarGymText_75a38
-	ld de, CinnabarGymText_75a38
+	ld hl, CinnabarGymEndBattleText5
+	ld de, CinnabarGymEndBattleText5
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
-.asm_776b4
-	ld hl, CinnabarGymText_75a3d
+.afterBeat
+	ld hl, CinnabarGymAfterBattleText5
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a33:
-	text_far _CinnabarGymText_75a33
+CinnabarGymBattleText5:
+	text_far _CinnabarGymBattleText5
 	text_end
 
-CinnabarGymText_75a38:
-	text_far _CinnabarGymText_75a38
+CinnabarGymEndBattleText5:
+	text_far _CinnabarGymEndBattleText5
 	text_end
 
-CinnabarGymText_75a3d:
-	text_far _CinnabarGymText_75a3d
+CinnabarGymAfterBattleText5:
+	text_far _CinnabarGymAfterBattleText5
 	text_end
 
-CinnabarGymText7:
+CinnabarGymTrainerText6:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5
-	jr nz, .asm_2f755
-	ld hl, CinnabarGymText_75a68
+	jr nz, .afterBeat
+	ld hl, CinnabarGymBattleText6
 	call PrintText
-	ld hl, CinnabarGymText_75a6d
-	ld de, CinnabarGymText_75a6d
+	ld hl, CinnabarGymEndBattleText6
+	ld de, CinnabarGymEndBattleText6
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
-.asm_2f755
-	ld hl, CinnabarGymText_75a72
+.afterBeat
+	ld hl, CinnabarGymAfterBattleText6
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a68:
-	text_far _CinnabarGymText_75a68
+CinnabarGymBattleText6:
+	text_far _CinnabarGymBattleText6
 	text_end
 
-CinnabarGymText_75a6d:
-	text_far _CinnabarGymText_75a6d
+CinnabarGymEndBattleText6:
+	text_far _CinnabarGymEndBattleText6
 	text_end
 
-CinnabarGymText_75a72:
-	text_far _CinnabarGymText_75a72
+CinnabarGymAfterBattleText6:
+	text_far _CinnabarGymAfterBattleText6
 	text_end
 
-CinnabarGymText8:
+CinnabarGymTrainerText7:
 	text_asm
-	call CinnabarGymScript_757a0
+	call CinnabarGymSetTrainerHeader
 	CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6
-	jr nz, .asm_d87be
-	ld hl, CinnabarGymText_75a9d
+	jr nz, .afterBeat
+	ld hl, CinnabarGymBattleText7
 	call PrintText
-	ld hl, CinnabarGymText_75aa2
-	ld de, CinnabarGymText_75aa2
+	ld hl, CinnabarGymEndBattleText7
+	ld de, CinnabarGymEndBattleText7
 	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
-.asm_d87be
-	ld hl, CinnabarGymText_75aa7
+.afterBeat
+	ld hl, CinnabarGymAfterBattleText7
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75a9d:
-	text_far _CinnabarGymText_75a9d
+CinnabarGymBattleText7:
+	text_far _CinnabarGymBattleText7
 	text_end
 
-CinnabarGymText_75aa2:
-	text_far _CinnabarGymText_75aa2
+CinnabarGymEndBattleText7:
+	text_far _CinnabarGymEndBattleText7
 	text_end
 
-CinnabarGymText_75aa7:
-	text_far _CinnabarGymText_75aa7
+CinnabarGymAfterBattleText7:
+	text_far _CinnabarGymAfterBattleText7
 	text_end
 
-CinnabarGymText9:
+CinnabarGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_BLAINE
-	jr nz, .asm_627d9
-	ld hl, CinnabarGymText_75ac2
-	jr .asm_0b11d
-.asm_627d9
-	ld hl, CinnabarGymText_75ac7
-.asm_0b11d
+	jr nz, .afterBeat
+	ld hl, CinnabarGymGuidePreBattleText
+	jr .done
+.afterBeat
+	ld hl, CinnabarGymGuidePostBattleText
+.done
 	call PrintText
 	jp TextScriptEnd
 
-CinnabarGymText_75ac2:
-	text_far _CinnabarGymText_75ac2
+CinnabarGymGuidePreBattleText:
+	text_far _CinnabarGymGuidePreBattleText
 	text_end
 
-CinnabarGymText_75ac7:
-	text_far _CinnabarGymText_75ac7
+CinnabarGymGuidePostBattleText:
+	text_far _CinnabarGymGuidePostBattleText
 	text_end

scripts/FightingDojo.asm

@@ -1,6 +1,6 @@
 FightingDojo_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, FightingDojoTrainerHeader0
+	ld hl, FightingDojoTrainerHeaders
 	ld de, FightingDojo_ScriptPointers
 	ld a, [wFightingDojoCurScript]
 	call ExecuteCurMapScriptInTable
@@ -90,6 +90,8 @@ FightingDojo_TextPointers:
 	dw FightingDojoText7
 	dw FightingDojoText8
 
+FightingDojoTrainerHeaders:
+	def_trainers 2
 FightingDojoTrainerHeader0:
 	trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_0, 4, FightingDojoBattleText1, FightingDojoEndBattleText1, FightingDojoAfterBattleText1
 FightingDojoTrainerHeader1:

scripts/FuchsiaGym.asm

@@ -1,7 +1,7 @@
 FuchsiaGym_Script:
 	call .LoadNames
 	call EnableAutoTextBoxDrawing
-	ld hl, FuchsiaGymTrainerHeader0
+	ld hl, FuchsiaGymTrainerHeaders
 	ld de, FuchsiaGym_ScriptPointers
 	ld a, [wFuchsiaGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -24,7 +24,7 @@ FuchsiaGym_Script:
 .LeaderName:
 	db "KOGA@"
 
-FuchsiaGymScript_75477:
+FuchsiaGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wFuchsiaGymCurScript], a
@@ -35,15 +35,16 @@ FuchsiaGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw FuchsiaGymScript3
+	dw FuchsiaGymKogaPostBattle
 
-FuchsiaGymScript3:
+FuchsiaGymKogaPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, FuchsiaGymScript_75477
+	jp z, FuchsiaGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
-FuchsiaGymScript3_75497:
+; fallthrough
+FuchsiaGymReceiveTM06:
 	ld a, $9
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -69,21 +70,23 @@ FuchsiaGymScript3_75497:
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 
-	jp FuchsiaGymScript_75477
+	jp FuchsiaGymResetScripts
 
 FuchsiaGym_TextPointers:
-	dw FuchsiaGymText1
-	dw FuchsiaGymText2
-	dw FuchsiaGymText3
-	dw FuchsiaGymText4
-	dw FuchsiaGymText5
-	dw FuchsiaGymText6
-	dw FuchsiaGymText7
-	dw FuchsiaGymText8
-	dw FuchsiaGymText9
-	dw FuchsiaGymText10
-	dw FuchsiaGymText11
+	dw KogaText
+	dw FuchsiaGymTrainerText1
+	dw FuchsiaGymTrainerText2
+	dw FuchsiaGymTrainerText3
+	dw FuchsiaGymTrainerText4
+	dw FuchsiaGymTrainerText5
+	dw FuchsiaGymTrainerText6
+	dw FuchsiaGymGuideText
+	dw KogaSoulBadgeInfoText
+	dw ReceivedTM06Text
+	dw TM06NoRoomText
 
+FuchsiaGymTrainerHeaders:
+	def_trainers 2
 FuchsiaGymTrainerHeader0:
 	trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, 2, FuchsiaGymBattleText1, FuchsiaGymEndBattleText1, FuchsiaGymAfterBattleText1
 FuchsiaGymTrainerHeader1:
@@ -98,27 +101,27 @@ FuchsiaGymTrainerHeader5:
 	trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6
 	db -1 ; end
 
-FuchsiaGymText1:
+KogaText:
 	text_asm
 	CheckEvent EVENT_BEAT_KOGA
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM06
-	jr nz, .afterVictory
-	call z, FuchsiaGymScript3_75497
+	jr nz, .afterBeat
+	call z, FuchsiaGymReceiveTM06
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.afterVictory
-	ld hl, KogaExplainToxicText
+.afterBeat
+	ld hl, KogaPostBattleAdviceText
 	call PrintText
 	jr .done
-.beginBattle
+.beforeBeat
 	ld hl, KogaBeforeBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, KogaAfterBattleText
-	ld de, KogaAfterBattleText
+	ld hl, ReceivedSoulBadgeText
+	ld de, ReceivedSoulBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -137,19 +140,19 @@ KogaBeforeBattleText:
 	text_far _KogaBeforeBattleText
 	text_end
 
-KogaAfterBattleText:
-	text_far _KogaAfterBattleText
+ReceivedSoulBadgeText:
+	text_far _ReceivedSoulBadgeText
 	text_end
 
-KogaExplainToxicText:
-	text_far _KogaExplainToxicText
+KogaPostBattleAdviceText:
+	text_far _KogaPostBattleAdviceText
 	text_end
 
-FuchsiaGymText9:
-	text_far _FuchsiaGymText9
+KogaSoulBadgeInfoText:
+	text_far _KogaSoulBadgeInfoText
 	text_end
 
-FuchsiaGymText10:
+ReceivedTM06Text:
 	text_far _ReceivedTM06Text
 	sound_get_key_item
 
@@ -157,11 +160,11 @@ TM06ExplanationText:
 	text_far _TM06ExplanationText
 	text_end
 
-FuchsiaGymText11:
+TM06NoRoomText:
 	text_far _TM06NoRoomText
 	text_end
 
-FuchsiaGymText2:
+FuchsiaGymTrainerText1:
 	text_asm
 	ld hl, FuchsiaGymTrainerHeader0
 	call TalkToTrainer
@@ -179,7 +182,7 @@ FuchsiaGymAfterBattleText1:
 	text_far _FuchsiaGymAfterBattleText1
 	text_end
 
-FuchsiaGymText3:
+FuchsiaGymTrainerText2:
 	text_asm
 	ld hl, FuchsiaGymTrainerHeader1
 	call TalkToTrainer
@@ -197,7 +200,7 @@ FuchsiaGymAfterBattleText2:
 	text_far _FuchsiaGymAfterBattleText2
 	text_end
 
-FuchsiaGymText4:
+FuchsiaGymTrainerText3:
 	text_asm
 	ld hl, FuchsiaGymTrainerHeader2
 	call TalkToTrainer
@@ -215,7 +218,7 @@ FuchsiaGymAfterBattleText3:
 	text_far _FuchsiaGymAfterBattleText3
 	text_end
 
-FuchsiaGymText5:
+FuchsiaGymTrainerText4:
 	text_asm
 	ld hl, FuchsiaGymTrainerHeader3
 	call TalkToTrainer
@@ -233,7 +236,7 @@ FuchsiaGymAfterBattleText4:
 	text_far _FuchsiaGymAfterBattleText4
 	text_end
 
-FuchsiaGymText6:
+FuchsiaGymTrainerText5:
 	text_asm
 	ld hl, FuchsiaGymTrainerHeader4
 	call TalkToTrainer
@@ -251,7 +254,7 @@ FuchsiaGymAfterBattleText5:
 	text_far _FuchsiaGymAfterBattleText5
 	text_end
 
-FuchsiaGymText7:
+FuchsiaGymTrainerText6:
 	text_asm
 	ld hl, FuchsiaGymTrainerHeader5
 	call TalkToTrainer
@@ -269,20 +272,20 @@ FuchsiaGymAfterBattleText6:
 	text_far _FuchsiaGymAfterBattleText6
 	text_end
 
-FuchsiaGymText8:
+FuchsiaGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_KOGA
-	ld hl, FuchsiaGymText_75653
-	jr nz, .asm_50671
-	ld hl, FuchsiaGymText_7564e
-.asm_50671
+	ld hl, FuchsiaGymGuidePostBattleText
+	jr nz, .afterBeat
+	ld hl, FuchsiaGymGuidePreBattleText
+.afterBeat
 	call PrintText
 	jp TextScriptEnd
 
-FuchsiaGymText_7564e:
-	text_far _FuchsiaGymText_7564e
+FuchsiaGymGuidePreBattleText:
+	text_far _FuchsiaGymGuidePreBattleText
 	text_end
 
-FuchsiaGymText_75653:
-	text_far _FuchsiaGymText_75653
+FuchsiaGymGuidePostBattleText:
+	text_far _FuchsiaGymGuidePostBattleText
 	text_end

scripts/HallOfFame.asm

@@ -40,7 +40,7 @@ HallofFameRoomScript2:
 	ld [wLancesRoomCurScript], a
 	ld [wHallOfFameCurScript], a
 	; Elite 4 events
-	ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1
+	ResetEventRange INDIGO_PLATEAU_EVENTS_START, INDIGO_PLATEAU_EVENTS_END, 1
 	xor a
 	ld [wHallOfFameCurScript], a
 	ld a, PALLET_TOWN

scripts/IndigoPlateauLobby.asm

@@ -11,7 +11,7 @@ IndigoPlateauLobby_Script:
 	res 1, [hl]
 	ret z
 	; Elite 4 events
-	ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
+	ResetEventRange INDIGO_PLATEAU_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
 	ret
 
 IndigoPlateauLobby_TextPointers:

scripts/LancesRoom.asm

@@ -1,7 +1,7 @@
 LancesRoom_Script:
 	call LanceShowOrHideEntranceBlocks
 	call EnableAutoTextBoxDrawing
-	ld hl, LanceTrainerHeader0
+	ld hl, LancesRoomTrainerHeaders
 	ld de, LancesRoom_ScriptPointers
 	ld a, [wLancesRoomCurScript]
 	call ExecuteCurMapScriptInTable
@@ -128,13 +128,15 @@ LanceScript3:
 LancesRoom_TextPointers:
 	dw LanceText1
 
-LanceTrainerHeader0:
+LancesRoomTrainerHeaders:
+	def_trainers
+LancesRoomTrainerHeader0:
 	trainer EVENT_BEAT_LANCES_ROOM_TRAINER_0, 0, LanceBeforeBattleText, LanceEndBattleText, LanceAfterBattleText
 	db -1 ; end
 
 LanceText1:
 	text_asm
-	ld hl, LanceTrainerHeader0
+	ld hl, LancesRoomTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/LoreleisRoom.asm

@@ -1,7 +1,7 @@
 LoreleisRoom_Script:
 	call LoreleiShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, LoreleiTrainerHeader0
+	ld hl, LoreleisRoomTrainerHeaders
 	ld de, LoreleisRoom_ScriptPointers
 	ld a, [wLoreleisRoomCurScript]
 	call ExecuteCurMapScriptInTable
@@ -119,13 +119,15 @@ LoreleisRoom_TextPointers:
 	dw LoreleiText1
 	dw LoreleiDontRunAwayText
 
-LoreleiTrainerHeader0:
+LoreleisRoomTrainerHeaders:
+	def_trainers
+LoreleisRoomTrainerHeader0:
 	trainer EVENT_BEAT_LORELEIS_ROOM_TRAINER_0, 0, LoreleiBeforeBattleText, LoreleiEndBattleText, LoreleiAfterBattleText
 	db -1 ; end
 
 LoreleiText1:
 	text_asm
-	ld hl, LoreleiTrainerHeader0
+	ld hl, LoreleisRoomTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 

scripts/MtMoon1F.asm

@@ -1,6 +1,6 @@
 MtMoon1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, MtMoon1TrainerHeader0
+	ld hl, MtMoon1TrainerHeaders
 	ld de, MtMoon1F_ScriptPointers
 	ld a, [wMtMoon1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -28,6 +28,8 @@ MtMoon1F_TextPointers:
 	dw PickUpItemText
 	dw MtMoon1Text14
 
+MtMoon1TrainerHeaders:
+	def_trainers
 MtMoon1TrainerHeader0:
 	trainer EVENT_BEAT_MT_MOON_1_TRAINER_0, 2, MtMoon1BattleText2, MtMoon1EndBattleText2, MtMoon1AfterBattleText2
 MtMoon1TrainerHeader1:

scripts/MtMoonB2F.asm

@@ -1,6 +1,6 @@
 MtMoonB2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, MtMoon3TrainerHeader0
+	ld hl, MtMoon3TrainerHeaders
 	ld de, MtMoonB2F_ScriptPointers
 	ld a, [wMtMoonB2FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -166,6 +166,8 @@ MtMoonB2F_TextPointers:
 	dw PickUpItemText
 	dw MtMoon3Text_49f99
 
+MtMoon3TrainerHeaders:
+	def_trainers 2
 MtMoon3TrainerHeader0:
 	trainer EVENT_BEAT_MT_MOON_3_TRAINER_0, 4, MtMoon3BattleText2, MtMoon3EndBattleText2, MtMoon3AfterBattleText2
 MtMoon3TrainerHeader1:

scripts/PewterGym.asm

@@ -4,7 +4,7 @@ PewterGym_Script:
 	res 6, [hl]
 	call nz, .LoadNames
 	call EnableAutoTextBoxDrawing
-	ld hl, PewterGymTrainerHeader0
+	ld hl, PewterGymTrainerHeaders
 	ld de, PewterGym_ScriptPointers
 	ld a, [wPewterGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,7 +22,7 @@ PewterGym_Script:
 .LeaderName:
 	db "BROCK@"
 
-PewterGymScript_5c3bf:
+PewterGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wPewterGymCurScript], a
@@ -33,15 +33,16 @@ PewterGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw PewterGymScript3
+	dw PewterGymBrockPostBattle
 
-PewterGymScript3:
+PewterGymBrockPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, PewterGymScript_5c3bf
+	jp z, PewterGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
-PewterGymScript_5c3df:
+; fallthrough
+PewterGymScriptReceiveTM34:
 	ld a, $4
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -76,41 +77,43 @@ PewterGymScript_5c3df:
 	; deactivate gym trainers
 	SetEvent EVENT_BEAT_PEWTER_GYM_TRAINER_0
 
-	jp PewterGymScript_5c3bf
+	jp PewterGymResetScripts
 
 PewterGym_TextPointers:
-	dw PewterGymText1
-	dw PewterGymText2
-	dw PewterGymText3
-	dw PewterGymText4
-	dw PewterGymText5
-	dw PewterGymText6
+	dw BrockText
+	dw PewterGymTrainerText1
+	dw PewterGymGuideText
+	dw BeforeReceivedTM34Text
+	dw ReceivedTM34Text
+	dw TM34NoRoomText
 
+PewterGymTrainerHeaders:
+	def_trainers 2
 PewterGymTrainerHeader0:
 	trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1
 	db -1 ; end
 
-PewterGymText1:
+BrockText:
 	text_asm
 	CheckEvent EVENT_BEAT_BROCK
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM34
-	jr nz, .gymVictory
-	call z, PewterGymScript_5c3df
+	jr nz, .afterBeat
+	call z, PewterGymScriptReceiveTM34
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.gymVictory
-	ld hl, PewterGymText_5c4a3
+.afterBeat
+	ld hl, BrockPostBattleAdviceText
 	call PrintText
 	jr .done
-.beginBattle
-	ld hl, PewterGymText_5c49e
+.beforeBeat
+	ld hl, BrockPreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, PewterGymText_5c4bc
-	ld de, PewterGymText_5c4bc
+	ld hl, ReceivedBoulderBadgeText
+	ld de, ReceivedBoulderBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -126,35 +129,35 @@ PewterGymText1:
 .done
 	jp TextScriptEnd
 
-PewterGymText_5c49e:
-	text_far _PewterGymText_5c49e
+BrockPreBattleText:
+	text_far _BrockPreBattleText
 	text_end
 
-PewterGymText_5c4a3:
-	text_far _PewterGymText_5c4a3
+BrockPostBattleAdviceText:
+	text_far _BrockPostBattleAdviceText
 	text_end
 
-PewterGymText4:
-	text_far _TM34PreReceiveText
+BeforeReceivedTM34Text:
+	text_far _BeforeReceivedTM34Text
 	text_end
 
-PewterGymText5:
+ReceivedTM34Text:
 	text_far _ReceivedTM34Text
 	sound_get_item_1
 	text_far _TM34ExplanationText
 	text_end
 
-PewterGymText6:
+TM34NoRoomText:
 	text_far _TM34NoRoomText
 	text_end
 
-PewterGymText_5c4bc:
-	text_far _PewterGymText_5c4bc
+ReceivedBoulderBadgeText:
+	text_far _ReceivedBoulderBadgeText
 	sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
-	text_far _PewterGymText_5c4c1
+	text_far _BrockBoulerBadgeInfoText ; Text to tell that the flash technique can be used
 	text_end
 
-PewterGymText2:
+PewterGymTrainerText1:
 	text_asm
 	ld hl, PewterGymTrainerHeader0
 	call TalkToTrainer
@@ -172,49 +175,49 @@ PewterGymAfterBattleText1:
 	text_far _PewterGymAfterBattleText1
 	text_end
 
-PewterGymText3:
+PewterGymGuideText:
 	text_asm
 	ld a, [wBeatGymFlags]
 	bit BIT_BOULDERBADGE, a
-	jr nz, .asm_5c50c
-	ld hl, PewterGymText_5c515
+	jr nz, .afterBeat
+	ld hl, PewterGymGuidePreAdviceText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_5c4fe
-	ld hl, PewterGymText_5c51a
+	jr nz, .PewterGymGuideBeginAdviceText
+	ld hl, PewterGymGuideBeginAdviceText
 	call PrintText
-	jr .asm_5c504
-.asm_5c4fe
+	jr .PewterGymGuideAdviceText
+.PewterGymGuideBeginAdviceText
 	ld hl, PewterGymText_5c524
 	call PrintText
-.asm_5c504
-	ld hl, PewterGymText_5c51f
+.PewterGymGuideAdviceText
+	ld hl, PewterGymGuideAdviceText
 	call PrintText
-	jr .asm_5c512
-.asm_5c50c
-	ld hl, PewterGymText_5c529
+	jr .done
+.afterBeat
+	ld hl, PewterGymGuidePostBattleText
 	call PrintText
-.asm_5c512
+.done
 	jp TextScriptEnd
 
-PewterGymText_5c515:
-	text_far _PewterGymText_5c515
+PewterGymGuidePreAdviceText:
+	text_far _PewterGymGuidePreAdviceText
 	text_end
 
-PewterGymText_5c51a:
-	text_far _PewterGymText_5c51a
+PewterGymGuideBeginAdviceText:
+	text_far _PewterGymGuideBeginAdviceText
 	text_end
 
-PewterGymText_5c51f:
-	text_far _PewterGymText_5c51f
+PewterGymGuideAdviceText:
+	text_far _PewterGymGuideAdviceText
 	text_end
 
 PewterGymText_5c524:
 	text_far _PewterGymText_5c524
 	text_end
 
-PewterGymText_5c529:
-	text_far _PewterGymText_5c529
+PewterGymGuidePostBattleText:
+	text_far _PewterGymGuidePostBattleText
 	text_end

scripts/PewterPokecenter.asm

@@ -67,7 +67,7 @@ PewterJigglypuffText:
 	jr c, .spinMovementLoop
 ;	ld a, [wChannelSoundIDs]
 ;	ld b, a
-;	ld a, [wChannelSoundIDs + Ch2]
+;	ld a, [wChannelSoundIDs + CHAN2]
 ;	or b
 ;	jr nz, .spinMovementLoop
 

scripts/PokemonMansion1F.asm

@@ -1,7 +1,7 @@
 PokemonMansion1F_Script:
 	call Mansion1Subscript1
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion1TrainerHeader0
+	ld hl, Mansion1TrainerHeaders
 	ld de, PokemonMansion1F_ScriptPointers
 	ld a, [wPokemonMansion1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -66,6 +66,8 @@ PokemonMansion1F_TextPointers:
 	dw PickUpItemText
 	dw Mansion1Text4
 
+Mansion1TrainerHeaders:
+	def_trainers
 Mansion1TrainerHeader0:
 	trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, Mansion1BattleText2, Mansion1EndBattleText2, Mansion1AfterBattleText2
 	db -1 ; end

scripts/PokemonMansion2F.asm

@@ -1,7 +1,7 @@
 PokemonMansion2F_Script:
 	call Mansion2Script_51fee
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion2TrainerHeader0
+	ld hl, Mansion2TrainerHeaders
 	ld de, PokemonMansion2F_ScriptPointers
 	ld a, [wPokemonMansion2FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -63,6 +63,8 @@ PokemonMansion2F_TextPointers:
 	dw Mansion2Text4
 	dw Mansion2Text5
 
+Mansion2TrainerHeaders:
+	def_trainers
 Mansion2TrainerHeader0:
 	trainer EVENT_BEAT_MANSION_2_TRAINER_0, 0, Mansion2BattleText1, Mansion2EndBattleText1, Mansion2AfterBattleText1
 	db -1 ; end

scripts/PokemonMansion3F.asm

@@ -1,7 +1,7 @@
 PokemonMansion3F_Script:
 	call Mansion3Script_52204
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion3TrainerHeader0
+	ld hl, Mansion3TrainerHeaders
 	ld de, PokemonMansion3F_ScriptPointers
 	ld a, [wPokemonMansion3FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -90,6 +90,8 @@ PokemonMansion3F_TextPointers:
 	dw Mansion3Text5
 	dw Mansion3Text6
 
+Mansion3TrainerHeaders:
+	def_trainers
 Mansion3TrainerHeader0:
 	trainer EVENT_BEAT_MANSION_3_TRAINER_0, 0, Mansion3BattleText1, Mansion3EndBattleText1, Mansion3AfterBattleText1
 Mansion3TrainerHeader1:

scripts/PokemonMansionB1F.asm

@@ -1,7 +1,7 @@
 PokemonMansionB1F_Script:
 	call Mansion4Script_523cf
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion4TrainerHeader0
+	ld hl, Mansion4TrainerHeaders
 	ld de, PokemonMansionB1F_ScriptPointers
 	ld a, [wPokemonMansionB1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -69,6 +69,8 @@ PokemonMansionB1F_TextPointers:
 	dw PickUpItemText
 	dw Mansion3Text6
 
+Mansion4TrainerHeaders:
+	def_trainers
 Mansion4TrainerHeader0:
 	trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, Mansion4BattleText1, Mansion4EndBattleText1, Mansion4AfterBattleText1
 Mansion4TrainerHeader1:

scripts/PokemonTower3F.asm

@@ -1,6 +1,6 @@
 PokemonTower3F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower3TrainerHeader0
+	ld hl, PokemonTower3TrainerHeaders
 	ld de, PokemonTower3F_ScriptPointers
 	ld a, [wPokemonTower3FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -18,6 +18,8 @@ PokemonTower3F_TextPointers:
 	dw PokemonTower3Text3
 	dw PickUpItemText
 
+PokemonTower3TrainerHeaders:
+	def_trainers
 PokemonTower3TrainerHeader0:
 	trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_0, 2, PokemonTower3BattleText1, PokemonTower3EndBattleText1, PokemonTower3AfterBattleText1
 PokemonTower3TrainerHeader1:

scripts/PokemonTower4F.asm

@@ -1,6 +1,6 @@
 PokemonTower4F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower4TrainerHeader0
+	ld hl, PokemonTower4TrainerHeaders
 	ld de, PokemonTower4F_ScriptPointers
 	ld a, [wPokemonTower4FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -20,6 +20,8 @@ PokemonTower4F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+PokemonTower4TrainerHeaders:
+	def_trainers
 PokemonTower4TrainerHeader0:
 	trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4BattleText1, PokemonTower4EndBattleText1, PokemonTower4AfterBattleText1
 PokemonTower4TrainerHeader1:

scripts/PokemonTower5F.asm

@@ -1,6 +1,6 @@
 PokemonTower5F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower5TrainerHeader0
+	ld hl, PokemonTower5TrainerHeaders
 	ld de, PokemonTower5F_ScriptPointers
 	ld a, [wPokemonTower5FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -57,6 +57,8 @@ PokemonTower5F_TextPointers:
 	dw PickUpItemText
 	dw PokemonTower5Text7
 
+PokemonTower5TrainerHeaders:
+	def_trainers 2
 PokemonTower5TrainerHeader0:
 	trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_0, 2, PokemonTower5BattleText1, PokemonTower5EndBattleText1, PokemonTower5AfterBattleText1
 PokemonTower5TrainerHeader1:

scripts/PokemonTower6F.asm

@@ -1,6 +1,6 @@
 PokemonTower6F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower6TrainerHeader0
+	ld hl, PokemonTower6TrainerHeaders
 	ld de, PokemonTower6F_ScriptPointers
 	ld a, [wPokemonTower6FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -104,6 +104,8 @@ PokemonTower6F_TextPointers:
 	dw PokemonTower6Text6
 	dw PokemonTower6Text7
 
+PokemonTower6TrainerHeaders:
+	def_trainers
 PokemonTower6TrainerHeader0:
 	trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_0, 3, PokemonTower6BattleText1, PokemonTower6EndBattleText1, PokemonTower6AfterBattleText1
 PokemonTower6TrainerHeader1:

scripts/PokemonTower7F.asm

@@ -1,6 +1,6 @@
 PokemonTower7F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower7TrainerHeader0
+	ld hl, PokemonTower7TrainerHeaders
 	ld de, PokemonTower7F_ScriptPointers
 	ld a, [wPokemonTower7FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -192,6 +192,8 @@ PokemonTower7F_TextPointers:
 	dw PokemonTower7Text3
 	dw PokemonTower7FujiText
 
+PokemonTower7TrainerHeaders:
+	def_trainers
 PokemonTower7TrainerHeader0:
 	trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_0, 3, PokemonTower7BattleText1, PokemonTower7EndBattleText1, PokemonTower7AfterBattleText1
 PokemonTower7TrainerHeader1:

scripts/PowerPlant.asm

@@ -1,6 +1,6 @@
 PowerPlant_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Voltorb0TrainerHeader
+	ld hl, PowerPlantTrainerHeaders
 	ld de, PowerPlant_ScriptPointers
 	ld a, [wPowerPlantCurScript]
 	call ExecuteCurMapScriptInTable
@@ -28,6 +28,8 @@ PowerPlant_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+PowerPlantTrainerHeaders:
+	def_trainers
 Voltorb0TrainerHeader:
 	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
 Voltorb1TrainerHeader:
@@ -43,9 +45,9 @@ Voltorb5TrainerHeader:
 Voltorb6TrainerHeader:
 	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
 Voltorb7TrainerHeader:
-	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
+	trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText
 ZapdosTrainerHeader:
-	trainer EVENT_BEAT_ZAPDOS, 1, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText
+	trainer EVENT_BEAT_ZAPDOS, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText
 	db -1 ; end
 
 InitVoltorbBattle:

scripts/RockTunnel1F.asm

@@ -1,6 +1,6 @@
 RockTunnel1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RockTunnel1TrainerHeader0
+	ld hl, RockTunnel1TrainerHeaders
 	ld de, RockTunnel1F_ScriptPointers
 	ld a, [wRockTunnel1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,6 +22,8 @@ RockTunnel1F_TextPointers:
 	dw RockTunnel1Text7
 	dw RockTunnel1Text8
 
+RockTunnel1TrainerHeaders:
+	def_trainers
 RockTunnel1TrainerHeader0:
 	trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0, 4, RockTunnel1BattleText1, RockTunnel1EndBattleText1, RockTunnel1AfterBattleText1
 RockTunnel1TrainerHeader1:

scripts/RockTunnelB1F.asm

@@ -1,6 +1,6 @@
 RockTunnelB1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RockTunnel2TrainerHeader0
+	ld hl, RockTunnel2TrainerHeaders
 	ld de, RockTunnelB1F_ScriptPointers
 	ld a, [wRockTunnelB1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,6 +22,8 @@ RockTunnelB1F_TextPointers:
 	dw RockTunnel2Text7
 	dw RockTunnel2Text8
 
+RockTunnel2TrainerHeaders:
+	def_trainers
 RockTunnel2TrainerHeader0:
 	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0, 4, RockTunnel2BattleText2, RockTunnel2EndBattleText2, RockTunnel2AfterBattleText2
 RockTunnel2TrainerHeader1:
@@ -37,7 +39,7 @@ RockTunnel2TrainerHeader5:
 RockTunnel2TrainerHeader6:
 	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6, 3, RockTunnel2BattleText8, RockTunnel2EndBattleText8, RockTunnel2AfterBattleText8
 RockTunnel2TrainerHeader7:
-	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9
+	trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9
 	db -1 ; end
 
 RockTunnel2Text1:

scripts/RocketHideoutB1F.asm

@@ -1,7 +1,7 @@
 RocketHideoutB1F_Script:
 	call RocketHideout1Script_44be0
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout1TrainerHeader0
+	ld hl, RocketHideout1TrainerHeaders
 	ld de, RocketHideoutB1F_ScriptPointers
 	ld a, [wRocketHideoutB1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -44,6 +44,8 @@ RocketHideoutB1F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+RocketHideout1TrainerHeaders:
+	def_trainers
 RocketHideout1TrainerHeader0:
 	trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2
 RocketHideout1TrainerHeader1:

scripts/RocketHideoutB2F.asm

@@ -1,6 +1,6 @@
 RocketHideoutB2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout2TrainerHeader0
+	ld hl, RocketHideout2TrainerHeaders
 	ld de, RocketHideoutB2F_ScriptPointers
 	ld a, [wRocketHideoutB2FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -276,6 +276,8 @@ RocketHideoutB2F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+RocketHideout2TrainerHeaders:
+	def_trainers
 RocketHideout2TrainerHeader0:
 	trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideout2BattleText2, RocketHideout2EndBattleText2, RocketHideout2AfterBattleTxt2
 	db -1 ; end

scripts/RocketHideoutB3F.asm

@@ -1,6 +1,6 @@
 RocketHideoutB3F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout3TrainerHeader0
+	ld hl, RocketHideout3TrainerHeaders
 	ld de, RocketHideoutB3F_ScriptPointers
 	ld a, [wRocketHideoutB3FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -130,6 +130,8 @@ RocketHideoutB3F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+RocketHideout3TrainerHeaders:
+	def_trainers
 RocketHideout3TrainerHeader0:
 	trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0, 2, RocketHideout3BattleText2, RocketHideout3EndBattleText2, RocketHideout3AfterBattleTxt2
 RocketHideout3TrainerHeader1:

scripts/RocketHideoutB4F.asm

@@ -1,7 +1,7 @@
 RocketHideoutB4F_Script:
 	call RocketHideout4Script_45473
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout4TrainerHeader0
+	ld hl, RocketHideout4TrainerHeaders
 	ld de, RocketHideoutB4F_ScriptPointers
 	ld a, [wRocketHideoutB4FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -84,6 +84,8 @@ RocketHideoutB4F_TextPointers:
 	dw PickUpItemText
 	dw RocketHideout4Text10
 
+RocketHideout4TrainerHeaders:
+	def_trainers 2
 RocketHideout4TrainerHeader0:
 	trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideout4BattleText2, RocketHideout4EndBattleText2, RocketHideout4AfterBattleText2
 RocketHideout4TrainerHeader1:

scripts/Route10.asm

@@ -1,6 +1,6 @@
 Route10_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route10TrainerHeader0
+	ld hl, Route10TrainerHeaders
 	ld de, Route10_ScriptPointers
 	ld a, [wRoute10CurScript]
 	call ExecuteCurMapScriptInTable
@@ -24,6 +24,8 @@ Route10_TextPointers:
 	dw Route10Text9
 	dw Route10Text10
 
+Route10TrainerHeaders:
+	def_trainers
 Route10TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_10_TRAINER_0, 4, Route10BattleText1, Route10EndBattleText1, Route10AfterBattleText1
 Route10TrainerHeader1:

scripts/Route11.asm

@@ -1,6 +1,6 @@
 Route11_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route11TrainerHeader0
+	ld hl, Route11TrainerHeaders
 	ld de, Route11_ScriptPointers
 	ld a, [wRoute11CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,6 +25,8 @@ Route11_TextPointers:
 	dw Route11Text10
 	dw Route11Text11
 
+Route11TrainerHeaders:
+	def_trainers
 Route11TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_11_TRAINER_0, 3, Route11BattleText1, Route11EndBattleText1, Route11AfterBattleText1
 Route11TrainerHeader1:
@@ -40,11 +42,11 @@ Route11TrainerHeader5:
 Route11TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_11_TRAINER_6, 3, Route11BattleText7, Route11EndBattleText7, Route11AfterBattleText7
 Route11TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 1, 4, Route11BattleText8, Route11EndBattleText8, Route11AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 4, Route11BattleText8, Route11EndBattleText8, Route11AfterBattleText8
 Route11TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 1, 3, Route11BattleText9, Route11EndBattleText9, Route11AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 3, Route11BattleText9, Route11EndBattleText9, Route11AfterBattleText9
 Route11TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 1, 4, Route11BattleText10, Route11EndBattleText10, Route11AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 4, Route11BattleText10, Route11EndBattleText10, Route11AfterBattleText10
 	db -1 ; end
 
 Route11Text1:

scripts/Route12.asm

@@ -1,6 +1,6 @@
 Route12_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route12TrainerHeader0
+	ld hl, Route12TrainerHeaders
 	ld de, Route12_ScriptPointers
 	ld a, [wRoute12CurScript]
 	call ExecuteCurMapScriptInTable
@@ -76,6 +76,8 @@ Route12_TextPointers:
 	dw Route12Text13
 	dw Route12Text14
 
+Route12TrainerHeaders:
+	def_trainers 2
 Route12TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_12_TRAINER_0, 4, Route12BattleText1, Route12EndBattleText1, Route12AfterBattleText1
 Route12TrainerHeader1:
@@ -89,7 +91,7 @@ Route12TrainerHeader4:
 Route12TrainerHeader5:
 	trainer EVENT_BEAT_ROUTE_12_TRAINER_5, 4, Route12BattleText6, Route12EndBattleText6, Route12AfterBattleText6
 Route12TrainerHeader6:
-	trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, 1, Route12BattleText7, Route12EndBattleText7, Route12AfterBattleText7
+	trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, Route12BattleText7, Route12EndBattleText7, Route12AfterBattleText7
 	db -1 ; end
 
 Route12Text1:

scripts/Route13.asm

@@ -1,6 +1,6 @@
 Route13_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route13TrainerHeader0
+	ld hl, Route13TrainerHeaders
 	ld de, Route13_ScriptPointers
 	ld a, [wRoute13CurScript]
 	call ExecuteCurMapScriptInTable
@@ -27,6 +27,8 @@ Route13_TextPointers:
 	dw Route13Text12
 	dw Route13Text13
 
+Route13TrainerHeaders:
+	def_trainers
 Route13TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_13_TRAINER_0, 2, Route13BattleText2, Route13EndBattleText2, Route13AfterBattleText2
 Route13TrainerHeader1:
@@ -42,11 +44,11 @@ Route13TrainerHeader5:
 Route13TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_13_TRAINER_6, 4, Route13BattleText8, Route13EndBattleText8, Route13AfterBattleText8
 Route13TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_13_TRAINER_7, 1, 2, Route13BattleText9, Route13EndBattleText9, Route13AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_13_TRAINER_7, 2, Route13BattleText9, Route13EndBattleText9, Route13AfterBattleText9
 Route13TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_13_TRAINER_8, 1, 2, Route13BattleText10, Route13EndBattleText10, Route13AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_13_TRAINER_8, 2, Route13BattleText10, Route13EndBattleText10, Route13AfterBattleText10
 Route13TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_13_TRAINER_9, 1, 4, Route13BattleText11, Route13EndBattleText11, Route13AfterBattleText11
+	trainer EVENT_BEAT_ROUTE_13_TRAINER_9, 4, Route13BattleText11, Route13EndBattleText11, Route13AfterBattleText11
 	db -1 ; end
 
 Route13Text1:

scripts/Route14.asm

@@ -1,6 +1,6 @@
 Route14_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route14TrainerHeader0
+	ld hl, Route14TrainerHeaders
 	ld de, Route14_ScriptPointers
 	ld a, [wRoute14CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,6 +25,8 @@ Route14_TextPointers:
 	dw Route14Text10
 	dw Route14Text11
 
+Route14TrainerHeaders:
+	def_trainers
 Route14TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_14_TRAINER_0, 2, Route14BattleText1, Route14EndBattleText1, Route14AfterBattleText1
 Route14TrainerHeader1:
@@ -40,11 +42,11 @@ Route14TrainerHeader5:
 Route14TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_14_TRAINER_6, 4, Route14BattleText7, Route14EndBattleText7, Route14AfterBattleText7
 Route14TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_14_TRAINER_7, 1, 4, Route14BattleText8, Route14EndBattleText8, Route14AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_14_TRAINER_7, 4, Route14BattleText8, Route14EndBattleText8, Route14AfterBattleText8
 Route14TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_14_TRAINER_8, 1, 3, Route14BattleText9, Route14EndBattleText9, Route14AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_14_TRAINER_8, 3, Route14BattleText9, Route14EndBattleText9, Route14AfterBattleText9
 Route14TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_14_TRAINER_9, 1, 4, Route14BattleText10, Route14EndBattleText10, Route14AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_14_TRAINER_9, 4, Route14BattleText10, Route14EndBattleText10, Route14AfterBattleText10
 	db -1 ; end
 
 Route14Text1:

scripts/Route15.asm

@@ -1,6 +1,6 @@
 Route15_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route15TrainerHeader0
+	ld hl, Route15TrainerHeaders
 	ld de, Route15_ScriptPointers
 	ld a, [wRoute15CurScript]
 	call ExecuteCurMapScriptInTable
@@ -26,6 +26,8 @@ Route15_TextPointers:
 	dw PickUpItemText
 	dw Route15Text12
 
+Route15TrainerHeaders:
+	def_trainers
 Route15TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_15_TRAINER_0, 2, Route15BattleText1, Route15EndBattleText1, Route15AfterBattleText1
 Route15TrainerHeader1:
@@ -41,11 +43,11 @@ Route15TrainerHeader5:
 Route15TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_15_TRAINER_6, 3, Route15BattleText7, Route15EndBattleText7, Route15AfterBattleText7
 Route15TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_15_TRAINER_7, 1, 3, Route15BattleText8, Route15EndBattleText8, Route15AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_15_TRAINER_7, 3, Route15BattleText8, Route15EndBattleText8, Route15AfterBattleText8
 Route15TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_15_TRAINER_8, 1, 3, Route15BattleText9, Route15EndBattleText9, Route15AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_15_TRAINER_8, 3, Route15BattleText9, Route15EndBattleText9, Route15AfterBattleText9
 Route15TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_15_TRAINER_9, 1, 3, Route15BattleText10, Route15EndBattleText10, Route15AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_15_TRAINER_9, 3, Route15BattleText10, Route15EndBattleText10, Route15AfterBattleText10
 	db -1 ; end
 
 Route15Text1:

scripts/Route16.asm

@@ -1,6 +1,6 @@
 Route16_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route16TrainerHeader0
+	ld hl, Route16TrainerHeaders
 	ld de, Route16_ScriptPointers
 	ld a, [wRoute16CurScript]
 	call ExecuteCurMapScriptInTable
@@ -74,6 +74,8 @@ Route16_TextPointers:
 	dw Route16Text10
 	dw Route16Text11
 
+Route16TrainerHeaders:
+	def_trainers
 Route16TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16BattleText1, Route16EndBattleText1, Route16AfterBattleText1
 Route16TrainerHeader1:

scripts/Route17.asm

@@ -1,6 +1,6 @@
 Route17_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route17TrainerHeader0
+	ld hl, Route17TrainerHeaders
 	ld de, Route17_ScriptPointers
 	ld a, [wRoute17CurScript]
 	call ExecuteCurMapScriptInTable
@@ -30,6 +30,8 @@ Route17_TextPointers:
 	dw Route17Text15
 	dw Route17Text16
 
+Route17TrainerHeaders:
+	def_trainers
 Route17TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_17_TRAINER_0, 3, Route17BattleText1, Route17EndBattleText1, Route17AfterBattleText1
 Route17TrainerHeader1:
@@ -45,11 +47,11 @@ Route17TrainerHeader5:
 Route17TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_17_TRAINER_6, 4, Route17BattleText7, Route17EndBattleText7, Route17AfterBattleText7
 Route17TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_17_TRAINER_7, 1, 2, Route17BattleText8, Route17EndBattleText8, Route17AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_17_TRAINER_7, 2, Route17BattleText8, Route17EndBattleText8, Route17AfterBattleText8
 Route17TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_17_TRAINER_8, 1, 3, Route17BattleText9, Route17EndBattleText9, Route17AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_17_TRAINER_8, 3, Route17BattleText9, Route17EndBattleText9, Route17AfterBattleText9
 Route17TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_17_TRAINER_9, 1, 4, Route17BattleText10, Route17EndBattleText10, Route17AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_17_TRAINER_9, 4, Route17BattleText10, Route17EndBattleText10, Route17AfterBattleText10
 	db -1 ; end
 
 Route17Text1:

scripts/Route18.asm

@@ -1,6 +1,6 @@
 Route18_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route18TrainerHeader0
+	ld hl, Route18TrainerHeaders
 	ld de, Route18_ScriptPointers
 	ld a, [wRoute18CurScript]
 	call ExecuteCurMapScriptInTable
@@ -19,6 +19,8 @@ Route18_TextPointers:
 	dw Route18Text4
 	dw Route18Text5
 
+Route18TrainerHeaders:
+	def_trainers
 Route18TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_18_TRAINER_0, 3, Route18BattleText1, Route18EndBattleText1, Route18AfterBattleText1
 Route18TrainerHeader1:

scripts/Route19.asm

@@ -1,6 +1,6 @@
 Route19_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route19TrainerHeader0
+	ld hl, Route19TrainerHeaders
 	ld de, Route19_ScriptPointers
 	ld a, [wRoute19CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,6 +25,8 @@ Route19_TextPointers:
 	dw Route19Text10
 	dw Route19Text11
 
+Route19TrainerHeaders:
+	def_trainers
 Route19TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_19_TRAINER_0, 4, Route19BattleText1, Route19EndBattleText1, Route19AfterBattleText1
 Route19TrainerHeader1:
@@ -40,11 +42,11 @@ Route19TrainerHeader5:
 Route19TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_19_TRAINER_6, 3, Route19BattleText7, Route19EndBattleText7, Route19AfterBattleText7
 Route19TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_19_TRAINER_7, 1, 4, Route19BattleText8, Route19EndBattleText8, Route19AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_7, 4, Route19BattleText8, Route19EndBattleText8, Route19AfterBattleText8
 Route19TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_19_TRAINER_8, 1, 4, Route19BattleText9, Route19EndBattleText9, Route19AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_8, 4, Route19BattleText9, Route19EndBattleText9, Route19AfterBattleText9
 Route19TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_19_TRAINER_9, 1, 4, Route19BattleText10, Route19EndBattleText10, Route19AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_9, 4, Route19BattleText10, Route19EndBattleText10, Route19AfterBattleText10
 	db -1 ; end
 
 Route19Text1:

scripts/Route20.asm

@@ -2,7 +2,7 @@ Route20_Script:
 	CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS
 	call nz, Route20Script_50cc6
 	call EnableAutoTextBoxDrawing
-	ld hl, Route20TrainerHeader0
+	ld hl, Route20TrainerHeaders
 	ld de, Route20_ScriptPointers
 	ld a, [wRoute20CurScript]
 	call ExecuteCurMapScriptInTable
@@ -75,6 +75,8 @@ Route20_TextPointers:
 	dw Route20Text11
 	dw Route20Text12
 
+Route20TrainerHeaders:
+	def_trainers
 Route20TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20BattleText1, Route20EndBattleText1, Route20AfterBattleText1
 Route20TrainerHeader1:
@@ -90,11 +92,11 @@ Route20TrainerHeader5:
 Route20TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20BattleText7, Route20EndBattleText7, Route20AfterBattleText7
 Route20TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 1, 4, Route20BattleText8, Route20EndBattleText8, Route20AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 4, Route20BattleText8, Route20EndBattleText8, Route20AfterBattleText8
 Route20TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 1, 3, Route20BattleText9, Route20EndBattleText9, Route20AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 3, Route20BattleText9, Route20EndBattleText9, Route20AfterBattleText9
 Route20TrainerHeader9:
-	trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 1, 4, Route20BattleText10, Route20EndBattleText10, Route20AfterBattleText10
+	trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 4, Route20BattleText10, Route20EndBattleText10, Route20AfterBattleText10
 	db -1 ; end
 
 Route20Text1:

scripts/Route21.asm

@@ -1,6 +1,6 @@
 Route21_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route21TrainerHeader0
+	ld hl, Route21TrainerHeaders
 	ld de, Route21_ScriptPointers
 	ld a, [wRoute21CurScript]
 	call ExecuteCurMapScriptInTable
@@ -23,6 +23,8 @@ Route21_TextPointers:
 	dw Route21Text8
 	dw Route21Text9
 
+Route21TrainerHeaders:
+	def_trainers
 Route21TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21BattleText1, Route21EndBattleText1, Route21AfterBattleText1
 Route21TrainerHeader1:
@@ -38,9 +40,9 @@ Route21TrainerHeader5:
 Route21TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21BattleText7, Route21EndBattleText7, Route21AfterBattleText7
 Route21TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 1, 0, Route21BattleText8, Route21EndBattleText8, Route21AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 0, Route21BattleText8, Route21EndBattleText8, Route21AfterBattleText8
 Route21TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 1, 0, Route21BattleText9, Route21EndBattleText9, Route21AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 0, Route21BattleText9, Route21EndBattleText9, Route21AfterBattleText9
 	db -1 ; end
 
 Route21Text1:

scripts/Route24.asm

@@ -1,6 +1,6 @@
 Route24_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route24TrainerHeader0
+	ld hl, Route24TrainerHeaders
 	ld de, Route24_ScriptPointers
 	ld a, [wRoute24CurScript]
 	call ExecuteCurMapScriptInTable
@@ -86,6 +86,8 @@ Route24_TextPointers:
 	dw Route24Text7
 	dw PickUpItemText
 
+Route24TrainerHeaders:
+	def_trainers 2
 Route24TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_24_TRAINER_0, 4, Route24BattleText1, Route24EndBattleText1, Route24AfterBattleText1
 Route24TrainerHeader1:

scripts/Route25.asm

@@ -1,7 +1,7 @@
 Route25_Script:
 	call Route25Script_515e1
 	call EnableAutoTextBoxDrawing
-	ld hl, Route25TrainerHeader0
+	ld hl, Route25TrainerHeaders
 	ld de, Route25_ScriptPointers
 	ld a, [wRoute25CurScript]
 	call ExecuteCurMapScriptInTable
@@ -53,6 +53,8 @@ Route25_TextPointers:
 	dw PickUpItemText
 	dw Route25Text11
 
+Route25TrainerHeaders:
+	def_trainers
 Route25TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25BattleText1, Route25EndBattleText1, Route25AfterBattleText1
 Route25TrainerHeader1:
@@ -68,9 +70,9 @@ Route25TrainerHeader5:
 Route25TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25BattleText7, Route25EndBattleText7, Route25AfterBattleText7
 Route25TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 1, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8
 Route25TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 1, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9
 	db -1 ; end
 
 Route25Text1:

scripts/Route3.asm

@@ -1,6 +1,6 @@
 Route3_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route3TrainerHeader0
+	ld hl, Route3TrainerHeaders
 	ld de, Route3_ScriptPointers
 	ld a, [wRoute3CurScript]
 	call ExecuteCurMapScriptInTable
@@ -24,6 +24,8 @@ Route3_TextPointers:
 	dw Route3Text9
 	dw Route3Text10
 
+Route3TrainerHeaders:
+	def_trainers 2
 Route3TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3BattleText1, Route3EndBattleText1, Route3AfterBattleText1
 Route3TrainerHeader1:
@@ -37,9 +39,9 @@ Route3TrainerHeader4:
 Route3TrainerHeader5:
 	trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3BattleText6, Route3EndBattleText6, Route3AfterBattleText6
 Route3TrainerHeader6:
-	trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 1, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7
+	trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7
 Route3TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 1, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8
 	db -1 ; end
 
 Route3Text1:

scripts/Route4.asm

@@ -1,6 +1,6 @@
 Route4_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route4TrainerHeader0
+	ld hl, Route4TrainerHeaders
 	ld de, Route4_ScriptPointers
 	ld a, [wRoute4CurScript]
 	call ExecuteCurMapScriptInTable
@@ -20,6 +20,8 @@ Route4_TextPointers:
 	dw Route4Text5
 	dw Route4Text6
 
+Route4TrainerHeaders:
+	def_trainers 2
 Route4TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_4_TRAINER_0, 3, Route4BattleText1, Route4EndBattleText1, Route4AfterBattleText1
 	db -1 ; end

scripts/Route6.asm

@@ -1,6 +1,6 @@
 Route6_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route6TrainerHeader0
+	ld hl, Route6TrainerHeaders
 	ld de, Route6_ScriptPointers
 	ld a, [wRoute6CurScript]
 	call ExecuteCurMapScriptInTable
@@ -21,6 +21,8 @@ Route6_TextPointers:
 	dw Route6Text6
 	dw Route6Text7
 
+Route6TrainerHeaders:
+	def_trainers
 Route6TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_6_TRAINER_0, 0, Route6BattleText1, Route6EndBattleText1, Route6AfterBattleText1
 Route6TrainerHeader1:

scripts/Route8.asm

@@ -1,6 +1,6 @@
 Route8_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route8TrainerHeader0
+	ld hl, Route8TrainerHeaders
 	ld de, Route8_ScriptPointers
 	ld a, [wRoute8CurScript]
 	call ExecuteCurMapScriptInTable
@@ -24,6 +24,8 @@ Route8_TextPointers:
 	dw Route8Text9
 	dw Route8Text10
 
+Route8TrainerHeaders:
+	def_trainers
 Route8TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_8_TRAINER_0, 4, Route8BattleText1, Route8EndBattleText1, Route8AfterBattleText1
 Route8TrainerHeader1:
@@ -39,9 +41,9 @@ Route8TrainerHeader5:
 Route8TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_8_TRAINER_6, 2, Route8BattleText7, Route8EndBattleText7, Route8AfterBattleText7
 Route8TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 1, 2, Route8BattleText8, Route8EndBattleText8, Route8AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 2, Route8BattleText8, Route8EndBattleText8, Route8AfterBattleText8
 Route8TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 1, 4, Route8BattleText9, Route8EndBattleText9, Route8AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 4, Route8BattleText9, Route8EndBattleText9, Route8AfterBattleText9
 	db -1 ; end
 
 Route8Text1:

scripts/Route9.asm

@@ -1,6 +1,6 @@
 Route9_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route9TrainerHeader0
+	ld hl, Route9TrainerHeaders
 	ld de, Route9_ScriptPointers
 	ld a, [wRoute9CurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,6 +25,8 @@ Route9_TextPointers:
 	dw PickUpItemText
 	dw Route9Text11
 
+Route9TrainerHeaders:
+	def_trainers
 Route9TrainerHeader0:
 	trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9BattleText1, Route9EndBattleText1, Route9AfterBattleText1
 Route9TrainerHeader1:
@@ -40,9 +42,9 @@ Route9TrainerHeader5:
 Route9TrainerHeader6:
 	trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9BattleText7, Route9EndBattleText7, Route9AfterBattleText7
 Route9TrainerHeader7:
-	trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 1, 2, Route9BattleText8, Route9EndBattleText8, Route9AfterBattleText8
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 2, Route9BattleText8, Route9EndBattleText8, Route9AfterBattleText8
 Route9TrainerHeader8:
-	trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 1, 2, Route9BattleText9, Route9EndBattleText9, Route9AfterBattleText9
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 2, Route9BattleText9, Route9EndBattleText9, Route9AfterBattleText9
 	db -1 ; end
 
 Route9Text1:

scripts/SSAnne1FRooms.asm

@@ -1,6 +1,6 @@
 SSAnne1FRooms_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne8TrainerHeader0
+	ld hl, SSAnne8TrainerHeaders
 	ld de, SSAnne1FRooms_ScriptPointers
 	ld a, [wSSAnne1FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,6 +25,8 @@ SSAnne1FRooms_TextPointers:
 	dw PickUpItemText
 	dw SSAnne8Text11
 
+SSAnne8TrainerHeaders:
+	def_trainers
 SSAnne8TrainerHeader0:
 	trainer EVENT_BEAT_SS_ANNE_8_TRAINER_0, 2, SSAnne8BattleText1, SSAnne8EndBattleText1, SSAnne8AfterBattleText1
 SSAnne8TrainerHeader1:

scripts/SSAnne2FRooms.asm

@@ -3,7 +3,7 @@ SSAnne2FRooms_Script:
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, SSAnne9TrainerHeader0
+	ld hl, SSAnne9TrainerHeaders
 	ld de, SSAnne2FRooms_ScriptPointers
 	ld a, [wSSAnne2FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
@@ -30,6 +30,8 @@ SSAnne2FRooms_TextPointers:
 	dw SSAnne9Text12
 	dw SSAnne9Text13
 
+SSAnne9TrainerHeaders:
+	def_trainers
 SSAnne9TrainerHeader0:
 	trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1
 SSAnne9TrainerHeader1:

scripts/SSAnneB1FRooms.asm

@@ -1,6 +1,6 @@
 SSAnneB1FRooms_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne10TrainerHeader0
+	ld hl, SSAnne10TrainerHeaders
 	ld de, SSAnneB1FRooms_ScriptPointers
 	ld a, [wSSAnneB1FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
@@ -25,6 +25,8 @@ SSAnneB1FRooms_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+SSAnne10TrainerHeaders:
+	def_trainers
 SSAnne10TrainerHeader0:
 	trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1
 SSAnne10TrainerHeader1:

scripts/SSAnneBow.asm

@@ -1,6 +1,6 @@
 SSAnneBow_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne5TrainerHeader0
+	ld hl, SSAnne5TrainerHeaders
 	ld de, SSAnneBow_ScriptPointers
 	ld a, [wSSAnneBowCurScript]
 	call ExecuteCurMapScriptInTable
@@ -19,6 +19,8 @@ SSAnneBow_TextPointers:
 	dw SSAnne5Text4
 	dw SSAnne5Text5
 
+SSAnne5TrainerHeaders:
+	def_trainers 4
 SSAnne5TrainerHeader0:
 	trainer EVENT_BEAT_SS_ANNE_5_TRAINER_0, 3, SSAnne5BattleText1, SSAnne5EndBattleText1, SSAnne5AfterBattleText1
 SSAnne5TrainerHeader1:

scripts/SaffronGym.asm

@@ -4,7 +4,7 @@ SaffronGym_Script:
 	res 6, [hl]
 	call nz, .LoadNames
 	call EnableAutoTextBoxDrawing
-	ld hl, SaffronGymTrainerHeader0
+	ld hl, SaffronGymTrainerHeaders
 	ld de, SaffronGym_ScriptPointers
 	ld a, [wSaffronGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -22,7 +22,7 @@ SaffronGym_Script:
 .LeaderName:
 	db "SABRINA@"
 
-SaffronGymText_5d048:
+SaffronGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wSaffronGymCurScript], a
@@ -33,16 +33,16 @@ SaffronGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw SaffronGymScript3
+	dw SaffronGymSabrinaPostBattle
 
-SaffronGymScript3:
+SaffronGymSabrinaPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, SaffronGymText_5d048
+	jp z, SaffronGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
 
-SaffronGymText_5d068:
+SaffronGymReceiveTM46:
 	ld a, $a
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -68,22 +68,24 @@ SaffronGymText_5d068:
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6
 
-	jp SaffronGymText_5d048
+	jp SaffronGymResetScripts
 
 SaffronGym_TextPointers:
-	dw SaffronGymText1
-	dw SaffronGymText2
-	dw SaffronGymText3
-	dw SaffronGymText4
-	dw SaffronGymText5
-	dw SaffronGymText6
-	dw SaffronGymText7
-	dw SaffronGymText8
-	dw SaffronGymText9
-	dw SaffronGymText10
-	dw SaffronGymText11
-	dw SaffronGymText12
+	dw SabrinaText
+	dw SaffronGymTrainerText1
+	dw SaffronGymTrainerText2
+	dw SaffronGymTrainerText3
+	dw SaffronGymTrainerText4
+	dw SaffronGymTrainerText5
+	dw SaffronGymTrainerText6
+	dw SaffronGymTrainerText7
+	dw SaffronGymGuideText
+	dw KogaMarshBadgeInfoText
+	dw ReceivedTM46Text
+	dw TM46NoRoomText
 
+SaffronGymTrainerHeaders:
+	def_trainers 2
 SaffronGymTrainerHeader0:
 	trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_0, 3, SaffronGymBattleText1, SaffronGymEndBattleText1, SaffronGymAfterBattleText1
 SaffronGymTrainerHeader1:
@@ -97,30 +99,30 @@ SaffronGymTrainerHeader4:
 SaffronGymTrainerHeader5:
 	trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_5, 3, SaffronGymBattleText6, SaffronGymEndBattleText6, SaffronGymAfterBattleText6
 SaffronGymTrainerHeader6:
-	trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7
+	trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7
 	db -1 ; end
 
-SaffronGymText1:
+SabrinaText:
 	text_asm
 	CheckEvent EVENT_BEAT_SABRINA
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM46
-	jr nz, .afterVictory
-	call z, SaffronGymText_5d068
+	jr nz, .afterBeat
+	call z, SaffronGymReceiveTM46
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.afterVictory
-	ld hl, SaffronGymText_5d16e
+.afterBeat
+	ld hl, SabrinaPostBattleAdviceText
 	call PrintText
 	jr .done
-.beginBattle
-	ld hl, SaffronGymText_5d162
+.beforeBeat
+	ld hl, SabrinaPreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, SaffronGymText_5d167
-	ld de, SaffronGymText_5d167
+	ld hl, ReceivedMarshBadgeText
+	ld de, ReceivedMarshBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -133,95 +135,95 @@ SaffronGymText1:
 .done
 	jp TextScriptEnd
 
-SaffronGymText_5d162:
-	text_far _SaffronGymText_5d162
+SabrinaPreBattleText:
+	text_far _SabrinaPreBattleText
 	text_end
 
-SaffronGymText_5d167:
-	text_far _SaffronGymText_5d167
+ReceivedMarshBadgeText:
+	text_far _ReceivedMarshBadgeText
 	sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
 	text_promptbutton
 	text_end
 
-SaffronGymText_5d16e:
-	text_far _SaffronGymText_5d16e
+SabrinaPostBattleAdviceText:
+	text_far _SabrinaPostBattleAdviceText
 	text_end
 
-SaffronGymText10:
-	text_far _SaffronGymText_5d173
+KogaMarshBadgeInfoText:
+	text_far _KogaMarshBadgeInfoText
 	text_end
 
-SaffronGymText11:
-	text_far ReceivedTM46Text
+ReceivedTM46Text:
+	text_far _ReceivedTM46Text
 	sound_get_item_1
 	text_far _TM46ExplanationText
 	text_end
 
-SaffronGymText12:
+TM46NoRoomText:
 	text_far _TM46NoRoomText
 	text_end
 
-SaffronGymText2:
+SaffronGymTrainerText1:
 	text_asm
 	ld hl, SaffronGymTrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText3:
+SaffronGymTrainerText2:
 	text_asm
 	ld hl, SaffronGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText4:
+SaffronGymTrainerText3:
 	text_asm
 	ld hl, SaffronGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText5:
+SaffronGymTrainerText4:
 	text_asm
 	ld hl, SaffronGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText6:
+SaffronGymTrainerText5:
 	text_asm
 	ld hl, SaffronGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText7:
+SaffronGymTrainerText6:
 	text_asm
 	ld hl, SaffronGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText8:
+SaffronGymTrainerText7:
 	text_asm
 	ld hl, SaffronGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SaffronGymText9:
+SaffronGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_SABRINA
-	jr nz, .asm_5d1dd
-	ld hl, SaffronGymText_5d1e6
+	jr nz, .afterBeat
+	ld hl, SaffronGymGuidePreBattleText
 	call PrintText
-	jr .asm_5d1e3
-.asm_5d1dd
-	ld hl, SaffronGymText_5d1eb
+	jr .done
+.afterBeat
+	ld hl, SaffronGymGuidePostBattleText
 	call PrintText
-.asm_5d1e3
+.done
 	jp TextScriptEnd
 
-SaffronGymText_5d1e6:
-	text_far _SaffronGymText_5d1e6
+SaffronGymGuidePreBattleText:
+	text_far _SaffronGymGuidePreBattleText
 	text_end
 
-SaffronGymText_5d1eb:
-	text_far _SaffronGymText_5d1eb
+SaffronGymGuidePostBattleText:
+	text_far _SaffronGymGuidePostBattleText
 	text_end
 
 SaffronGymBattleText1:

scripts/SeafoamIslandsB4F.asm

@@ -137,6 +137,10 @@ SeafoamIslandsB4F_TextPointers:
 	dw SeafoamIslands5Text4
 	dw SeafoamIslands5Text5
 
+; Articuno is object 3, but its event flag is bit 2.
+; This is not a problem because its sight range is 0, and
+; trainer headers were not stored by ExecuteCurMapScriptInTable.
+	def_trainers 2
 ArticunoTrainerHeader:
 	trainer EVENT_BEAT_ARTICUNO, 0, ArticunoBattleText, ArticunoBattleText, ArticunoBattleText
 	db -1 ; end

scripts/SilphCo10F.asm

@@ -1,7 +1,7 @@
 SilphCo10F_Script:
 	call SilphCo10Script_5a14f
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo10TrainerHeader0
+	ld hl, SilphCo10TrainerHeaders
 	ld de, SilphCo10F_ScriptPointers
 	ld a, [wSilphCo10FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -47,6 +47,8 @@ SilphCo10F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+SilphCo10TrainerHeaders:
+	def_trainers
 SilphCo10TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_0, 3, SilphCo10BattleText1, SilphCo10EndBattleText1, SilphCo10AfterBattleText1
 SilphCo10TrainerHeader1:

scripts/SilphCo11F.asm

@@ -1,7 +1,7 @@
 SilphCo11F_Script:
 	call SilphCo11Script_62110
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo11TrainerHeader0
+	ld hl, SilphCo11TrainerHeaders
 	ld de, SilphCo11F_ScriptPointers
 	ld a, [wSilphCo11FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -280,6 +280,8 @@ SilphCo11F_TextPointers:
 	dw SilphCo11Text5
 	dw SilphCo11Text6
 
+SilphCo11TrainerHeaders:
+	def_trainers 4
 SilphCo11TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_0, 4, SilphCo11BattleText1, SilphCo11EndBattleText1, SilphCo11AfterBattleText1
 SilphCo11TrainerHeader1:

scripts/SilphCo2F.asm

@@ -1,7 +1,7 @@
 SilphCo2F_Script:
 	call SilphCo2Script_59d07
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo2TrainerHeader0
+	ld hl, SilphCo2TrainerHeaders
 	ld de, SilphCo2F_ScriptPointers
 	ld a, [wSilphCo2FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -98,6 +98,8 @@ SilphCo2F_TextPointers:
 	dw SilphCo2Text4
 	dw SilphCo2Text5
 
+SilphCo2TrainerHeaders:
+	def_trainers 2
 SilphCo2TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_0, 3, SilphCo2BattleText1, SilphCo2EndBattleText1, SilphCo2AfterBattleText1
 SilphCo2TrainerHeader1:

scripts/SilphCo3F.asm

@@ -1,7 +1,7 @@
 SilphCo3F_Script:
 	call SilphCo3Script_59f71
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo3TrainerHeader0
+	ld hl, SilphCo3TrainerHeaders
 	ld de, SilphCo3F_ScriptPointers
 	ld a, [wSilphCo3FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -61,6 +61,8 @@ SilphCo3F_TextPointers:
 	dw SilphCo3Text3
 	dw PickUpItemText
 
+SilphCo3TrainerHeaders:
+	def_trainers 2
 SilphCo3TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_0, 2, SilphCo3BattleText1, SilphCo3EndBattleText1, SilphCo3AfterBattleText1
 SilphCo3TrainerHeader1:

scripts/SilphCo4F.asm

@@ -1,7 +1,7 @@
 SilphCo4F_Script:
 	call SilphCo4Script_19d21
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo4TrainerHeader0
+	ld hl, SilphCo4TrainerHeaders
 	ld de, SilphCo4F_ScriptPointers
 	ld a, [wSilphCo4FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -100,6 +100,8 @@ SilphCo4F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+SilphCo4TrainerHeaders:
+	def_trainers 2
 SilphCo4TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_0, 4, SilphCo4BattleText2, SilphCo4EndBattleText2, SilphCo4AfterBattleText2
 SilphCo4TrainerHeader1:

scripts/SilphCo5F.asm

@@ -1,7 +1,7 @@
 SilphCo5F_Script:
 	call SilphCo5Script_19f4d
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo5TrainerHeader0
+	ld hl, SilphCo5TrainerHeaders
 	ld de, SilphCo5F_ScriptPointers
 	ld a, [wSilphCo5FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -83,6 +83,8 @@ SilphCo5F_TextPointers:
 	dw SilphCo5Text10
 	dw SilphCo5Text11
 
+SilphCo5TrainerHeaders:
+	def_trainers 2
 SilphCo5TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_0, 1, SilphCo5BattleText2, SilphCo5EndBattleText2, SilphCo5AfterBattleText2
 SilphCo5TrainerHeader1:

scripts/SilphCo6F.asm

@@ -1,7 +1,7 @@
 SilphCo6F_Script:
 	call SilphCo6Script_1a1bf
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo6TrainerHeader0
+	ld hl, SilphCo6TrainerHeaders
 	ld de, SilphCo6F_ScriptPointers
 	ld a, [wSilphCo6FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -51,12 +51,14 @@ SilphCo6F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
+SilphCo6TrainerHeaders:
+	def_trainers 6
 SilphCo6TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6BattleText2, SilphCo6EndBattleText2, SilphCo6AfterBattleText2
 SilphCo6TrainerHeader1:
 	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6BattleText3, SilphCo6EndBattleText3, SilphCo6AfterBattleText3
 SilphCo6TrainerHeader2:
-	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4
+	trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4
 	db -1 ; end
 
 SilphCo6Script_1a22f:

scripts/SilphCo7F.asm

@@ -1,7 +1,7 @@
 SilphCo7F_Script:
 	call SilphCo7Script_51b77
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo7TrainerHeader0
+	ld hl, SilphCo7TrainerHeaders
 	ld de, SilphCo7F_ScriptPointers
 	ld a, [wSilphCo7FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -279,6 +279,8 @@ SilphCo7F_TextPointers:
 	dw SilphCo7Text14
 	dw SilphCo7Text15
 
+SilphCo7TrainerHeaders:
+	def_trainers 5
 SilphCo7TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_0, 2, SilphCo7BattleText1, SilphCo7EndBattleText1, SilphCo7AfterBattleText1
 SilphCo7TrainerHeader1:
@@ -286,7 +288,7 @@ SilphCo7TrainerHeader1:
 SilphCo7TrainerHeader2:
 	trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_2, 3, SilphCo7BattleText3, SilphCo7EndBattleText3, SilphCo7AfterBattleText3
 SilphCo7TrainerHeader3:
-	trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1, 4, SilphCo7BattleText4, SilphCo7EndBattleText4, SilphCo7AfterBattleText4
+	trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 4, SilphCo7BattleText4, SilphCo7EndBattleText4, SilphCo7AfterBattleText4
 	db -1 ; end
 
 SilphCo7Text1:

scripts/SilphCo8F.asm

@@ -1,7 +1,7 @@
 SilphCo8F_Script:
 	call SilphCo8Script_5651a
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo8TrainerHeader0
+	ld hl, SilphCo8TrainerHeaders
 	ld de, SilphCo8F_ScriptPointers
 	ld a, [wSilphCo8FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -81,6 +81,8 @@ SilphCo8F_TextPointers:
 	dw SilphCo8Text3
 	dw SilphCo8Text4
 
+SilphCo8TrainerHeaders:
+	def_trainers 2
 SilphCo8TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_0, 4, SilphCo8BattleText1, SilphCo8EndBattleText1, SilphCo8AfterBattleText1
 SilphCo8TrainerHeader1:

scripts/SilphCo9F.asm

@@ -1,7 +1,7 @@
 SilphCo9F_Script:
 	call SilphCo9Script_5d7d1
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo9TrainerHeader0
+	ld hl, SilphCo9TrainerHeaders
 	ld de, SilphCo9F_ScriptPointers
 	ld a, [wSilphCo9FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -129,6 +129,8 @@ SilphCo9F_TextPointers:
 	dw SilphCo9Text3
 	dw SilphCo9Text4
 
+SilphCo9TrainerHeaders:
+	def_trainers 2
 SilphCo9TrainerHeader0:
 	trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_0, 4, SilphCo9BattleText1, SilphCo9EndBattleText1, SilphCo9AfterBattleText1
 SilphCo9TrainerHeader1:

scripts/VermilionDock.asm

@@ -124,7 +124,7 @@ VermilionDock_1db9b:
 VermilionDock_AnimSmokePuffDriftRight:
 	push bc
 	push de
-	ld hl, wOAMBuffer + 4 * $4 + 1 ; x coord
+	ld hl, wShadowOAMSprite04XCoord
 	ld a, [wSSAnneSmokeDriftAmount]
 	swap a
 	ld c, a
@@ -182,12 +182,12 @@ VermilionDock_1dc7c:
 VermilionDock_EraseSSAnne:
 ; Fill the area the S.S. Anne occupies in BG map 0 with water tiles.
 	ld hl, wVermilionDockTileMapBuffer
-	ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH
+	ld bc, wVermilionDockTileMapBufferEnd - wVermilionDockTileMapBuffer
 	ld a, $14 ; water tile
 	call FillMemory
 	hlbgcoord 0, 10
 	ld de, wVermilionDockTileMapBuffer
-	ld bc, (6 * BG_MAP_WIDTH) / 16
+	lb bc, BANK(wVermilionDockTileMapBuffer), 12
 	call CopyVideoData
 
 ; Replace the blocks of the lower half of the ship with water blocks. This

scripts/VermilionGym.asm

@@ -9,7 +9,7 @@ VermilionGym_Script:
 	res 6, [hl]
 	call nz, VermilionGymSetDoorTile
 	call EnableAutoTextBoxDrawing
-	ld hl, VermilionGymTrainerHeader0
+	ld hl, VermilionGymTrainerHeaders
 	ld de, VermilionGym_ScriptPointers
 	ld a, [wVermilionGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -94,11 +94,13 @@ VermilionGym_TextPointers:
 	dw VermilionGymTrainerText1
 	dw VermilionGymTrainerText2
 	dw VermilionGymTrainerText3
-	dw VermilionGymFanText
-	dw LTSurgeThunderbadgeInfoText
+	dw VermilionGymGuideText
+	dw LTSurgeThunderBadgeInfoText
 	dw ReceivedTM24Text
 	dw TM24NoRoomText
 
+VermilionGymTrainerHeaders:
+	def_trainers 2
 VermilionGymTrainerHeader0:
 	trainer EVENT_BEAT_VERMILION_GYM_TRAINER_0, 3, VermilionGymBattleText1, VermilionGymEndBattleText1, VermilionGymAfterBattleText1
 VermilionGymTrainerHeader1:
@@ -126,8 +128,8 @@ LTSurgeText:
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, ReceivedThunderbadgeText
-	ld de, ReceivedThunderbadgeText
+	ld hl, ReceivedThunderBadgeText
+	ld de, ReceivedThunderBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -151,8 +153,8 @@ LTSurgePostBattleAdviceText:
 	text_far _LTSurgePostBattleAdviceText
 	text_end
 
-LTSurgeThunderbadgeInfoText:
-	text_far _LTSurgeThunderbadgeInfoText
+LTSurgeThunderBadgeInfoText:
+	text_far _LTSurgeThunderBadgeInfoText
 	text_end
 
 ReceivedTM24Text:
@@ -165,8 +167,8 @@ TM24NoRoomText:
 	text_far _TM24NoRoomText
 	text_end
 
-ReceivedThunderbadgeText:
-	text_far _ReceivedThunderbadgeText
+ReceivedThunderBadgeText:
+	text_far _ReceivedThunderBadgeText
 	text_end
 
 VermilionGymTrainerText1:
@@ -223,24 +225,24 @@ VermilionGymAfterBattleText3:
 	text_far _VermilionGymAfterBattleText3
 	text_end
 
-VermilionGymFanText:
+VermilionGymGuideText:
 	text_asm
 	ld a, [wBeatGymFlags]
 	bit BIT_THUNDERBADGE, a
 	jr nz, .afterBeat
-	ld hl, VermilionGymFanPreBattleText
+	ld hl, VermilionGymGuidePreBattleText
 	call PrintText
 	jr .done
 .afterBeat
-	ld hl, VermilionGymFanPostBattleText
+	ld hl, VermilionGymGuidePostBattleText
 	call PrintText
 .done
 	jp TextScriptEnd
 
-VermilionGymFanPreBattleText:
-	text_far _VermilionGymFanPreBattleText
+VermilionGymGuidePreBattleText:
+	text_far _VermilionGymGuidePreBattleText
 	text_end
 
-VermilionGymFanPostBattleText:
-	text_far _VermilionGymFanPostBattleText
+VermilionGymGuidePostBattleText:
+	text_far _VermilionGymGuidePostBattleText
 	text_end

scripts/VictoryRoad1F.asm

@@ -4,7 +4,7 @@ VictoryRoad1F_Script:
 	res 5, [hl]
 	call nz, .next
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad1TrainerHeader0
+	ld hl, VictoryRoad1TrainerHeaders
 	ld de, VictoryRoad1F_ScriptPointers
 	ld a, [wVictoryRoad1FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -47,6 +47,8 @@ VictoryRoad1F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 
+VictoryRoad1TrainerHeaders:
+	def_trainers
 VictoryRoad1TrainerHeader0:
 	trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1BattleText1, VictoryRoad1EndBattleText1, VictoryRoad1AfterBattleText1
 VictoryRoad1TrainerHeader1:

scripts/VictoryRoad2F.asm

@@ -8,7 +8,7 @@ VictoryRoad2F_Script:
 	res 5, [hl]
 	call nz, VictoryRoad2Script_517c9
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad2TrainerHeader0
+	ld hl, VictoryRoad2TrainerHeaders
 	ld de, VictoryRoad2F_ScriptPointers
 	ld a, [wVictoryRoad2FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -81,6 +81,8 @@ VictoryRoad2F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 
+VictoryRoad2TrainerHeaders:
+	def_trainers
 VictoryRoad2TrainerHeader0:
 	trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0, 4, VictoryRoad2BattleText1, VictoryRoad2EndBattleText1, VictoryRoad2AfterBattleText1
 VictoryRoad2TrainerHeader1:

scripts/VictoryRoad3F.asm

@@ -1,7 +1,7 @@
 VictoryRoad3F_Script:
 	call VictoryRoad3Script_44996
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad3TrainerHeader0
+	ld hl, VictoryRoad3TrainerHeaders
 	ld de, VictoryRoad3F_ScriptPointers
 	ld a, [wVictoryRoad3FCurScript]
 	call ExecuteCurMapScriptInTable
@@ -86,6 +86,8 @@ VictoryRoad3F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 
+VictoryRoad3TrainerHeaders:
+	def_trainers
 VictoryRoad3TrainerHeader0:
 	trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0, 1, VictoryRoad3BattleText2, VictoryRoad3EndBattleText2, VictoryRoad3AfterBattleText2
 VictoryRoad3TrainerHeader1:

scripts/ViridianCity.asm

@@ -18,7 +18,7 @@ ViridianCityScript_1900b:
 	CheckEvent EVENT_VIRIDIAN_GYM_OPEN
 	ret nz
 	ld a, [wObtainedBadges]
-	cp $ff ^ (1 << BIT_EARTHBADGE)
+	cp ~(1 << BIT_EARTHBADGE)
 	jr nz, .gym_closed
 	SetEvent EVENT_VIRIDIAN_GYM_OPEN
 	ret
@@ -148,7 +148,7 @@ ViridianCityText1:
 ViridianCityText2:
 	text_asm
 	ld a, [wObtainedBadges]
-	cp $ff ^ (1 << BIT_EARTHBADGE)
+	cp ~(1 << BIT_EARTHBADGE)
 	ld hl, ViridianCityText_19127
 	jr z, .done
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI

scripts/ViridianForest.asm

@@ -1,6 +1,6 @@
 ViridianForest_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianForestTrainerHeader0
+	ld hl, ViridianForestTrainerHeaders
 	ld de, ViridianForest_ScriptPointers
 	ld a, [wViridianForestCurScript]
 	call ExecuteCurMapScriptInTable
@@ -28,6 +28,8 @@ ViridianForest_TextPointers:
 	dw ViridianForestText13
 	dw ViridianForestText14
 
+ViridianForestTrainerHeaders:
+	def_trainers 2
 ViridianForestTrainerHeader0:
 	trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestBattleText1, ViridianForestEndBattleText1, ViridianForestAfterBattleText1
 ViridianForestTrainerHeader1:

scripts/ViridianGym.asm

@@ -3,7 +3,7 @@ ViridianGym_Script:
 	ld de, .LeaderName
 	call LoadGymLeaderAndCityName
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianGymTrainerHeader0
+	ld hl, ViridianGymTrainerHeaders
 	ld de, ViridianGym_ScriptPointers
 	ld a, [wViridianGymCurScript]
 	call ExecuteCurMapScriptInTable
@@ -16,7 +16,7 @@ ViridianGym_Script:
 .LeaderName:
 	db "GIOVANNI@"
 
-ViridianGymScript_748d6:
+ViridianGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wViridianGymCurScript], a
@@ -27,7 +27,7 @@ ViridianGym_ScriptPointers:
 	dw ViridianGymScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw ViridianGymScript3
+	dw ViridianGymGiovanniPostBattle
 	dw ViridianGymScript4
 
 ViridianGymScript0:
@@ -116,7 +116,7 @@ ViridianGymArrowMovement12:
 ViridianGymScript4:
 	ld a, [wSimulatedJoypadStatesIndex]
 	and a
-	jr nz, .asm_74980
+	jr nz, .ViridianGymLoadSpinnerArrow
 	xor a
 	ld [wJoyIgnore], a
 	ld hl, wd736
@@ -124,16 +124,17 @@ ViridianGymScript4:
 	ld a, $0
 	ld [wCurMapScript], a
 	ret
-.asm_74980
+.ViridianGymLoadSpinnerArrow
 	farjp LoadSpinnerArrowTiles
 
-ViridianGymScript3:
+ViridianGymGiovanniPostBattle:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, ViridianGymScript_748d6
+	jp z, ViridianGymResetScripts
 	ld a, $f0
 	ld [wJoyIgnore], a
-ViridianGymScript3_74995:
+; fallthrough
+ViridianGymReceiveTM27:
 	ld a, $c
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -163,24 +164,26 @@ ViridianGymScript3_74995:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
-	jp ViridianGymScript_748d6
+	jp ViridianGymResetScripts
 
 ViridianGym_TextPointers:
-	dw ViridianGymText1
-	dw ViridianGymText2
-	dw ViridianGymText3
-	dw ViridianGymText4
-	dw ViridianGymText5
-	dw ViridianGymText6
-	dw ViridianGymText7
-	dw ViridianGymText8
-	dw ViridianGymText9
-	dw ViridianGymText10
+	dw GiovanniText
+	dw ViridianGymTrainerText1
+	dw ViridianGymTrainerText2
+	dw ViridianGymTrainerText3
+	dw ViridianGymTrainerText4
+	dw ViridianGymTrainerText5
+	dw ViridianGymTrainerText6
+	dw ViridianGymTrainerText7
+	dw ViridianGymTrainerText8
+	dw ViridianGymGuideText
 	dw PickUpItemText
-	dw ViridianGymText12
-	dw ViridianGymText13
-	dw ViridianGymText14
+	dw GiovanniEarthBadgeInfoText
+	dw ReceivedTM27Text
+	dw TM27NoRoomText
 
+ViridianGymTrainerHeaders:
+	def_trainers 2
 ViridianGymTrainerHeader0:
 	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymBattleText1, ViridianGymEndBattleText1, ViridianGymAfterBattleText1
 ViridianGymTrainerHeader1:
@@ -194,24 +197,24 @@ ViridianGymTrainerHeader4:
 ViridianGymTrainerHeader5:
 	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymBattleText6, ViridianGymEndBattleText6, ViridianGymAfterBattleText6
 ViridianGymTrainerHeader6:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7
 ViridianGymTrainerHeader7:
-	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
+	trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8
 	db -1 ; end
 
-ViridianGymText1:
+GiovanniText:
 	text_asm
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
-	jr z, .beginBattle
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM27
-	jr nz, .afterVictory
-	call z, ViridianGymScript3_74995
+	jr nz, .afterBeat
+	call z, ViridianGymReceiveTM27
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.afterVictory
+.afterBeat
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, ViridianGymText_74ad9
+	ld hl, GiovanniPostBattleAdviceText
 	call PrintText
 	call GBFadeOutToBlack
 	ld a, HS_VIRIDIAN_GYM_GIOVANNI
@@ -221,14 +224,14 @@ ViridianGymText1:
 	call Delay3
 	call GBFadeInFromBlack
 	jr .done
-.beginBattle
-	ld hl, ViridianGymText_74ace
+.beforeBeat
+	ld hl, GiovanniPreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, ViridianGymText_74ad3
-	ld de, ViridianGymText_74ad3
+	ld hl, ReceivedEarthBadgeText
+	ld de, ReceivedEarthBadgeText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
@@ -241,25 +244,25 @@ ViridianGymText1:
 .done
 	jp TextScriptEnd
 
-ViridianGymText_74ace:
-	text_far _ViridianGymText_74ace
+GiovanniPreBattleText:
+	text_far _GiovanniPreBattleText
 	text_end
 
-ViridianGymText_74ad3:
-	text_far _ViridianGymText_74ad3
+ReceivedEarthBadgeText:
+	text_far _ReceivedEarthBadgeText
 	sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
 	text_end
 
-ViridianGymText_74ad9:
-	text_far _ViridianGymText_74ad9
+GiovanniPostBattleAdviceText:
+	text_far _GiovanniPostBattleAdviceText
 	text_waitbutton
 	text_end
 
-ViridianGymText12:
-	text_far _ViridianGymText12
+GiovanniEarthBadgeInfoText:
+	text_far _GiovanniEarthBadgeInfoText
 	text_end
 
-ViridianGymText13:
+ReceivedTM27Text:
 	text_far _ReceivedTM27Text
 	sound_get_item_1
 
@@ -267,11 +270,11 @@ TM27ExplanationText:
 	text_far _TM27ExplanationText
 	text_end
 
-ViridianGymText14:
+TM27NoRoomText:
 	text_far _TM27NoRoomText
 	text_end
 
-ViridianGymText2:
+ViridianGymTrainerText1:
 	text_asm
 	ld hl, ViridianGymTrainerHeader0
 	call TalkToTrainer
@@ -289,7 +292,7 @@ ViridianGymAfterBattleText1:
 	text_far _ViridianGymAfterBattleText1
 	text_end
 
-ViridianGymText3:
+ViridianGymTrainerText2:
 	text_asm
 	ld hl, ViridianGymTrainerHeader1
 	call TalkToTrainer
@@ -307,7 +310,7 @@ ViridianGymAfterBattleText2:
 	text_far _ViridianGymAfterBattleText2
 	text_end
 
-ViridianGymText4:
+ViridianGymTrainerText3:
 	text_asm
 	ld hl, ViridianGymTrainerHeader2
 	call TalkToTrainer
@@ -325,7 +328,7 @@ ViridianGymAfterBattleText3:
 	text_far _ViridianGymAfterBattleText3
 	text_end
 
-ViridianGymText5:
+ViridianGymTrainerText4:
 	text_asm
 	ld hl, ViridianGymTrainerHeader3
 	call TalkToTrainer
@@ -343,7 +346,7 @@ ViridianGymAfterBattleText4:
 	text_far _ViridianGymAfterBattleText4
 	text_end
 
-ViridianGymText6:
+ViridianGymTrainerText5:
 	text_asm
 	ld hl, ViridianGymTrainerHeader4
 	call TalkToTrainer
@@ -361,7 +364,7 @@ ViridianGymAfterBattleText5:
 	text_far _ViridianGymAfterBattleText5
 	text_end
 
-ViridianGymText7:
+ViridianGymTrainerText6:
 	text_asm
 	ld hl, ViridianGymTrainerHeader5
 	call TalkToTrainer
@@ -379,7 +382,7 @@ ViridianGymAfterBattleText6:
 	text_far _ViridianGymAfterBattleText6
 	text_end
 
-ViridianGymText8:
+ViridianGymTrainerText7:
 	text_asm
 	ld hl, ViridianGymTrainerHeader6
 	call TalkToTrainer
@@ -397,7 +400,7 @@ ViridianGymAfterBattleText7:
 	text_far _ViridianGymAfterBattleText7
 	text_end
 
-ViridianGymText9:
+ViridianGymTrainerText8:
 	text_asm
 	ld hl, ViridianGymTrainerHeader7
 	call TalkToTrainer
@@ -415,23 +418,23 @@ ViridianGymAfterBattleText8:
 	text_far _ViridianGymAfterBattleText8
 	text_end
 
-ViridianGymText10:
+ViridianGymGuideText:
 	text_asm
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
-	jr nz, .asm_1abd1
-	ld hl, ViridianGymText_74bd4
+	jr nz, .afterBeat
+	ld hl, ViridianGymGuidePreBattleText
 	call PrintText
-	jr .asm_6064d
-.asm_1abd1
-	ld hl, ViridianGymText_74bd9
+	jr .done
+.afterBeat
+	ld hl, ViridianGymGuidePostBattleText
 	call PrintText
-.asm_6064d
+.done
 	jp TextScriptEnd
 
-ViridianGymText_74bd4:
-	text_far _ViridianGymText_74bd4
+ViridianGymGuidePreBattleText:
+	text_far _ViridianGymGuidePreBattleText
 	text_end
 
-ViridianGymText_74bd9:
-	text_far _ViridianGymText_74bd9
+ViridianGymGuidePostBattleText:
+	text_far _ViridianGymGuidePostBattleText
 	text_end