Sync set_gym_trainers.inc

11 files changed, 84 insertions, 172 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 973619895..1966ca9b8 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -839,88 +839,7 @@ EventScript_BackupMrBrineyLocation:: @ 81A010C
 
 	.include "data/scripts/surf.inc"
 	.include "data/scripts/dynamic_npc_graphics.inc"
-
-DewfordTown_Gym_EventScript_1A01C0:: @ 81A01C0
-FortreeCity_Gym_EventScript_1A01C0:: @ 81A01C0
-LavaridgeTown_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-MauvilleCity_Gym_EventScript_1A01C0:: @ 81A01C0
-MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0
-PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0
-RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0
-SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-	switch VAR_0x8008
-	case 1, DewfordTown_Gym_EventScript_1A021E
-	case 2, DewfordTown_Gym_EventScript_1A0225
-	case 3, DewfordTown_Gym_EventScript_1A022F
-	case 4, DewfordTown_Gym_EventScript_1A023C
-	case 5, DewfordTown_Gym_EventScript_1A024C
-	case 6, DewfordTown_Gym_EventScript_1A0262
-	case 7, DewfordTown_Gym_EventScript_1A026F
-	case 8, DewfordTown_Gym_EventScript_1A0282
-	end
-
-DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
-	settrainerflag TRAINER_JOSH
-	settrainerflag TRAINER_TOMMY
-	return
-
-DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
-	settrainerflag TRAINER_HIDEKI
-	settrainerflag TRAINER_TESSA
-	settrainerflag TRAINER_LAURA
-	return
-
-DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
-	settrainerflag TRAINER_KIRK
-	settrainerflag TRAINER_SHAWN
-	settrainerflag TRAINER_BEN
-	settrainerflag TRAINER_VIVIAN
-	return
-
-DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
-	settrainerflag TRAINER_COLE
-	settrainerflag TRAINER_AXLE
-	settrainerflag TRAINER_ANDY
-	settrainerflag TRAINER_ZANE
-	settrainerflag TRAINER_SADIE
-	return
-
-DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
-	settrainerflag TRAINER_RANDALL
-	settrainerflag TRAINER_PARKER
-	settrainerflag TRAINER_GEORGE
-	settrainerflag TRAINER_BERKE
-	settrainerflag TRAINER_MARY
-	settrainerflag TRAINER_LORI
-	settrainerflag TRAINER_JODY
-	return
-
-DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
-	settrainerflag TRAINER_JARED
-	settrainerflag TRAINER_TERRELL
-	settrainerflag TRAINER_KYLEE
-	settrainerflag TRAINER_WILL
-	return
-
-DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
-	settrainerflag TRAINER_PRESTON
-	settrainerflag TRAINER_VIRGIL
-	settrainerflag TRAINER_FRITZ
-	settrainerflag TRAINER_HANNAH
-	settrainerflag TRAINER_SAMANTHA
-	settrainerflag TRAINER_MAURA
-	return
-
-DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
-	settrainerflag TRAINER_ANDREA
-	settrainerflag TRAINER_CRISSY
-	settrainerflag TRAINER_BRIANNA_2
-	settrainerflag TRAINER_CONNIE
-	settrainerflag TRAINER_BRIDGET
-	settrainerflag TRAINER_OLIVIA
-	settrainerflag TRAINER_TIFFANY
-	settrainerflag TRAINER_MARISSA
-	return
+	.include "data/scripts/set_gym_trainers.inc"
 
 DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
 DewfordTown_Hall_EventScript_1A029B:: @ 81A029B
diff --git a/data/event_scripts.s b/data/event_scripts.s
index a089cae39..d1e393858 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -838,88 +838,7 @@ EventScript_BackupMrBrineyLocation:: @ 81A010C
 
 	.include "data/scripts/surf.inc"
 	.include "data/scripts/dynamic_npc_graphics.inc"
