Document Gym scripts first half

data/event_scripts.s

@@ -1025,10 +1025,7 @@ Common_ShowEasyChatScreen:: @ 8271E7C
 	fadescreen 0
 	return
 
-DewfordTown_Gym_EventScript_271E84:: @ 8271E84
-LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84
-MauvilleCity_Gym_EventScript_271E84:: @ 8271E84
-RustboroCity_Gym_EventScript_271E84:: @ 8271E84
+Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
 	clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return

data/maps/DewfordTown_Gym/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Gym_EventScript_1FC7C2",
+      "script": "DewfordTown_Gym_EventScript_Brawly",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC8B7",
+      "script": "DewfordTown_Gym_EventScript_Takao",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC8D9",
+      "script": "DewfordTown_Gym_EventScript_Jocelyn",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "DewfordTown_Gym_EventScript_1FC8FB",
+      "script": "DewfordTown_Gym_EventScript_Laura",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "DewfordTown_Gym_EventScript_1FC983",
+      "script": "DewfordTown_Gym_EventScript_GymGuide",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC93F",
+      "script": "DewfordTown_Gym_EventScript_Cristian",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "DewfordTown_Gym_EventScript_1FC961",
+      "script": "DewfordTown_Gym_EventScript_Lilith",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "DewfordTown_Gym_EventScript_1FC91D",
+      "script": "DewfordTown_Gym_EventScript_Brenden",
       "flag": "0"
     }
   ],
@@ -143,7 +143,7 @@
       "y": 23,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9A2"
+      "script": "DewfordTown_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -151,7 +151,7 @@
       "y": 23,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9B2"
