diff options
Diffstat (limited to 'data/maps')
29 files changed, 37 insertions, 37 deletions
diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 09c381df2..768d7e28d 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -3,7 +3,7 @@ AquaHideout_1F_MapScripts:: @ 815D7C2 .byte 0 AquaHideout_1F_MapScript1_15D7C8:: @ 815D7C8 - call AquaHideout_1F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 58334912c..52fb300d8 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -12,7 +12,7 @@ AquaHideout_B1F_EventScript_15D846:: @ 815D846 return AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A - call AquaHideout_B1F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end AquaHideout_B1F_EventScript_15D850:: @ 815D850 diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 24984d455..2ec8d5176 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -3,7 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 815D8B1 .byte 0 AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 - call AquaHideout_B2F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index 66eeb9fa5..366a63450 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -17,7 +17,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 .else setmaplayoutindex 313 .endif - call CaveOfOrigin_B4F_EventScript_1A01B5 + call Common_EventScript_SetupLegendaryGfxIds call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3 end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 29ba3f2b6..92ba90cb8 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -5,7 +5,7 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF .byte 0 EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF - call EverGrandeCity_ChampionsRoom_EventScript_1A014E + call Common_EventScript_SetupRivalGfxId end EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 0c119f230..7a868e72e 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -6,8 +6,8 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF - call LavaridgeTown_EventScript_1A014E - call LavaridgeTown_EventScript_1A0172 + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_LAVARIDGE_RIVAL_STATE, 2 call_if_eq LavaridgeTown_EventScript_14E4D0 end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 4d7b7be26..6667ecd5f 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -8,8 +8,8 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1 - call LilycoveCity_EventScript_1A0196 - call LilycoveCity_EventScript_1A014E + call Common_EventScript_SetupEvilTeamGfxIds + call Common_EventScript_SetupRivalGfxId end LilycoveCity_MapScript1_14CA3F:: @ 814CA3F diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index a70ca7e49..5465da371 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -5,7 +5,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82 .byte 0 LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 - call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E + call Common_EventScript_SetupRivalGfxId call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4 end diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index a77ee6067..83d8bbf30 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_1R_MapScripts:: @ 815C490 .byte 0 MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 - call MeteorFalls_1F_1R_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 8384ac537..e360c6cd2 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -5,7 +5,7 @@ MtChimney_MapScripts:: @ 815CF7C MtChimney_MapScript1_15CF87:: @ 815CF87 setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 - call MtChimney_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end MtChimney_MapScript1_15CF92:: @ 815CF92 diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 74fac73d6..a55ae8800 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 815D4B1 .byte 0 MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 - call MtPyre_Summit_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index ab4ba4920..d8643b228 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -3,7 +3,7 @@ OldaleTown_MapScripts:: @ 814DD62 .byte 0 OldaleTown_MapScript1_14DD68:: @ 814DD68 - call OldaleTown_EventScript_1A014E + call Common_EventScript_SetupRivalGfxId setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92 call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 84110b859..1d984675c 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -3,7 +3,7 @@ PetalburgWoods_MapScripts:: @ 815CC9C .byte 0 PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2 - call PetalburgWoods_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 44d245370..6747c140c 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -3,7 +3,7 @@ Route103_MapScripts:: @ 814EB81 .byte 0 Route103_MapScript1_14EB87:: @ 814EB87 - call Route103_EventScript_1A014E + call Common_EventScript_SetupRivalGfxId call Route103_EventScript_1A02F4 end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index ee8a4117c..80605c132 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -9,9 +9,9 @@ Route110_MapScript1_14F910:: @ 814F910 end Route110_MapScript1_14F914:: @ 814F914 - call Route110_EventScript_1A0196 - call Route110_EventScript_1A014E - call Route110_EventScript_1A0172 + call Common_EventScript_SetupEvilTeamGfxIds + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if_eq Route110_EventScript_14F92F end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 6d531b4c8..9bf458099 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -3,7 +3,7 @@ Route112_MapScripts:: @ 8150502 .byte 0 Route112_MapScript1_150508:: @ 8150508 - call Route112_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 33393f8aa..721fab1fb 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -9,7 +9,7 @@ Route113_MapScript1_1505D7:: @ 81505D7 Route113_MapScript1_1505DA:: @ 81505DA call Route113_EventScript_1505E5 - call Route113_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end Route113_EventScript_1505E5:: @ 81505E5 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index d5b376d49..3b4e9c51f 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -23,9 +23,9 @@ Route119_EventScript_151197:: @ 8151197 return Route119_MapScript1_15119B:: @ 815119B - call Route119_EventScript_1A014E - call Route119_EventScript_1A0172 - call Route119_EventScript_1A0196 + call Common_EventScript_SetupRivalGfxId + call Common_EventScript_SetupRivalOnBikeGfxId + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if_eq Route119_EventScript_1511B9 special SetRoute119Weather diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8061daafb..894f05286 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A .byte 0 Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 - call Route119_WeatherInstitute_1F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 5ed894433..18aba2003 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 .byte 0 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 - call Route119_WeatherInstitute_2F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4 compare VAR_WEATHER_INSTITUTE_STATE, 1 diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 9cb0124fe..d95581a3d 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -3,7 +3,7 @@ Route121_MapScripts:: @ 8151AFE .byte 0 Route121_MapScript1_151B04:: @ 8151B04 - call Route121_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end Route121_EventScript_151B0A:: @ 8151B0A diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index d4b661891..8a8e18747 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -5,7 +5,7 @@ Route128_MapScripts:: @ 815211B Route128_MapScript1_152126:: @ 8152126 call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1 - call Route128_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end Route128_MapScript2_152135:: @ 8152135 diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 0dcd74170..a2c231fde 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -4,8 +4,8 @@ RustboroCity_MapScripts:: @ 814C372 RustboroCity_MapScript1_14C378:: @ 814C378 setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_1A0196 - call RustboroCity_EventScript_1A014E + call Common_EventScript_SetupEvilTeamGfxIds + call Common_EventScript_SetupRivalGfxId end RustboroCity_EventScript_14C386:: @ 814C386 diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 7fd75bcd5..a48b1a1c1 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -9,7 +9,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 .2byte 0 RusturfTunnel_MapScript1_15C762:: @ 815C762 - call RusturfTunnel_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if_eq RusturfTunnel_EventScript_15C773 end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index dbbcc2f4b..b04930ee6 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room1_MapScripts:: @ 815DA61 .byte 0 SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 - call SeafloorCavern_Room1_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index d532d6a1f..286487d73 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room3_MapScripts:: @ 815DA9C .byte 0 SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 - call SeafloorCavern_Room3_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index da4841070..dd7abf361 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -3,7 +3,7 @@ SeafloorCavern_Room4_MapScripts:: @ 815DABF .byte 0 SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 - call SeafloorCavern_Room4_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index e48980e7f..bef07204b 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -3,8 +3,8 @@ SeafloorCavern_Room9_MapScripts:: @ 815DAE6 .byte 0 SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC - call SeafloorCavern_Room9_EventScript_1A0196 - call SeafloorCavern_Room9_EventScript_1A01B5 + call Common_EventScript_SetupEvilTeamGfxIds + call Common_EventScript_SetupLegendaryGfxIds .ifdef SAPPHIRE setmaplayoutindex 157 .else diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 7d918f540..47d49639e 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA .byte 0 SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0 - call SlateportCity_OceanicMuseum_2F_EventScript_1A0196 + call Common_EventScript_SetupEvilTeamGfxIds end SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 |