-
-DewfordTown_Gym_EventScript_1A01C0:: @ 81A01C0
-FortreeCity_Gym_EventScript_1A01C0:: @ 81A01C0
-LavaridgeTown_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-MauvilleCity_Gym_EventScript_1A01C0:: @ 81A01C0
-MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0
-PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0
-RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0
-SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-	switch VAR_0x8008
-	case 1, DewfordTown_Gym_EventScript_1A021E
-	case 2, DewfordTown_Gym_EventScript_1A0225
-	case 3, DewfordTown_Gym_EventScript_1A022F
-	case 4, DewfordTown_Gym_EventScript_1A023C
-	case 5, DewfordTown_Gym_EventScript_1A024C
-	case 6, DewfordTown_Gym_EventScript_1A0262
-	case 7, DewfordTown_Gym_EventScript_1A026F
-	case 8, DewfordTown_Gym_EventScript_1A0282
-	end
-
-DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
-	settrainerflag TRAINER_JOSH
-	settrainerflag TRAINER_TOMMY
-	return
-
-DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
-	settrainerflag TRAINER_HIDEKI
-	settrainerflag TRAINER_TESSA
-	settrainerflag TRAINER_LAURA
-	return
-
-DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
-	settrainerflag TRAINER_KIRK
-	settrainerflag TRAINER_SHAWN
-	settrainerflag TRAINER_BEN
-	settrainerflag TRAINER_VIVIAN
-	return
-
-DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
-	settrainerflag TRAINER_COLE
-	settrainerflag TRAINER_AXLE
-	settrainerflag TRAINER_ANDY
-	settrainerflag TRAINER_ZANE
-	settrainerflag TRAINER_SADIE
-	return
-
-DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
-	settrainerflag TRAINER_RANDALL
-	settrainerflag TRAINER_PARKER
-	settrainerflag TRAINER_GEORGE
-	settrainerflag TRAINER_BERKE
-	settrainerflag TRAINER_MARY
-	settrainerflag TRAINER_LORI
-	settrainerflag TRAINER_JODY
-	return
-
-DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
-	settrainerflag TRAINER_JARED
-	settrainerflag TRAINER_TERRELL
-	settrainerflag TRAINER_KYLEE
-	settrainerflag TRAINER_WILL
-	return
-
-DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
-	settrainerflag TRAINER_PRESTON
-	settrainerflag TRAINER_VIRGIL
-	settrainerflag TRAINER_FRITZ
-	settrainerflag TRAINER_HANNAH
-	settrainerflag TRAINER_SAMANTHA
-	settrainerflag TRAINER_MAURA
-	return
-
-DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
-	settrainerflag TRAINER_ANDREA
-	settrainerflag TRAINER_CRISSY
-	settrainerflag TRAINER_BRIANNA_2
-	settrainerflag TRAINER_CONNIE
-	settrainerflag TRAINER_BRIDGET
-	settrainerflag TRAINER_OLIVIA
-	settrainerflag TRAINER_TIFFANY
-	settrainerflag TRAINER_MARISSA
-	return
+	.include "data/scripts/set_gym_trainers.inc"
 
 DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
 DewfordTown_Hall_EventScript_1A029B:: @ 81A029B
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 5575b646f..ee08ccbde 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 2
-	call DewfordTown_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	goto DewfordTown_Gym_EventScript_1531B5
 	end
 
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index ddedbbdbc..ab94d7e19 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
 	setvar VAR_0x8008, 6
-	call FortreeCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	goto FortreeCity_Gym_EventScript_157F3E
 	end
 
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index bb794692e..913c233c3 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -76,7 +76,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 4
-	call LavaridgeTown_Gym_1F_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 1
 	goto LavaridgeTown_Gym_1F_EventScript_1537A7
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index b45fc3ca8..a4692820a 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 3
-	call MauvilleCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	special MauvilleGymSpecial3
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index 8126b8cfa..77a2080d2 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -61,7 +61,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
 	clearflag FLAG_UNKNOWN_393
 	setvar VAR_0x8008, 7
-	call MossdeepCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
 	goto MossdeepCity_Gym_EventScript_15A5C6
 	end
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 75b1299b0..452415dce 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -394,7 +394,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
 	clearflag FLAG_HIDE_WATTSON_MAUVILLE
 	setvar VAR_0x8008, 5