+      "script": "DewfordTown_Gym_EventScript_RightGymStatue"
     },
     {
       "type": "sign",
@@ -159,7 +159,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9A2"
+      "script": "DewfordTown_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -167,7 +167,7 @@
       "y": 24,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_Gym_EventScript_1FC9B2"
+      "script": "DewfordTown_Gym_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/DewfordTown_Gym/scripts.inc

@@ -3,186 +3,187 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C
 	.byte 0
 
 DewfordTown_Gym_OnTransition: @ 81FC642
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	end
 
-DewfordTown_Gym_EventScript_1FC648:: @ 81FC648
+DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648
 	checktrainerflag TRAINER_BRAWLY_1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6A2
-	call DewfordTown_Gym_EventScript_1FC768
+	goto_if_eq DewfordTown_Gym_EventScript_SetLightsOn
+	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	copyvar VAR_0x8001, VAR_0x8000
 	compare VAR_0x8000, 0
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6BE
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius7
 	compare VAR_0x8000, 1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6BA
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius6
 	compare VAR_0x8000, 2
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6B6
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius5
 	compare VAR_0x8000, 3
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6B2
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius4
 	compare VAR_0x8000, 4
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6AE
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius3
 	compare VAR_0x8000, 5
-	goto_if_eq DewfordTown_Gym_EventScript_1FC6AA
-	goto DewfordTown_Gym_EventScript_1FC6A6
+	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius2
+	goto DewfordTown_Gym_EventScript_SetFlashRadius1
 
-DewfordTown_Gym_EventScript_1FC6A2:: @ 81FC6A2
+DewfordTown_Gym_EventScript_SetLightsOn:: @ 81FC6A2
 	setflashradius 0
 	return
 
-DewfordTown_Gym_EventScript_1FC6A6:: @ 81FC6A6
+DewfordTown_Gym_EventScript_SetFlashRadius1:: @ 81FC6A6
 	setflashradius 1
 	return
 
-DewfordTown_Gym_EventScript_1FC6AA:: @ 81FC6AA
+DewfordTown_Gym_EventScript_SetFlashRadius2:: @ 81FC6AA
 	setflashradius 2
 	return
 
-DewfordTown_Gym_EventScript_1FC6AE:: @ 81FC6AE
+DewfordTown_Gym_EventScript_SetFlashRadius3:: @ 81FC6AE
 	setflashradius 3
 	return
 
-DewfordTown_Gym_EventScript_1FC6B2:: @ 81FC6B2
+DewfordTown_Gym_EventScript_SetFlashRadius4:: @ 81FC6B2
 	setflashradius 4
 	return
 
-DewfordTown_Gym_EventScript_1FC6B6:: @ 81FC6B6
+DewfordTown_Gym_EventScript_SetFlashRadius5:: @ 81FC6B6
 	setflashradius 5
 	return
 
-DewfordTown_Gym_EventScript_1FC6BA:: @ 81FC6BA
+DewfordTown_Gym_EventScript_SetFlashRadius6:: @ 81FC6BA
 	setflashradius 6
 	return
 
-DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE
+DewfordTown_Gym_EventScript_SetFlashRadius7:: @ 81FC6BE
 	setflashradius 7
 	return
 
-DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2
-	call DewfordTown_Gym_EventScript_1FC768
+DewfordTown_Gym_EventScript_BrightenRoom:: @ 81FC6C2
+	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	nop1
 	compare VAR_0x8000, VAR_0x8001
-	goto_if_eq DewfordTown_Gym_EventScript_1FC71A
+	goto_if_eq DewfordTown_Gym_EventScript_NoLightChange
 	copyvar VAR_0x8001, VAR_0x8000
 	compare VAR_0x8000, 1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC71B
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash1Trainer
 	compare VAR_0x8000, 2
-	goto_if_eq DewfordTown_Gym_EventScript_1FC726
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash2Trainers
 	compare VAR_0x8000, 3
-	goto_if_eq DewfordTown_Gym_EventScript_1FC731
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash3Trainers
 	compare VAR_0x8000, 4
-	goto_if_eq DewfordTown_Gym_EventScript_1FC73C
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash4Trainers
 	compare VAR_0x8000, 5
-	goto_if_eq DewfordTown_Gym_EventScript_1FC747
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash5Trainers
 	compare VAR_0x8000, 6
-	goto_if_eq DewfordTown_Gym_EventScript_1FC752
+	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash6Trainers
 
-DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A
+DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A
 	return
 
-DewfordTown_Gym_EventScript_1FC71B:: @ 81FC71B
+@ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius
+DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B
 	playse SE_MU_PACHI
 	animateflash 6
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC726:: @ 81FC726
+DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726
 	playse SE_MU_PACHI
 	animateflash 5
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC731:: @ 81FC731
+DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731
 	playse SE_MU_PACHI
 	animateflash 4
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC73C:: @ 81FC73C
+DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C
 	playse SE_MU_PACHI
 	animateflash 3
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC747:: @ 81FC747
+DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747
 	playse SE_MU_PACHI
 	animateflash 2
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC752:: @ 81FC752
+DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752
 	playse SE_MU_PACHI
 	animateflash 1
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC75D:: @ 81FC75D
+DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D
 	playse SE_MU_PACHI
 	animateflash 0
-	call DewfordTown_Gym_EventScript_1FC648
+	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_1FC768:: @ 81FC768
+DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768
 	setvar VAR_0x8000, 0
 	checktrainerflag TRAINER_TAKAO
-	goto_if_lt DewfordTown_Gym_EventScript_1FC77B
+	goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn
 	addvar VAR_0x8000, 1
 
-DewfordTown_Gym_EventScript_1FC77B:: @ 81FC77B
+DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B
 	checktrainerflag TRAINER_JOCELYN
-	goto_if_lt DewfordTown_Gym_EventScript_1FC789
+	goto_if_lt DewfordTown_Gym_EventScript_CheckLaura
 	addvar VAR_0x8000, 1
 
-DewfordTown_Gym_EventScript_1FC789:: @ 81FC789
+DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789
 	checktrainerflag TRAINER_LAURA
-	goto_if_lt DewfordTown_Gym_EventScript_1FC797
+	goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden
 	addvar VAR_0x8000, 1
 
-DewfordTown_Gym_EventScript_1FC797:: @ 81FC797
+DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797
 	checktrainerflag TRAINER_BRENDEN
-	goto_if_lt DewfordTown_Gym_EventScript_1FC7A5
+	goto_if_lt DewfordTown_Gym_EventScript_CheckCristian
 	addvar VAR_0x8000, 1
 
-DewfordTown_Gym_EventScript_1FC7A5:: @ 81FC7A5
+DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5
 	checktrainerflag TRAINER_CRISTIAN
-	goto_if_lt DewfordTown_Gym_EventScript_1FC7B3
+	goto_if_lt DewfordTown_Gym_EventScript_CheckLilith
 	addvar VAR_0x8000, 1
 
-DewfordTown_Gym_EventScript_1FC7B3:: @ 81FC7B3
+DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3
 	checktrainerflag TRAINER_LILITH
-	goto_if_lt DewfordTown_Gym_EventScript_1FC7C1
+	goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers
 	addvar VAR_0x8000, 1
 
-DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1
+DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1
 	return
 
-DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
-	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC
+DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2
+	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreBattle, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq DewfordTown_Gym_EventScript_1FC89C
-	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1FC878
-	msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch
+	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_GiveBulkUp2
+	msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
-	call DewfordTown_Gym_EventScript_1FC75D
-	message DewfordTown_Gym_Text_1FD07D
+DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7
+	call DewfordTown_Gym_EventScript_AnimateFlashFullBrightness
+	message DewfordTown_Gym_Text_ReceivedKnuckleBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag FLAG_BADGE02_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq DewfordTown_Gym_EventScript_271E84
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 2
 	call Common_EventScript_SetGymTrainers
-	call DewfordTown_Gym_EventScript_1FC855
+	call DewfordTown_Gym_EventScript_GiveBulkUp
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox DewfordTown_Gym_Text_1FD1E0, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_RegisteredBrawly, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -192,124 +193,124 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
+DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
-	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	return
 
-DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
+DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878
 	giveitem_std ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
+	msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C
-	trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE
-	msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_BrawlyRematch:: @ 81FC89C
+	trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreRematch, DewfordTown_Gym_Text_BrawlyRematchDefeat, DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons
+	msgbox DewfordTown_Gym_Text_BrawlyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7
-	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2
-	msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7
+	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoPreBattle, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom
+	msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_TakaoBrightenRoom:: @ 81FC8D2
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9
-	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4
-	msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9
+	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynPreBattle, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom
+	msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_JocelynBrightenRoom:: @ 81FC8F4
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB
-	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916
-	msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB
+	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraPreBattle, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom
+	msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC916:: @ 81FC916
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 81FC916
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D
-	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938
-	msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D
+	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenPreBattle, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom
+	msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC938:: @ 81FC938
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_BrendenBrightenRoom:: @ 81FC938
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F
-	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A
-	msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F
+	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianPreBattle, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom
+	msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_CristianBrightenRoom:: @ 81FC95A
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC961:: @ 81FC961
-	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C
-	msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE
+DewfordTown_Gym_EventScript_Lilith:: @ 81FC961
+	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithPreBattle, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom
+	msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C
-	call DewfordTown_Gym_EventScript_1FC6C2
+DewfordTown_Gym_EventScript_LilithBrightenRoom:: @ 81FC97C
+	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC983:: @ 81FC983
+DewfordTown_Gym_EventScript_GymGuide:: @ 81FC983
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_1FC998
-	msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_GymGuidePostVictory
+	msgbox DewfordTown_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC998:: @ 81FC998
-	msgbox DewfordTown_Gym_Text_1FCB5C, MSGBOX_DEFAULT
+DewfordTown_Gym_EventScript_GymGuidePostVictory:: @ 81FC998
+	msgbox DewfordTown_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_1FC9A2:: @ 81FC9A2
+DewfordTown_Gym_EventScript_LeftGymStatue:: @ 81FC9A2
 	lockall
-	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2
-	goto DewfordTown_Gym_EventScript_1FC9CC
+	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified
+	goto DewfordTown_Gym_EventScript_GymStatue
 	end
 
-DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2
+DewfordTown_Gym_EventScript_RightGymStatue:: @ 81FC9B2
 	lockall
-	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_1FC9C2
-	goto DewfordTown_Gym_EventScript_1FC9CC
+	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified
+	goto DewfordTown_Gym_EventScript_GymStatue
 	end
 
-DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2
-	msgbox DewfordTown_Gym_Text_1FD28B, MSGBOX_DEFAULT
+DewfordTown_Gym_EventScript_GymStatueCertified:: @ 81FC9C2
+	msgbox DewfordTown_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC
-	msgbox DewfordTown_Gym_Text_1FD272, MSGBOX_DEFAULT
+DewfordTown_Gym_EventScript_GymStatue:: @ 81FC9CC
+	msgbox DewfordTown_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6
+DewfordTown_Gym_Text_GymGuideAdvice: @ 81FC9D6
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "DEWFORD's GYM LEADER BRAWLY commands\n"
@@ -325,88 +326,88 @@ DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6
 	.string "the TRAINERS in your way.\p"
 	.string "Hey, okay, go for it!$"
 
-DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C
+DewfordTown_Gym_Text_GymGuidePostVictory: @ 81FCB5C
 	.string "Whoah! It's turned too bright in here!\p"
 	.string "Your future is bright, too!$"
 
-DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F
+DewfordTown_Gym_Text_TakaoPreBattle: @ 81FCB9F
 	.string "Might is right!\n"
 	.string "Come on!$"
 
-DewfordTown_Gym_Text_1FCBB8: @ 81FCBB8
+DewfordTown_Gym_Text_TakaoDefeat: @ 81FCBB8
 	.string "Not enough power…$"
 
-DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA
+DewfordTown_Gym_Text_TakaoPostBattle: @ 81FCBCA
 	.string "Your skill overcame my strength!\n"
 	.string "Your technique is commendable!$"
 
-DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A
+DewfordTown_Gym_Text_JocelynPreBattle: @ 81FCC0A
 	.string "There's no need for BRAWLY to be\n"
 	.string "involved!\p"
 	.string "I'll crush you!$"
 
-DewfordTown_Gym_Text_1FCC45: @ 81FCC45
+DewfordTown_Gym_Text_JocelynDefeat: @ 81FCC45
 	.string "But… How?\n"
 	.string "How could I lose so easily?$"
 
-DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B
+DewfordTown_Gym_Text_JocelynPostBattle: @ 81FCC6B
 	.string "I'm not going to waste this loss.\n"
 	.string "I'll use it to motivate me to train!\p"
 	.string "One day I'll become a GYM LEADER…\p"
 	.string "No, I'll become the POKéMON LEAGUE\n"
 	.string "CHAMPION!$"
 
-DewfordTown_Gym_Text_1FCD01: @ 81FCD01
+DewfordTown_Gym_Text_LauraPreBattle: @ 81FCD01
 	.string "Don't you dare brush me off!\n"
 	.string "It's not my fault if you cry!$"
 
-DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C
+DewfordTown_Gym_Text_LauraDefeat: @ 81FCD3C
 	.string "Waaaaaaah!\n"
 	.string "I lost!$"
 
-DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F
+DewfordTown_Gym_Text_LauraPostBattle: @ 81FCD4F
 	.string "I battle in the dark to make my heart\n"
 	.string "stronger.\p"
 	.string "But because it's so dark, I can never\n"
 	.string "see BRAWLY's face…$"
 
-DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8
+DewfordTown_Gym_Text_LilithPreBattle: @ 81FCDB8
 	.string "Ufufu…\n"
 	.string "Are you stumbling around in the dark?$"
 
-DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5
+DewfordTown_Gym_Text_LilithDefeat: @ 81FCDE5
 	.string "Oh, you…\n"
 	.string "I don't want to know you!$"
 
-DewfordTown_Gym_Text_1FCE08: @ 81FCE08
+DewfordTown_Gym_Text_LilithPostBattle: @ 81FCE08
 	.string "You deserve to stay lost and end up\n"
 	.string "back at the entrance again!$"
 
-DewfordTown_Gym_Text_1FCE48: @ 81FCE48
+DewfordTown_Gym_Text_BrendenPreBattle: @ 81FCE48
 	.string "I'll show you the gumption of\n"
 	.string "a sailing man!$"
 
-DewfordTown_Gym_Text_1FCE75: @ 81FCE75
+DewfordTown_Gym_Text_BrendenDefeat: @ 81FCE75
 	.string "How'd this happen?\n"
 	.string "It's not like me to lose this way!$"
 
-DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB
+DewfordTown_Gym_Text_BrendenPostBattle: @ 81FCEAB
 	.string "Oh, aye! You're worthy of seeing\n"
 	.string "our GYM LEADER.$"
 
-DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC
+DewfordTown_Gym_Text_CristianPreBattle: @ 81FCEDC
 	.string "If you mean to pass, it has to be\n"
 	.string "through me!$"
 
-DewfordTown_Gym_Text_1FCF0A: @ 81FCF0A
+DewfordTown_Gym_Text_CristianDefeat: @ 81FCF0A
 	.string "Grrrrr!\n"
 	.string "Vastly overpowered!$"
 
-DewfordTown_Gym_Text_1FCF26: @ 81FCF26
+DewfordTown_Gym_Text_CristianPostBattle: @ 81FCF26
 	.string "You win!\n"
 	.string "Go after that BADGE!$"
 
-DewfordTown_Gym_Text_1FCF44: @ 81FCF44
+DewfordTown_Gym_Text_BrawlyPreBattle: @ 81FCF44
 	.string "I'm BRAWLY!\n"
 	.string "DEWFORD's GYM LEADER!\p"
 	.string "I've been churned in the rough waves\n"
@@ -415,18 +416,18 @@ DewfordTown_Gym_Text_1FCF44: @ 81FCF44
 	.string "So you wanted to challenge me?\n"
 	.string "Let me see what you're made of!$"
 
-DewfordTown_Gym_Text_1FD008: @ 81FD008
+DewfordTown_Gym_Text_BrawlyDefeat: @ 81FD008
 	.string "Whoah, wow! You made a much bigger\n"
 	.string "splash than I expected!\p"
 	.string "You swamped me!\p"
 	.string "Okay, you've got me.\n"
 	.string "Take this GYM BADGE!$"
 
-DewfordTown_Gym_Text_1FD07D: @ 81FD07D
+DewfordTown_Gym_Text_ReceivedKnuckleBadge: @ 81FD07D
 	.string "{PLAYER} received the KNUCKLE BADGE\n"
 	.string "from BRAWLY.$"
 
-DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8
+DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis: @ 81FD0A8
 	.string "The KNUCKLE BADGE makes all POKéMON\n"
 	.string "up to Level 30, even those you get in\l"
 	.string "trades, obey without question.\p"
@@ -435,30 +436,30 @@ DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8
 	.string "If you'd like, use this TECHNICAL\n"
 	.string "MACHINE, too.$"
 
-DewfordTown_Gym_Text_1FD181: @ 81FD181
+DewfordTown_Gym_Text_ExplainBulkUp: @ 81FD181
 	.string "That TM08 contains BULK UP.\p"
 	.string "It's a move that raises both ATTACK\n"
 	.string "and DEFENSE stats.\p"
 	.string "… … … … … …$"
 
-DewfordTown_Gym_Text_1FD1E0: @ 81FD1E0
+DewfordTown_Gym_Text_RegisteredBrawly: @ 81FD1E0
 	.string "Registered GYM LEADER BRAWLY\n"
 	.string "in the POKéNAV.$"
 
-DewfordTown_Gym_Text_1FD20D: @ 81FD20D
+DewfordTown_Gym_Text_BrawlyPostBattle: @ 81FD20D
 	.string "I can see your talent becoming a giant\n"
 	.string "wave to cause a storm of astonishment\l"
 	.string "among TRAINERS one day!$"
 
-DewfordTown_Gym_Text_1FD272: @ 81FD272
+DewfordTown_Gym_Text_GymStatue: @ 81FD272
 	.string "DEWFORD TOWN POKéMON GYM$"
 
-DewfordTown_Gym_Text_1FD28B: @ 81FD28B
+DewfordTown_Gym_Text_GymStatueCertified: @ 81FD28B
 	.string "DEWFORD TOWN POKéMON GYM\p"
 	.string "BRAWLY'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4
+DewfordTown_Gym_Text_BrawlyPreRematch: @ 81FD2C4
 	.string "BRAWLY: A wave may draw back, but it\n"
 	.string "always returns to the shore.\p"
 	.string "A giant wave of a talent like you…\n"
@@ -466,16 +467,16 @@ DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4
 	.string "Show me how much higher\n"
 	.string "you've gone!$"
 
-DewfordTown_Gym_Text_1FD367: @ 81FD367
+DewfordTown_Gym_Text_BrawlyRematchDefeat: @ 81FD367
 	.string "Wow!\n"
 	.string "Swamped again!$"
 
-DewfordTown_Gym_Text_1FD37B: @ 81FD37B
+DewfordTown_Gym_Text_BrawlyPostRematch: @ 81FD37B
 	.string "BRAWLY: Battling is vast and it's deep.\n"
 	.string "You can't see the bottom.\l"
 	.string "It's just like the sea of HOENN!$"
 
-DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE
+DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons: @ 81FD3DE
 	.string "BRAWLY: A wave may draw back, but it\n"
 	.string "always returns to the shore.\p"
 	.string "A giant wave of a talent like you…\n"

data/maps/LavaridgeTown_Gym_1F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Flannery",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Cole",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE900",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Gerald",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Axle",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5",
+      "script": "LavaridgeTown_Gym_1F_EventScript_Danielle",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C",
+      "script": "LavaridgeTown_Gym_1F_EventScript_GymGuide",
       "flag": "0"
     }
   ],
