diff options
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/DewfordTown_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/FortreeCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/LavaridgeTown_Gym_1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/MauvilleCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/MossdeepCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PetalburgCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/RustboroCity_Gym/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SootopolisCity_Gym_1F/scripts.inc | 2 |
8 files changed, 8 insertions, 8 deletions
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 |