diff options
Diffstat (limited to 'data/maps')
17 files changed, 26 insertions, 26 deletions
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index e92919990..b02761b8b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A setrespawn HEAL_LOCATION_DEWFORD_TOWN - call DewfordTown_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar VAR_0x800B, 1 - call DewfordTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0987adf18..5d229e908 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar VAR_0x800B, 1 - call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index 8bd948377..97e7d1f46 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar VAR_0x800B, 1 - call EverGrandeCity_PokemonLeague_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 528118482..133b4626a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 setrespawn HEAL_LOCATION_FALLARBOR_TOWN - call FallarborTown_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar VAR_0x800B, 1 - call FallarborTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index c080805ea..90b74adc0 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar VAR_0x800B, 1 - call FortreeCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index e3434a291..637a1eefa 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN - call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar VAR_0x800B, 1 - call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index e03a03702..47466c925 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar VAR_0x800B, 1 - call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 03c22a982..e5cfd2fb2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 setrespawn HEAL_LOCATION_MAUVILLE_CITY - call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end @@ -14,7 +14,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar VAR_0x800B, 1 - call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 520678ec6..c0655f948 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar VAR_0x800B, 1 - call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 5865a5f18..c91239d86 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E setrespawn HEAL_LOCATION_OLDALE_TOWN - call OldaleTown_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar VAR_0x800B, 1 - call OldaleTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 2f74f4cc1..f9b2a8460 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_Return specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_1541E8 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 37e0c7ade..287349c78 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 @ 8154109 setvar VAR_0x800B, 1 - call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index a84358ca0..4edcb9555 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A setrespawn HEAL_LOCATION_PETALBURG_CITY - call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar VAR_0x800B, 1 - call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 7837a70c3..83766d86e 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F setrespawn HEAL_LOCATION_RUSTBORO_CITY - call RustboroCity_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar VAR_0x800B, 1 - call RustboroCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 46c4a595f..a0d401b29 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -4,12 +4,12 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 setrespawn HEAL_LOCATION_SLATEPORT_CITY - call SlateportCity_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar VAR_0x800B, 1 - call SlateportCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 0f37f1014..c82d98fef 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 @ 815B19A setvar VAR_0x800B, 1 - call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 8b18a2f22..1c60fc1bb 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -4,13 +4,13 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F setrespawn HEAL_LOCATION_VERDANTURF_TOWN - call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar VAR_0x800B, 1 - call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release |