@@ -285,7 +285,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B"
+      "script": "LavaridgeTown_Gym_1F_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -293,7 +293,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B"
+      "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/LavaridgeTown_Gym_1F/scripts.inc

@@ -3,91 +3,92 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
 	.byte 0
 
 LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA
-	call LavaridgeTown_Gym_1F_EventScript_1FE705
-	call LavaridgeTown_Gym_1F_EventScript_1FE757
+	call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
+	call LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE705:: @ 81FE705
+@ Unclear where/if these temp vars are getting checked
+LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705
 	setvar VAR_TEMP_B, 0
 	setvar VAR_TEMP_C, 0
 	setvar VAR_TEMP_D, 0
 	setvar VAR_TEMP_E, 0
 	setvar VAR_TEMP_F, 0
 	checktrainerflag TRAINER_COLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE72C
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar
 	setvar VAR_TEMP_B, 1
 
-LavaridgeTown_Gym_1F_EventScript_1FE72C:: @ 81FE72C
+LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C
 	checktrainerflag TRAINER_GERALD
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE73A
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar
 	setvar VAR_TEMP_C, 1
 
-LavaridgeTown_Gym_1F_EventScript_1FE73A:: @ 81FE73A
+LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A
 	checktrainerflag TRAINER_AXLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE748
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar
 	setvar VAR_TEMP_D, 1
 
-LavaridgeTown_Gym_1F_EventScript_1FE748:: @ 81FE748
+LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748
 	checktrainerflag TRAINER_DANIELLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE756
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_E, 1
 
-LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756
+LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756
 	return
 
-LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757
+LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757
 	checktrainerflag TRAINER_COLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald
 	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764
+LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764
 	checktrainerflag TRAINER_GERALD
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle
 	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771
+LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771
 	checktrainerflag TRAINER_AXLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle
 	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E
+LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E
 	checktrainerflag TRAINER_DANIELLE
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers
 	setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B
+LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B
 	return
 
-LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
-	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC
+LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C
+	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreBattle, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864
-	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1FE81D
-	msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT
+	goto_if_eq LavaridgeTown_Gym_1F_EventScript_FlanneryRematch
+	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_GiveOverheat2
+	msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
-	message LavaridgeTown_Gym_1F_Text_1FF32F
+LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
+	message LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis, MSGBOX_DEFAULT
 	setflag FLAG_FLANNERY_GIVES_BADGE_INFO
 	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag FLAG_BADGE04_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq LavaridgeTown_Gym_1F_EventScript_271E84
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 4
 	call Common_EventScript_SetGymTrainers
 	setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
 	setvar VAR_LAVARIDGE_TOWN_STATE, 1
-	call LavaridgeTown_Gym_1F_EventScript_1FE841
+	call LavaridgeTown_Gym_1F_EventScript_GiveOverheat
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_RegisteredFlannery, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -95,113 +96,112 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
+LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
+LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841
 	giveitem_std ITEM_TM50
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
-	msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
+	msgbox LavaridgeTown_Gym_1F_Text_ExplainOverheat, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	return
 
-LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864
-	trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E
-	msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864
+	trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreRematch, LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat, LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons
+	msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_ColePreBattle, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A
-LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A
-	call LavaridgeTown_Gym_1F_EventScript_1FE705
+LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A
+	call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
 	release
 	special ShouldTryGetTrainerScript
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_GotoTrainerScript
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_AxlePreBattle, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_KeeganPreBattle, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_DaniellePreBattle, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_GeraldPreBattle, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_JacePreBattle, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_JeffPreBattle, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A
-	msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE
+LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_EliPreBattle, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
+	msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C
+LavaridgeTown_Gym_1F_EventScript_GymGuide:: @ 81FE96C
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_1FE981
-	msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory
+	msgbox LavaridgeTown_Gym_1F_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981
-	msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT
+LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory:: @ 81FE981
+	msgbox LavaridgeTown_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE98B:: @ 81FE98B
+LavaridgeTown_Gym_1F_EventScript_LeftGymStatue:: @ 81FE98B
 	lockall
-	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB
-	goto LavaridgeTown_Gym_1F_EventScript_1FE9B5
+	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified
+	goto LavaridgeTown_Gym_1F_EventScript_GymStatue
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B
+LavaridgeTown_Gym_1F_EventScript_RightGymStatue:: @ 81FE99B
 	lockall
-	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_1FE9AB
-	goto LavaridgeTown_Gym_1F_EventScript_1FE9B5
+	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified
+	goto LavaridgeTown_Gym_1F_EventScript_GymStatue
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB
-	msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT
+LavaridgeTown_Gym_1F_EventScript_GymStatueCertified:: @ 81FE9AB
+	msgbox LavaridgeTown_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5
-	msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT
+LavaridgeTown_Gym_1F_EventScript_GymStatue:: @ 81FE9B5
+	msgbox LavaridgeTown_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF
+LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "LAVARIDGE's GYM LEADER FLANNERY\n"
@@ -212,35 +212,35 @@ LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF
 	.string "Hose her down with water and then\l"
 	.string "go for it!$"
 
-LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8
+LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8
 	.string "Yow! That was a scorching-hot battle!$"
 
-LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE
+LavaridgeTown_Gym_1F_Text_ColePreBattle: @ 81FEADE
 	.string "Owowowowow!\n"
 	.string "Yikes, it's hot!$"
 
-LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB
+LavaridgeTown_Gym_1F_Text_ColeDefeat: @ 81FEAFB
 	.string "I'm blinded by sweat in my eyes…$"
 
-LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C
+LavaridgeTown_Gym_1F_Text_ColePostBattle: @ 81FEB1C
 	.string "Being buried in hot sand promotes\n"
 	.string "circulation.\p"
 	.string "It's effective for healing pain in\n"
 	.string "your joints.$"
 
-LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B
+LavaridgeTown_Gym_1F_Text_AxlePreBattle: @ 81FEB7B
 	.string "I'm trying to relieve my stress.\n"
 	.string "Don't come along and stress me out!$"
 
-LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0
+LavaridgeTown_Gym_1F_Text_AxleDefeat: @ 81FEBC0
 	.string "I hope FLANNERY flames you good!$"
 
-LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1
+LavaridgeTown_Gym_1F_Text_AxlePostBattle: @ 81FEBE1
 	.string "Haaah… Whew…\p"
 	.string "If you spend too much time buried in\n"
 	.string "hot sand, it tuckers you out…$"
 
-LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31
+LavaridgeTown_Gym_B1F_Text_KeeganPreBattle: @ 81FEC31
 	.string "You must be getting tired by now.\n"
 	.string "You'd like to rest in the hot sand,\l"
 	.string "wouldn't you?\p"
@@ -248,78 +248,78 @@ LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31
 	.string "your willpower is an important ability\l"
 	.string "for all TRAINERS.$"
 
-LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3
+LavaridgeTown_Gym_B1F_Text_KeeganDefeat: @ 81FECE3
 	.string "Play with fire, and be burned…$"
 
-LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02
+LavaridgeTown_Gym_B1F_Text_KeeganPostBattle: @ 81FED02
 	.string "Your skill is real…\n"
 	.string "But our LEADER FLANNERY is strong.\p"
 	.string "If you don't watch yourself, you'll be\n"
 	.string "burned seriously.$"
 
-LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72
+LavaridgeTown_Gym_1F_Text_GeraldPreBattle: @ 81FED72
 	.string "Can your POKéMON withstand\n"
 	.string "392-degree heat?$"
 
-LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E
+LavaridgeTown_Gym_1F_Text_GeraldDefeat: @ 81FED9E
 	.string "It didn't burn hotly enough…$"
 
-LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB
+LavaridgeTown_Gym_1F_Text_GeraldPostBattle: @ 81FEDBB
 	.string "The temperature of magma is\n"
 	.string "392 degrees.\p"
 	.string "Your POKéMON beat me, so they should\n"
 	.string "easily survive in magma.$"
 
-LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22
+LavaridgeTown_Gym_1F_Text_DaniellePreBattle: @ 81FEE22
 	.string "Um…\n"
 	.string "Okay, I'll battle with you.$"
 
-LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42
+LavaridgeTown_Gym_1F_Text_DanielleDefeat: @ 81FEE42
 	.string "Oh, but you're too strong.$"
 
-LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D
+LavaridgeTown_Gym_1F_Text_DaniellePostBattle: @ 81FEE5D
 	.string "I'm going to be a pretty and strong\n"
 	.string "TRAINER just like FLANNERY.$"
 
-LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D
+LavaridgeTown_Gym_B1F_Text_JacePreBattle: @ 81FEE9D
 	.string "Come on, get with it!\n"
 	.string "Let's go before my feelings cool!$"
 
-LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5
+LavaridgeTown_Gym_B1F_Text_JaceDefeat: @ 81FEED5
 	.string "It's so hot, and yet my heart is\n"
 	.string "clutched by ice…$"
 
-LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07
+LavaridgeTown_Gym_B1F_Text_JacePostBattle: @ 81FEF07
 	.string "The way the battling spirit burns\n"
 	.string "within you, you may stand a chance\l"
 	.string "against our LEADER.$"
 
-LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60
+LavaridgeTown_Gym_B1F_Text_JeffPreBattle: @ 81FEF60
 	.string "See how the flames blaze wildly?\n"
 	.string "They flare in anticipation of my win!$"
 
-LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7
+LavaridgeTown_Gym_B1F_Text_JeffDefeat: @ 81FEFA7
 	.string "Something didn't go right.$"
 
-LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2
+LavaridgeTown_Gym_B1F_Text_JeffPostBattle: @ 81FEFC2
 	.string "Well, so what? I say so what?\n"
 	.string "I can walk on hot coals barefoot!\p"
 	.string "…Don't even think about trying it!$"
 
-LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025
+LavaridgeTown_Gym_B1F_Text_EliPreBattle: @ 81FF025
 	.string "As much as I love mountains,\n"
 	.string "I especially love volcanoes.$"
 
-LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F
+LavaridgeTown_Gym_B1F_Text_EliDefeat: @ 81FF05F
 	.string "Well, it seems to me I lost without\n"
 	.string "ever being in control.$"
 
-LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A
+LavaridgeTown_Gym_B1F_Text_EliPostBattle: @ 81FF09A
 	.string "I stay here because I became a fan\n"
 	.string "of FLANNERY's power.\p"
 	.string "Hehehehe.$"
 
-LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC
+LavaridgeTown_Gym_1F_Text_FlanneryPreBattle: @ 81FF0DC
 	.string "Welcome… No, wait.\p"
 	.string "Puny TRAINER, how good to see you've\n"
 	.string "made it here!\p"
@@ -334,7 +334,7 @@ LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC
 	.string "father, I shall, uh…demonstrate the\l"
 	.string "hot moves we have honed on this land!$"
 
-LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233
+LavaridgeTown_Gym_1F_Text_FlanneryDefeat: @ 81FF233
 	.string "Oh…\n"
 	.string "I guess I was trying too hard…\p"
 	.string "I… I've only recently become\n"
@@ -346,11 +346,11 @@ LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233
 	.string "Thanks for teaching me that.\n"
 	.string "For that, you deserve this.$"
 
-LavaridgeTown_Gym_1F_Text_1FF32F: @ 81FF32F
+LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge: @ 81FF32F
 	.string "{PLAYER} received the HEAT BADGE\n"
 	.string "from FLANNERY.$"
 
-LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359
+LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis: @ 81FF359
 	.string "If you have a HEAT BADGE, all POKéMON\n"
 	.string "up to Level 50, even those you get in\l"
 	.string "trades from other people, will obey\l"
@@ -360,7 +360,7 @@ LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359
 	.string "This is a token of my appreciation.\n"
 	.string "Don't be shy about taking it!$"
 
-LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C
+LavaridgeTown_Gym_1F_Text_ExplainOverheat: @ 81FF45C
 	.string "That TM50 contains OVERHEAT.\p"
 	.string "That move inflicts serious damage on\n"
 	.string "the opponent.\p"
@@ -368,24 +368,24 @@ LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C
 	.string "of the POKéMON using it. It might not\l"
 	.string "be suitable for longer battles.$"
 
-LavaridgeTown_Gym_1F_Text_1FF517: @ 81FF517
+LavaridgeTown_Gym_1F_Text_RegisteredFlannery: @ 81FF517
 	.string "Registered GYM LEADER FLANNERY\n"
 	.string "in the POKéNAV.$"
 
-LavaridgeTown_Gym_1F_Text_1FF546: @ 81FF546
+LavaridgeTown_Gym_1F_Text_FlanneryPostBattle: @ 81FF546
 	.string "Your power reminds me of someone…\p"
 	.string "Oh! I know! You battle like NORMAN,\n"
 	.string "the GYM LEADER of PETALBURG.$"
 
-LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9
+LavaridgeTown_Gym_1F_Text_GymStatue: @ 81FF5A9
 	.string "LAVARIDGE TOWN POKéMON GYM$"
 
-LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4
+LavaridgeTown_Gym_1F_Text_GymStatueCertified: @ 81FF5C4
 	.string "LAVARIDGE TOWN POKéMON GYM\p"
 	.string "FLANNERY'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601
+LavaridgeTown_Gym_1F_Text_FlanneryPreRematch: @ 81FF601
 	.string "FLANNERY: Losing a battle isn't going\n"
 	.string "to deflate me.\p"
 	.string "I love POKéMON.\n"
@@ -394,11 +394,11 @@ LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601
 	.string "Let's exchange superhot moves\n"
 	.string "in another battle!$"
 
-LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F
+LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat: @ 81FF69F
 	.string "Whew!\n"
 	.string "On the verge of eruption!$"
 
-LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF
+LavaridgeTown_Gym_1F_Text_FlanneryPostRematch: @ 81FF6BF
 	.string "FLANNERY: I lost the match,\n"
 	.string "but I'm completely satisfied.\p"
 	.string "It's not often I get to enjoy a battle\n"
@@ -406,7 +406,7 @@ LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF
 	.string "Let's have another one like this\n"
 	.string "again sometime!$"
 
-LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E
+LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons: @ 81FF75E
 	.string "FLANNERY: Losing a battle isn't going\n"
 	.string "to deflate me.\p"
 	.string "I love POKéMON.\n"

data/maps/LavaridgeTown_Gym_B1F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Jace",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Keegan",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Jeff",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951",
+      "script": "LavaridgeTown_Gym_B1F_EventScript_Eli",
       "flag": "0"
     }
   ],

data/maps/LavaridgeTown_Gym_B1F/scripts.inc

@@ -3,57 +3,58 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E
 	.byte 0
 
 LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884
-	call LavaridgeTown_Gym_B1F_EventScript_1FF88F
-	call LavaridgeTown_Gym_B1F_EventScript_1FF8DC
+	call LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars
+	call LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_1FF88F:: @ 81FF88F
+@ Unclear where/if these temp vars are getting checked
+LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F
 	setvar VAR_TEMP_7, 0
 	setvar VAR_TEMP_8, 0
 	setvar VAR_TEMP_9, 0
 	setvar VAR_TEMP_A, 0
 	checktrainerflag TRAINER_KEEGAN
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8B1
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
 	setvar VAR_TEMP_7, 1
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8B1:: @ 81FF8B1
+LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1
 	checktrainerflag TRAINER_JACE
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8BF
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
 	setvar VAR_TEMP_8, 1
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8BF:: @ 81FF8BF
+LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF
 	checktrainerflag TRAINER_JEFF
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8CD
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
 	setvar VAR_TEMP_9, 1
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8CD:: @ 81FF8CD
+LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD
 	checktrainerflag TRAINER_ELI
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8DB
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_A, 1
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB
+LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB
 	return
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC
+LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC
 	checktrainerflag TRAINER_KEEGAN
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
 	setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9
+LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9
 	checktrainerflag TRAINER_JACE
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
 	setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6
+LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6
 	checktrainerflag TRAINER_JEFF
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
 	setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903
+LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903
 	checktrainerflag TRAINER_ELI
-	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910
+	goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
 	setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
 
-LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910
+LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910
 	return
 

data/maps/MauvilleCity_Gym/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Gym_EventScript_20DEEB",
+      "script": "MauvilleCity_Gym_EventScript_Wattson",
       "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MauvilleCity_Gym_EventScript_20E0D0",