-	call PetalburgCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
 	call PetalburgCity_Gym_EventScript_1544ED
 	special DrawWholeMapView
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 5090bb256..c0d910b4a 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	setvar VAR_RUSTBORO_STATE, 1
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	setvar VAR_0x8008, 1
-	call RustboroCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	compare VAR_PETALBURG_GYM_STATE, 6
 	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	goto RustboroCity_Gym_EventScript_15793C
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index f253f45af..7d82e96fa 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	setflag FLAG_BADGE08_GET
 	setvar VAR_0x8008, 8
-	call SootopolisCity_Gym_1F_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	goto SootopolisCity_Gym_1F_EventScript_15B056
 	end
 
diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc
new file mode 100644
index 000000000..3248c2d82
--- /dev/null
+++ b/data/scripts/set_gym_trainers.inc
@@ -0,0 +1,74 @@
+Common_EventScript_SetGymTrainers:: @ 81A01C0
+	switch VAR_0x8008
+	case 1, RusboroCity_Gym_SetGymTrainers
+	case 2, DewfordTown_Gym_SetGymTrainers
+	case 3, MauvilleCity_Gym_SetGymTrainers
+	case 4, LavaridgeTown_Gym_SetGymTrainers
+	case 5, PetalburgCity_Gym_SetGymTrainers
+	case 6, FortreeCity_Gym_SetGymTrainers
+	case 7, MossdeepCity_Gym_SetGymTrainers
+	case 8, SootopolisCity_Gym_SetGymTrainers
+	end
+
+RusboroCity_Gym_SetGymTrainers:: @ 81A021E
+	settrainerflag TRAINER_JOSH
+	settrainerflag TRAINER_TOMMY
+	return
+
+DewfordTown_Gym_SetGymTrainers:: @ 81A0225
+	settrainerflag TRAINER_HIDEKI
+	settrainerflag TRAINER_TESSA
+	settrainerflag TRAINER_LAURA
+	return
+
+MauvilleCity_Gym_SetGymTrainers:: @ 81A022F
+	settrainerflag TRAINER_KIRK
+	settrainerflag TRAINER_SHAWN
+	settrainerflag TRAINER_BEN
+	settrainerflag TRAINER_VIVIAN
+	return
+
+LavaridgeTown_Gym_SetGymTrainers:: @ 81A023C
+	settrainerflag TRAINER_COLE
+	settrainerflag TRAINER_AXLE
+	settrainerflag TRAINER_ANDY
+	settrainerflag TRAINER_ZANE
+	settrainerflag TRAINER_SADIE
+	return
+
+PetalburgCity_Gym_SetGymTrainers:: @ 81A024C
+	settrainerflag TRAINER_RANDALL
+	settrainerflag TRAINER_PARKER
+	settrainerflag TRAINER_GEORGE
+	settrainerflag TRAINER_BERKE
+	settrainerflag TRAINER_MARY
+	settrainerflag TRAINER_LORI
+	settrainerflag TRAINER_JODY
+	return
+
+FortreeCity_Gym_SetGymTrainers:: @ 81A0262
+	settrainerflag TRAINER_JARED
+	settrainerflag TRAINER_TERRELL
+	settrainerflag TRAINER_KYLEE
+	settrainerflag TRAINER_WILL
+	return
+
+MossdeepCity_Gym_SetGymTrainers:: @ 81A026F
+	settrainerflag TRAINER_PRESTON
+	settrainerflag TRAINER_VIRGIL
+	settrainerflag TRAINER_FRITZ
+	settrainerflag TRAINER_HANNAH
+	settrainerflag TRAINER_SAMANTHA
+	settrainerflag TRAINER_MAURA
+	return
+
+SootopolisCity_Gym_SetGymTrainers:: @ 81A0282
+	settrainerflag TRAINER_ANDREA
+	settrainerflag TRAINER_CRISSY
+	settrainerflag TRAINER_BRIANNA_2
+	settrainerflag TRAINER_CONNIE
+	settrainerflag TRAINER_BRIDGET
+	settrainerflag TRAINER_OLIVIA
+	settrainerflag TRAINER_TIFFANY
+	settrainerflag TRAINER_MARISSA
+	return