+      "script": "MauvilleCity_Gym_EventScript_Shawn",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MauvilleCity_Gym_EventScript_20E0FE",
+      "script": "MauvilleCity_Gym_EventScript_Vivian",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MauvilleCity_Gym_EventScript_20E0E7",
+      "script": "MauvilleCity_Gym_EventScript_Ben",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MauvilleCity_Gym_EventScript_20E0B9",
+      "script": "MauvilleCity_Gym_EventScript_Kirk",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MauvilleCity_Gym_EventScript_20E12C",
+      "script": "MauvilleCity_Gym_EventScript_GymGuide",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MauvilleCity_Gym_EventScript_20E115",
+      "script": "MauvilleCity_Gym_EventScript_Angelo",
       "flag": "0"
     }
   ],
@@ -130,7 +130,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "MauvilleCity_Gym_EventScript_20E01E"
+      "script": "MauvilleCity_Gym_EventScript_Switch2"
     },
     {
       "type": "trigger",
@@ -139,7 +139,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "MauvilleCity_Gym_EventScript_20E043"
+      "script": "MauvilleCity_Gym_EventScript_Switch3"
     },
     {
       "type": "trigger",
@@ -148,7 +148,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "MauvilleCity_Gym_EventScript_20DFF9"
+      "script": "MauvilleCity_Gym_EventScript_Switch1"
     },
     {
       "type": "trigger",
@@ -157,7 +157,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "MauvilleCity_Gym_EventScript_20E068"
+      "script": "MauvilleCity_Gym_EventScript_Switch4"
     }
   ],
   "bg_events": [
@@ -167,7 +167,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_Gym_EventScript_20E14B"
+      "script": "MauvilleCity_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -175,7 +175,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_Gym_EventScript_20E15B"
+      "script": "MauvilleCity_Gym_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/MauvilleCity_Gym/scripts.inc

@@ -1,22 +1,22 @@
 MauvilleCity_Gym_MapScripts:: @ 820DD6E
-	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_20DD74
+	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_OnLoad
 	.byte 0
 
-MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74
-	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7
+MauvilleCity_Gym_OnLoad: @ 820DD74
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_DeactivatePuzzle
 	switch VAR_MAUVILLE_GYM_STATE
-	case 0, MauvilleCity_Gym_EventScript_20DDBA
-	case 1, MauvilleCity_Gym_EventScript_20DEAF
-	case 2, MauvilleCity_Gym_EventScript_20DEBD
-	case 3, MauvilleCity_Gym_EventScript_20DECB
-	case 4, MauvilleCity_Gym_EventScript_20DED9
+	case 0, MauvilleCity_Gym_EventScript_UpdateBarriers
+	case 1, MauvilleCity_Gym_EventScript_Switch1Pressed
+	case 2, MauvilleCity_Gym_EventScript_Switch2Pressed
+	case 3, MauvilleCity_Gym_EventScript_Switch3Pressed
+	case 4, MauvilleCity_Gym_EventScript_Switch4Pressed
 	end
 
-MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA
-	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20DDC4
+MauvilleCity_Gym_EventScript_UpdateBarriers:: @ 820DDBA
+	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetAltBarriers
 	end
 
-MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
+MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 820DDC4
 	setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1
 	setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1
 	setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1
@@ -45,68 +45,68 @@ MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
 	setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0
 	end
 
-MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF
+MauvilleCity_Gym_EventScript_Switch1Pressed:: @ 820DEAF
 	setvar VAR_0x8004, 0
-	special MauvilleGymSpecial1
-	goto MauvilleCity_Gym_EventScript_20DDBA
+	special MauvilleGymPressSwitch
+	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_20DEBD:: @ 820DEBD
+MauvilleCity_Gym_EventScript_Switch2Pressed:: @ 820DEBD
 	setvar VAR_0x8004, 1
-	special MauvilleGymSpecial1
-	goto MauvilleCity_Gym_EventScript_20DDBA
+	special MauvilleGymPressSwitch
+	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_20DECB:: @ 820DECB
+MauvilleCity_Gym_EventScript_Switch3Pressed:: @ 820DECB
 	setvar VAR_0x8004, 2
-	special MauvilleGymSpecial1
-	goto MauvilleCity_Gym_EventScript_20DDBA
+	special MauvilleGymPressSwitch
+	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_20DED9:: @ 820DED9
+MauvilleCity_Gym_EventScript_Switch4Pressed:: @ 820DED9
 	setvar VAR_0x8004, 3
-	special MauvilleGymSpecial1
-	goto MauvilleCity_Gym_EventScript_20DDBA
+	special MauvilleGymPressSwitch
+	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7
-	special MauvilleGymSpecial3
+MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 820DEE7
+	special MauvilleGymDeactivatePuzzle
 	end
 
-MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
-	trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC
+MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
+	trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreBattle, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_Gym_EventScript_20DFDE
-	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_Gym_EventScript_WattsonRematch
+	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_GiveShockWave2
 	compare VAR_NEW_MAUVILLE_STATE, 2
-	goto_if_eq MauvilleCity_Gym_EventScript_20DFD4
-	msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT
+	goto_if_eq MauvilleCity_Gym_EventScript_CompletedNewMauville
+	msgbox MauvilleCity_Gym_Text_WattsonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
-	message MauvilleCity_Gym_Text_20E77F
+MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
+	message MauvilleCity_Gym_Text_ReceivedDynamoBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
 	setflag FLAG_DEFEATED_MAUVILLE_GYM
 	setflag FLAG_BADGE03_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq MauvilleCity_Gym_EventScript_271E84
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 3
 	call Common_EventScript_SetGymTrainers
-	special MauvilleGymSpecial3
+	special MauvilleGymDeactivatePuzzle
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
-	call MauvilleCity_Gym_EventScript_20DFB1
+	call MauvilleCity_Gym_EventScript_GiveShockWave
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox MauvilleCity_Gym_Text_20E8B5, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Gym_Text_RegisteredWattson, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -114,158 +114,158 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B
 	release
 	end
 
-MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D
+MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
 	giveitem_std ITEM_TM34
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	release
 	end
 
-MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1
+MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
 	giveitem_std ITEM_TM34
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
-	msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Gym_Text_ExplainShockWave, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	return
 
-MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4
-	msgbox MauvilleCity_Gym_Text_20E925, MSGBOX_DEFAULT
+MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4
+	msgbox MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE
-	trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD
+MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE
+	trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons
 	msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9
+MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
 	lockall
-	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 1
-	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing
 	setvar VAR_MAUVILLE_GYM_STATE, 1
 	setvar VAR_0x8004, 0
-	goto MauvilleCity_Gym_EventScript_20E08D
+	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E
+MauvilleCity_Gym_EventScript_Switch2:: @ 820E01E
 	lockall
-	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 2
-	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing
 	setvar VAR_MAUVILLE_GYM_STATE, 2
 	setvar VAR_0x8004, 1
-	goto MauvilleCity_Gym_EventScript_20E08D
+	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_20E043:: @ 820E043
+MauvilleCity_Gym_EventScript_Switch3:: @ 820E043
 	lockall
-	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 3
-	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing
 	setvar VAR_MAUVILLE_GYM_STATE, 3
 	setvar VAR_0x8004, 2
-	goto MauvilleCity_Gym_EventScript_20E08D
+	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_20E068:: @ 820E068
+MauvilleCity_Gym_EventScript_Switch4:: @ 820E068
 	lockall
-	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 4
-	goto_if_eq MauvilleCity_Gym_EventScript_20E0AD
+	goto_if_eq MauvilleCity_Gym_EventScript_SwitchDoNothing
 	setvar VAR_MAUVILLE_GYM_STATE, 4
 	setvar VAR_0x8004, 3
-	goto MauvilleCity_Gym_EventScript_20E08D
+	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D
-	special MauvilleGymSpecial2
-	special MauvilleGymSpecial1
+MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D
+	special MauvilleGymSetDefaultBarriers
+	special MauvilleGymPressSwitch
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
-	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0B4
-	goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0AF
+	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_ClearBarriersAltState
+	goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetBarriersAltState
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_20E0AD:: @ 820E0AD
+MauvilleCity_Gym_EventScript_SwitchDoNothing:: @ 820E0AD
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_20E0AF:: @ 820E0AF
+MauvilleCity_Gym_EventScript_SetBarriersAltState:: @ 820E0AF
 	setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4
+MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 820E0B4
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9
-	trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC
-	msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE
+MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9
+	trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkPreBattle, MauvilleCity_Gym_Text_KirkDefeat
+	msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0
-	trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7
-	msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE
+MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0
+	trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnPreBattle, MauvilleCity_Gym_Text_ShawnDefeat
+	msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7
-	trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469
-	msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE
+MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7
+	trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenPreBattle, MauvilleCity_Gym_Text_BenDefeat
+	msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE
-	trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4
-	msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE
+MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE
+	trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianPreBattle, MauvilleCity_Gym_Text_VivianDefeat
+	msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_20E115:: @ 820E115
-	trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8
-	msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE
+MauvilleCity_Gym_EventScript_Angelo:: @ 820E115
+	trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloPreBattle, MauvilleCity_Gym_Text_AngeloDefeat
+	msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C
+MauvilleCity_Gym_EventScript_GymGuide:: @ 820E12C
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E141
-	msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_GymGuidePostVictory
+	msgbox MauvilleCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_Gym_EventScript_20E141:: @ 820E141
-	msgbox MauvilleCity_Gym_Text_20E283, MSGBOX_DEFAULT
+MauvilleCity_Gym_EventScript_GymGuidePostVictory:: @ 820E141
+	msgbox MauvilleCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_Gym_EventScript_20E14B:: @ 820E14B
+MauvilleCity_Gym_EventScript_LeftGymStatue:: @ 820E14B
 	lockall
-	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B
-	goto MauvilleCity_Gym_EventScript_20E175
+	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified
+	goto MauvilleCity_Gym_EventScript_GymStatue
 	end
 
-MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B
+MauvilleCity_Gym_EventScript_RightGymStatue:: @ 820E15B
 	lockall
-	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_20E16B
-	goto MauvilleCity_Gym_EventScript_20E175
+	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified
+	goto MauvilleCity_Gym_EventScript_GymStatue
 	end
 
-MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B
-	msgbox MauvilleCity_Gym_Text_20E96C, MSGBOX_DEFAULT
+MauvilleCity_Gym_EventScript_GymStatueCertified:: @ 820E16B
+	msgbox MauvilleCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_20E175:: @ 820E175
-	msgbox MauvilleCity_Gym_Text_20E952, MSGBOX_DEFAULT
+MauvilleCity_Gym_EventScript_GymStatue:: @ 820E175
+	msgbox MauvilleCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MauvilleCity_Gym_Text_20E17F: @ 820E17F
+MauvilleCity_Gym_Text_GymGuideAdvice: @ 820E17F
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "WATTSON, the LEADER of MAUVILLE\n"
@@ -276,72 +276,72 @@ MauvilleCity_Gym_Text_20E17F: @ 820E17F
 	.string "doors all over his GYM! Eccentric!\p"
 	.string "Hey, go for it!$"
 
-MauvilleCity_Gym_Text_20E283: @ 820E283
+MauvilleCity_Gym_Text_GymGuidePostVictory: @ 820E283
 	.string "Whoa, you're electrifying!\n"
 	.string "You've powered the door open!$"
 
-MauvilleCity_Gym_Text_20E2BC: @ 820E2BC
+MauvilleCity_Gym_Text_KirkPreBattle: @ 820E2BC
 	.string "My electric soul, it'll shatter your\n"
 	.string "dreams whole, whoa-yeahah!$"
 
-MauvilleCity_Gym_Text_20E2FC: @ 820E2FC
+MauvilleCity_Gym_Text_KirkDefeat: @ 820E2FC
 	.string "That was plugged in, amped up,\n"
 	.string "over-driven electric, man!$"
 
-MauvilleCity_Gym_Text_20E336: @ 820E336
+MauvilleCity_Gym_Text_KirkPostBattle: @ 820E336
 	.string "POKéMON and rock, it's all about heart,\n"
 	.string "whoa-yeah!$"
 
-MauvilleCity_Gym_Text_20E369: @ 820E369
+MauvilleCity_Gym_Text_ShawnPreBattle: @ 820E369
 	.string "I trained under WATTSON!\n"
 	.string "There ain't no way I'll lose easily!$"
 
-MauvilleCity_Gym_Text_20E3A7: @ 820E3A7
+MauvilleCity_Gym_Text_ShawnDefeat: @ 820E3A7
 	.string "Unplugged and turned off…$"
 
-MauvilleCity_Gym_Text_20E3C1: @ 820E3C1
+MauvilleCity_Gym_Text_ShawnPostBattle: @ 820E3C1
 	.string "WATTSON, our GYM LEADER, has been\n"
 	.string "around for a long, long time.\p"
 	.string "He was battling even before your\n"
 	.string "daddy was born, that tough coot.$"
 
-MauvilleCity_Gym_Text_20E443: @ 820E443
+MauvilleCity_Gym_Text_BenPreBattle: @ 820E443
 	.string "This GYM's got puzzles!\n"
 	.string "Isn't it fun?$"
 
-MauvilleCity_Gym_Text_20E469: @ 820E469
+MauvilleCity_Gym_Text_BenDefeat: @ 820E469
 	.string "It's no fun to lose…$"
 
-MauvilleCity_Gym_Text_20E47E: @ 820E47E
+MauvilleCity_Gym_Text_BenPostBattle: @ 820E47E
 	.string "WATTSON says he likes setting up\n"
 	.string "little traps with switches.$"
 
-MauvilleCity_Gym_Text_20E4BB: @ 820E4BB
+MauvilleCity_Gym_Text_VivianPreBattle: @ 820E4BB
 	.string "With my charm and my POKéMON's moves,\n"
 	.string "you'll be shocked!$"
 
-MauvilleCity_Gym_Text_20E4F4: @ 820E4F4
+MauvilleCity_Gym_Text_VivianDefeat: @ 820E4F4
 	.string "I'm shocked by your power!$"
 
-MauvilleCity_Gym_Text_20E50F: @ 820E50F
+MauvilleCity_Gym_Text_VivianPostBattle: @ 820E50F
 	.string "I've heard that MAUVILLE was founded\n"
 	.string "by WATTSON.\p"
 	.string "He was a TRAINER long before we\n"
 	.string "became TRAINERS.\l"
 	.string "He must know all sorts of things!$"
 
-MauvilleCity_Gym_Text_20E593: @ 820E593
+MauvilleCity_Gym_Text_AngeloPreBattle: @ 820E593
 	.string "I love shiny things!$"
 
-MauvilleCity_Gym_Text_20E5A8: @ 820E5A8
+MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8
 	.string "Oh…\n"
 	.string "My eyes are frazzled…$"
 
-MauvilleCity_Gym_Text_20E5C2: @ 820E5C2
+MauvilleCity_Gym_Text_AngeloPostBattle: @ 820E5C2
 	.string "MAUVILLE GYM's WATTSON has a shiny\n"
 	.string "forehead. It makes me happy!$"
 
-MauvilleCity_Gym_Text_20E602: @ 820E602
+MauvilleCity_Gym_Text_WattsonPreBattle: @ 820E602
 	.string "I've given up on my plans to convert\n"
 	.string "the city, I have.\p"
 	.string "And so, I put my time into making\n"
@@ -354,17 +354,17 @@ MauvilleCity_Gym_Text_20E602: @ 820E602
 	.string "Then, I, WATTSON, the LEADER of\n"
 	.string "MAUVILLE GYM, shall electrify you!$"
 
-MauvilleCity_Gym_Text_20E734: @ 820E734
+MauvilleCity_Gym_Text_WattsonDefeat: @ 820E734
 	.string "Wahahahah!\n"
 	.string "Fine, I lost!\p"
 	.string "You ended up giving me a thrill!\n"
 	.string "Take this BADGE!$"
 
-MauvilleCity_Gym_Text_20E77F: @ 820E77F
+MauvilleCity_Gym_Text_ReceivedDynamoBadge: @ 820E77F
 	.string "{PLAYER} received the DYNAMO BADGE\n"
 	.string "from WATTSON.$"
 
-MauvilleCity_Gym_Text_20E7AA: @ 820E7AA
+MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis: @ 820E7AA
 	.string "With the DYNAMO BADGE, POKéMON can\n"
 	.string "use ROCK SMASH out of battle.\p"
 	.string "And, it will make your POKéMON a little\n"
@@ -372,33 +372,33 @@ MauvilleCity_Gym_Text_20E7AA: @ 820E7AA
 	.string "Hmm…\n"
 	.string "You should take this, too!$"
 
-MauvilleCity_Gym_Text_20E844: @ 820E844
+MauvilleCity_Gym_Text_ExplainShockWave: @ 820E844
 	.string "That TM34 there contains SHOCK WAVE.\p"
 	.string "It's a trustworthy move that never\n"
 	.string "misses! You can count on it!\p"
 	.string "… … … … … …$"
 
-MauvilleCity_Gym_Text_20E8B5: @ 820E8B5
+MauvilleCity_Gym_Text_RegisteredWattson: @ 820E8B5
 	.string "Registered GYM LEADER WATTSON\n"
 	.string "in the POKéNAV.$"
 
-MauvilleCity_Gym_Text_20E8E3: @ 820E8E3
+MauvilleCity_Gym_Text_WattsonPostBattle: @ 820E8E3
 	.string "I swell with optimism, seeing a promising\n"
 	.string "young TRAINER like you!$"
 
-MauvilleCity_Gym_Text_20E925: @ 820E925
+MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor: @ 820E925
 	.string "Wahahahah!\n"
 	.string "Go forth and endeavor, youngster!$"
 
-MauvilleCity_Gym_Text_20E952: @ 820E952
+MauvilleCity_Gym_Text_GymStatue: @ 820E952
 	.string "MAUVILLE CITY POKéMON GYM$"
 
-MauvilleCity_Gym_Text_20E96C: @ 820E96C
+MauvilleCity_Gym_Text_GymStatueCertified: @ 820E96C
 	.string "MAUVILLE CITY POKéMON GYM\p"
 	.string "WATTSON'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-MauvilleCity_Gym_Text_20E9A7: @ 820E9A7
+MauvilleCity_Gym_Text_WattsonPreRematch: @ 820E9A7
 	.string "WATTSON: Ah-ha! Here at last!\n"
 	.string "I know what you want.\l"
 	.string "You want to battle my POKéMON!\p"
@@ -406,7 +406,7 @@ MauvilleCity_Gym_Text_20E9A7: @ 820E9A7
 	.string "I'll make sparks fly from you!\n"
 	.string "Don't say I didn't warn you!$"
 
-MauvilleCity_Gym_Text_20EA42: @ 820EA42
+MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42
 	.string "Oof…\n"
 	.string "Our batteries ran dry…$"
 
@@ -418,7 +418,7 @@ MauvilleCity_Gym_Text_20EA5E: @ 820EA5E
 	.string "So, come back again sometime,\n"
 	.string "won't you?$"
 
-MauvilleCity_Gym_Text_20EAFD: @ 820EAFD
+MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons: @ 820EAFD
 	.string "WATTSON: Ah-ha! Here at last!\n"
 	.string "I know what you want.\l"
 	.string "You want to battle my POKéMON!\p"

data/maps/RustboroCity_Gym/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Gym_EventScript_212F31",
+      "script": "RustboroCity_Gym_EventScript_Roxanne",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "RustboroCity_Gym_EventScript_212FE3",
+      "script": "RustboroCity_Gym_EventScript_Josh",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "RustboroCity_Gym_EventScript_212FFA",
+      "script": "RustboroCity_Gym_EventScript_Tommy",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RustboroCity_Gym_EventScript_213028",
+      "script": "RustboroCity_Gym_EventScript_GymGuide",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "RustboroCity_Gym_EventScript_213011",
+      "script": "RustboroCity_Gym_EventScript_Marc",
       "flag": "0"
     }
   ],
@@ -104,7 +104,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "RustboroCity_Gym_EventScript_213047"
+      "script": "RustboroCity_Gym_EventScript_LeftGymStatue"
     },
     {
       "type": "sign",
@@ -112,7 +112,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "RustboroCity_Gym_EventScript_213057"
+      "script": "RustboroCity_Gym_EventScript_RightGymStatue"
     }
   ]
 }

data/maps/RustboroCity_Gym/scripts.inc

@@ -1,21 +1,21 @@
 RustboroCity_Gym_MapScripts:: @ 8212F30
 	.byte 0
 
-RustboroCity_Gym_EventScript_212F31:: @ 8212F31
-	trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC
+RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31
+	trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreBattle, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_Gym_EventScript_212FC8
-	goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_212FA4
-	msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq RustboroCity_Gym_EventScript_RoxanneRematch
+	goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_GiveRockTomb
+	msgbox RustboroCity_Gym_Text_RoxannePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Gym_EventScript_212F66:: @ 8212F66
-	message RustboroCity_Gym_Text_2137EC
+RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66
+	message RustboroCity_Gym_Text_ReceivedStoneBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
-	msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT
+	msgbox RustboroCity_Gym_Text_StoneBadgeInfoTakeThis, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_RUSTBORO_GYM
 	setflag FLAG_BADGE01_GET
 	setvar VAR_RUSTBORO_CITY_STATE, 1
@@ -23,81 +23,81 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66
 	setvar VAR_0x8008, 1
 	call Common_EventScript_SetGymTrainers
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq RustboroCity_Gym_EventScript_271E84
-	goto RustboroCity_Gym_EventScript_212FA4
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
+	goto RustboroCity_Gym_EventScript_GiveRockTomb
 	end
 
-RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4
+RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4
 	giveitem_std ITEM_TM39
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM39
-	msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT
+	msgbox RustboroCity_Gym_Text_ExplainRockTomb, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8
-	trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93
-	msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE
+RustboroCity_Gym_EventScript_RoxanneRematch:: @ 8212FC8
+	trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreRematch, RustboroCity_Gym_Text_RoxanneRematchDefeat, RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons
+	msgbox RustboroCity_Gym_Text_RoxannePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3
-	trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D
-	msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE
+RustboroCity_Gym_EventScript_Josh:: @ 8212FE3
+	trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshPreBattle, RustboroCity_Gym_Text_JoshDefeat
+	msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA
-	trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6
-	msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE
+RustboroCity_Gym_EventScript_Tommy:: @ 8212FFA
+	trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyPreBattle, RustboroCity_Gym_Text_TommyDefeat
+	msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_213011:: @ 8213011
-	trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589
-	msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE
+RustboroCity_Gym_EventScript_Marc:: @ 8213011
+	trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_MarcPreBattle, RustboroCity_Gym_Text_MarcDefeat
+	msgbox RustboroCity_Gym_Text_MarcPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_213028:: @ 8213028
+RustboroCity_Gym_EventScript_GymGuide:: @ 8213028
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_21303D
-	msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_GymGuidePostVictory
+	msgbox RustboroCity_Gym_Text_GymGuideAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Gym_EventScript_21303D:: @ 821303D
-	msgbox RustboroCity_Gym_Text_2132E2, MSGBOX_DEFAULT
+RustboroCity_Gym_EventScript_GymGuidePostVictory:: @ 821303D
+	msgbox RustboroCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Gym_EventScript_213047:: @ 8213047
+RustboroCity_Gym_EventScript_LeftGymStatue:: @ 8213047
 	lockall
-	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067
-	goto RustboroCity_Gym_EventScript_213071
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified
+	goto RustboroCity_Gym_EventScript_GymStatue
 	end
 
-RustboroCity_Gym_EventScript_213057:: @ 8213057
+RustboroCity_Gym_EventScript_RightGymStatue:: @ 8213057
 	lockall
-	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_213067
-	goto RustboroCity_Gym_EventScript_213071
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified
+	goto RustboroCity_Gym_EventScript_GymStatue
 	end
 
-RustboroCity_Gym_EventScript_213067:: @ 8213067
-	msgbox RustboroCity_Gym_Text_213A3B, MSGBOX_DEFAULT
+RustboroCity_Gym_EventScript_GymStatueCertified:: @ 8213067
+	msgbox RustboroCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_Gym_EventScript_213071:: @ 8213071
-	msgbox RustboroCity_Gym_Text_213A21, MSGBOX_DEFAULT
+RustboroCity_Gym_EventScript_GymStatue:: @ 8213071
+	msgbox RustboroCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_Gym_EventScript_21307B:: @ 821307B
+RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B
 	lockall
-	pokenavcall RustboroCity_Gym_Text_213A76
+	pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall
 	waitmessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox RustboroCity_Gym_Text_213C01, MSGBOX_DEFAULT
+	msgbox RustboroCity_Gym_Text_RegisteredRoxanne, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -106,7 +106,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B
 	releaseall
 	end
 
-RustboroCity_Gym_Text_21309D: @ 821309D
+RustboroCity_Gym_Text_GymGuideAdvice: @ 821309D
 	.string "Yo, how's it going?\p"
 	.string "Listen, my friend!\n"
 	.string "Would you like to become the CHAMPION?\p"
@@ -128,7 +128,7 @@ RustboroCity_Gym_Text_21309D: @ 821309D
 	.string "the GYM LEADER.\p"
 	.string "Well, go for it!$"
 
-RustboroCity_Gym_Text_2132E2: @ 82132E2
+RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2
 	.string "Whoa! What a breathtaking victory!\n"
 	.string "My cheering must've worked!\p"
 	.string "Great!\n"
@@ -140,45 +140,45 @@ RustboroCity_Gym_Text_2132E2: @ 82132E2
 	.string "the stairs to the CHAMPIONSHIP!\p"
 	.string "That's got to feel awesome!$"
 
-RustboroCity_Gym_Text_2133E9: @ 82133E9
+RustboroCity_Gym_Text_JoshPreBattle: @ 82133E9
 	.string "Don't take us GYM TRAINERS lightly!\n"
 	.string "I'll show you why we're better!$"
 
-RustboroCity_Gym_Text_21342D: @ 821342D
+RustboroCity_Gym_Text_JoshDefeat: @ 821342D
 	.string "You were too good for me…$"
 
-RustboroCity_Gym_Text_213447: @ 8213447
+RustboroCity_Gym_Text_JoshPostBattle: @ 8213447
 	.string "You haven't seen anything of the ROCK\n"
 	.string "type's terrifying power!$"
 
-RustboroCity_Gym_Text_213486: @ 8213486
+RustboroCity_Gym_Text_TommyPreBattle: @ 8213486
 	.string "If you can't beat me, you won't stand\n"
 	.string "a chance against ROXANNE!$"
 
-RustboroCity_Gym_Text_2134C6: @ 82134C6
+RustboroCity_Gym_Text_TommyDefeat: @ 82134C6
 	.string "Wow! You've got some potential!$"
 
-RustboroCity_Gym_Text_2134E6: @ 82134E6
+RustboroCity_Gym_Text_TommyPostBattle: @ 82134E6
 	.string "ROXANNE is stronger than me by\n"
 	.string "several times.\p"
 	.string "You'd better be on your guard!$"
 
-RustboroCity_Gym_Text_213533: @ 8213533
+RustboroCity_Gym_Text_MarcPreBattle: @ 8213533
 	.string "We might be in the middle of town,\n"
 	.string "but so what?\p"
 	.string "My ROCK POKéMON need room to\n"
 	.string "rampage!$"
 
-RustboroCity_Gym_Text_213589: @ 8213589
+RustboroCity_Gym_Text_MarcDefeat: @ 8213589
 	.string "Oh, man oh man!\n"
 	.string "Our challenger is one feisty customer!$"
 
-RustboroCity_Gym_Text_2135C0: @ 82135C0
+RustboroCity_Gym_Text_MarcPostBattle: @ 82135C0
 	.string "I have to hand it to our LEADER.\p"
 	.string "It took smarts and sense for her to\n"
 	.string "pick the ROCK type at her young age.$"
 
-RustboroCity_Gym_Text_21362A: @ 821362A
+RustboroCity_Gym_Text_RoxannePreBattle: @ 821362A
 	.string "Hello, I am ROXANNE, the RUSTBORO\n"
 	.string "POKéMON GYM LEADER.\p"
 	.string "I became a GYM LEADER so that I might\n"
@@ -187,7 +187,7 @@ RustboroCity_Gym_Text_21362A: @ 821362A
 	.string "Would you kindly demonstrate how you\n"
 	.string "battle, and with which POKéMON?$"
 
-RustboroCity_Gym_Text_21370B: @ 821370B
+RustboroCity_Gym_Text_RoxanneDefeat: @ 821370B
 	.string "So…\n"
 	.string "I lost…\p"
 	.string "It seems that I still have much more\n"
@@ -199,18 +199,18 @@ RustboroCity_Gym_Text_21370B: @ 821370B
 	.string "Please accept the official POKéMON\n"
 	.string "LEAGUE STONE BADGE.$"
 
-RustboroCity_Gym_Text_2137EC: @ 82137EC
+RustboroCity_Gym_Text_ReceivedStoneBadge: @ 82137EC
 	.string "{PLAYER} received the STONE BADGE\n"
 	.string "from ROXANNE.$"
 
-RustboroCity_Gym_Text_213816: @ 8213816
+RustboroCity_Gym_Text_StoneBadgeInfoTakeThis: @ 8213816
 	.string "The STONE BADGE heightens the ATTACK\n"
 	.string "power of your POKéMON.\p"
 	.string "It also enables them to use the HM move\n"
 	.string "CUT outside of battle.\p"
 	.string "Please take this with you, too.$"
 
-RustboroCity_Gym_Text_2138B1: @ 82138B1
+RustboroCity_Gym_Text_ExplainRockTomb: @ 82138B1
 	.string "That TECHNICAL MACHINE, TM39,\n"
 	.string "contains ROCK TOMB.\p"
 	.string "It not only inflicts damage by dropping\n"
@@ -220,22 +220,21 @@ RustboroCity_Gym_Text_2138B1: @ 82138B1
 	.string "Remember, a TM can be used only once,\n"
 	.string "so think before you use it.$"
 
-RustboroCity_Gym_Text_2139A7: @ 82139A7
+RustboroCity_Gym_Text_RoxannePostBattle: @ 82139A7
 	.string "Since you are so strong, you should\n"
 	.string "challenge other GYM LEADERS.\p"
 	.string "By battling many TRAINERS, you should\n"
 	.string "learn many things.$"
 
-RustboroCity_Gym_Text_213A21: @ 8213A21
+RustboroCity_Gym_Text_GymStatue: @ 8213A21
 	.string "RUSTBORO CITY POKéMON GYM$"
 
-RustboroCity_Gym_Text_213A3B: @ 8213A3B
+RustboroCity_Gym_Text_GymStatueCertified: @ 8213A3B
 	.string "RUSTBORO CITY POKéMON GYM\p"
 	.string "ROXANNE'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-
-RustboroCity_Gym_Text_213A76: @ 8213A76
+RustboroCity_Gym_Text_RoxanneRegisterCall: @ 8213A76
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "ROXANNE: Oh, hello, {PLAYER}?\n"
@@ -252,11 +251,11 @@ RustboroCity_Gym_Text_213A76: @ 8213A76
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-RustboroCity_Gym_Text_213C01: @ 8213C01
+RustboroCity_Gym_Text_RegisteredRoxanne: @ 8213C01
 	.string "Registered GYM LEADER ROXANNE\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Gym_Text_213C2F: @ 8213C2F
+RustboroCity_Gym_Text_RoxannePreRematch: @ 8213C2F
 	.string "ROXANNE: I'm so glad to see you again.\n"
 	.string "I'm ROXANNE, the GYM LEADER here.\p"
 	.string "I'm sure we've both experienced many\n"
@@ -264,17 +263,17 @@ RustboroCity_Gym_Text_213C2F: @ 8213C2F
 	.string "I would like to see how much better\n"
 	.string "we've become. Let us battle!$"
 
-RustboroCity_Gym_Text_213CF9: @ 8213CF9
+RustboroCity_Gym_Text_RoxanneRematchDefeat: @ 8213CF9
 	.string "Grr…\n"
 	.string "Again, I have lost…$"
 
-RustboroCity_Gym_Text_213D12: @ 8213D12
+RustboroCity_Gym_Text_RoxannePostRematch: @ 8213D12
 	.string "ROXANNE: I still have much to learn\n"
 	.string "when it comes to battling POKéMON.\p"
 	.string "That awareness makes me love battling\n"
 	.string "all that much more!$"
 
-RustboroCity_Gym_Text_213D93: @ 8213D93
+RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons: @ 8213D93
 	.string "ROXANNE: I'm so glad to see you again.\n"
 	.string "I'm ROXANNE, the GYM LEADER here.\p"
 	.string "I'm sure we've both experienced many\n"

data/specials.inc

@@ -150,12 +150,12 @@ gSpecials:: @ 81DBA64
 	def_special sub_80F8864
 	def_special CountPlayerContestPaintings
 	def_special ShowContestWinner
-	def_special MauvilleGymSpecial2
-	def_special MauvilleGymSpecial1
+	def_special MauvilleGymSetDefaultBarriers
+	def_special MauvilleGymPressSwitch
 	def_special ShowFieldMessageStringVar4
 	def_special DrawWholeMapView
 	def_special StorePlayerCoordsInVars
-	def_special MauvilleGymSpecial3
+	def_special MauvilleGymDeactivatePuzzle
 	def_special PetalburgGymSpecial1
 	def_special PetalburgGymSpecial2
 	def_special GetPlayerTrainerIdOnesDigit

include/event_scripts.h

@@ -555,7 +555,7 @@ extern const u8 IslandCave_EventScript_238EAF[];
 extern const u8 MauvilleCity_EventScript_1DF7BA[];
 extern const u8 Route119_EventScript_1F49EC[];
 extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
-extern const u8 RustboroCity_Gym_EventScript_21307B[];
+extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];
 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[];
 extern const u8 SSTidalCorridor_EventScript_23C050[];
 extern const u8 EventScript_FallDownHoleMtPyre[];

include/field_screen_effect.h

@@ -33,7 +33,7 @@ void sub_80AF8B8(void);
 void sub_80AF948(void);
 void sub_80AF9F8(void);
 void sub_80AFC60(void);
-void sub_80B009C(u8 flashLevel);
+void AnimateFlash(u8 flashLevel);
 void WriteBattlePyramidViewScanlineEffectBuffer(void);
 void sub_80B0244(void);
 void sub_80B0268(void);

src/field_control_avatar.c

@@ -583,7 +583,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
         }
         if (ShouldDoRoxanneCall() == TRUE)
         {
-            ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_21307B);
+            ScriptContext1_SetupScript(RustboroCity_Gym_EventScript_RegisterRoxanne);
             return TRUE;
         }
         if (ShouldDoRivalRayquazaCall() == TRUE)

src/field_screen_effect.c

@@ -970,7 +970,7 @@ static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 dest
 #undef tFlashRadiusDelta
 #undef tClearScanlineEffect
 
-void sub_80B009C(u8 flashLevel)
+void AnimateFlash(u8 flashLevel)
 {
     u8 curFlashLevel = Overworld_GetFlashLevel();
     u8 value = 0;

src/field_specials.c

@@ -636,6 +636,7 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent
     }
 }
 
+// NOTE: Coordinates are +7, +7 from actual in-map coordinates
 static const struct UCoords8 sMauvilleGymSwitchCoords[] =
 {
     { 7, 22},
@@ -644,26 +645,24 @@ static const struct UCoords8 sMauvilleGymSwitchCoords[] =
     {15, 16}
 };
 
-// Flips the switches on the ground when the player steps on them.
-void MauvilleGymSpecial1(void)
+// Presses the stepped-on switch and raises the rest
+void MauvilleGymPressSwitch(void)
 {
     u8 i;
     for (i = 0; i < ARRAY_COUNT(sMauvilleGymSwitchCoords); i++)
     {
         if (i == gSpecialVar_0x8004)
-        {
             MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, PressedSwitch));
-        }
         else
-        {
             MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, RaisedSwitch));
-        }
     }
 }
 
-void MauvilleGymSpecial2(void)
+// Sets the gym barriers back to the default state; their alt state is handled by MauvilleCity_Gym_EventScript_SetAltBarriers
+void MauvilleGymSetDefaultBarriers(void)
 {
     int x, y;
+    // All switches/barriers are within these coord ranges -7
     for (y = 12; y < 24; y++)
     {
         for (x = 7; x < 16; x++)
@@ -735,13 +734,9 @@ void MauvilleGymSpecial2(void)
                     break;
                 case METATILE_ID(MauvilleGym, FloorTile):
                     if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_ID(MauvilleGym, GreenBeamV1_On))
-                    {
                         MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV2_On) | METATILE_COLLISION_MASK);
-                    }
                     else
-                    {
                         MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV2_On) | METATILE_COLLISION_MASK);
-                    }
                     break;
                 case METATILE_ID(MauvilleGym, PoleBottom_Off):
                     MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV1_On) | METATILE_COLLISION_MASK);
@@ -758,7 +753,7 @@ void MauvilleGymSpecial2(void)
 }
 
 // Presses all switches and deactivates all beams.
-void MauvilleGymSpecial3(void)
+void MauvilleGymDeactivatePuzzle(void)
 {
     int i, x, y;
     const struct UCoords8 *switchCoords = sMauvilleGymSwitchCoords;

src/scrcmd.c

@@ -607,7 +607,7 @@ bool8 ScrCmd_incrementgamestat(struct ScriptContext *ctx)
 
 bool8 ScrCmd_animateflash(struct ScriptContext *ctx)
 {
-    sub_80B009C(ScriptReadByte(ctx));
+    AnimateFlash(ScriptReadByte(ctx));
     ScriptContext1_Stop();
     return TRUE;
 }