diff options
Diffstat (limited to 'data')
64 files changed, 289 insertions, 289 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index d56f31c44..ec070bbf4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -763,8 +763,8 @@ Common_EventScript_NoRoomForDecor:: @ 8272071 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return -Common_EventScript_SetAlternatingWeather:: @ 827207A - setweather WEATHER_ALTERNATING +Common_EventScript_SetAbnormalWeather:: @ 827207A + setweather WEATHER_ABNORMAL return Common_EventScript_PlayGymBadgeFanfare:: @ 827207E @@ -1012,7 +1012,7 @@ gText_LegendaryFlewAway:: @ 8273204 .include "data/text/pc_transfer.inc" .include "data/text/mevent.inc" - .include "data/text/unusual_weather.inc" + .include "data/text/abnormal_weather.inc" EventScript_SelectWithoutRegisteredItem:: @ 82736B3 msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN @@ -1062,7 +1062,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776 .include "data/scripts/pc_transfer.inc" .include "data/scripts/mevent.inc" - .include "data/scripts/unusual_weather.inc" + .include "data/scripts/abnormal_weather.inc" .include "data/scripts/trainer_script.inc" .include "data/scripts/berry_tree.inc" .include "data/scripts/secret_base.inc" diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index e333a9e9f..cc8a1cddc 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 85a060efe..5327e3aa1 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_ABANDONED_SHIP", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 61843121a..3338a548b 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_NONE", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": false, "allow_escape_rope": true, diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index 62dc60a8e..f979db343 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN03", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index 7127dfc19..d4f5f63f1 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN03", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "requires_flash": true, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 04d3a9631..42392c7e9 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B .byte 0 EverGrandeCity_OnTransition: @ 81E7D21 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather end EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 33b2a294c..23ce12098 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -7,7 +7,7 @@ FarawayIsland_Entrance_OnTransition: @ 8267C94 end FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98 - setweather WEATHER_CLOUDS + setweather WEATHER_SUNNY_CLOUDS doweather end diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index c3237ece3..ff3b05780 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -156,7 +156,7 @@ "x": 21, "y": 12, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 5e6712c68..9b4aa5383 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -26,7 +26,7 @@ JaggedPass_OnTransition: @ 823068B end JaggedPass_EventScript_SetWeatherAsh:: @ 8230697 - setweather WEATHER_ASH + setweather WEATHER_VOLCANIC_ASH doweather return diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 20866ced9..07cb25fa5 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_GIM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_INDOOR", "allow_bike": false, "allow_escape_rope": false, diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 05aa18d00..86e245ea6 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -5,7 +5,7 @@ "music": "MUS_GIM", "region_map_section": "MAPSEC_LAVARIDGE_TOWN", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_INDOOR", "allow_bike": false, "allow_escape_rope": false, diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 66746ad37..e2f76c163 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_OnTransition: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_CONTEST_HALL_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather call Common_EventScript_SetupRivalGfxId end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 012fe12f5..0a2525b87 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp .byte 0 -@ During the unusual weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible +@ During the abnormal weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible @ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80 map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 435d0d783..aaf7e6f81 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN01", "region_map_section": "MAPSEC_MARINE_CAVE", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": false, "allow_escape_rope": true, diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 3398ae118..6eaeb4b51 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -47,13 +47,13 @@ MarineCave_End_EventScript_Kyogre:: @ 823B01B goto_if_eq MarineCave_End_EventScript_RanFromKyogre compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq MarineCave_End_EventScript_RanFromKyogre - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 + setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE releaseall end MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084 - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 + setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1 setflag FLAG_DEFEATED_KYOGRE goto Common_EventScript_RemoveStaticPokemon end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index c701bf45b..b0013f72a 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_OnTransition: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather end MossdeepCity_EventScript_PokefanF:: @ 81E4AB2 diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 46ef77cf6..9a6b3b8f5 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -5,7 +5,7 @@ "music": "MUS_TOZAN", "region_map_section": "MAPSEC_MT_CHIMNEY", "requires_flash": false, - "weather": "WEATHER_ASH", + "weather": "WEATHER_VOLCANIC_ASH", "map_type": "MAP_TYPE_ROUTE", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index 11d3f987c..56a990266 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -13,11 +13,11 @@ MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8 return MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9 - setweather WEATHER_FOG_1 + setweather WEATHER_FOG_HORIZONTAL return MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED - setweather WEATHER_FOG_1 + setweather WEATHER_FOG_HORIZONTAL doweather end diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index f7eab7e52..87de8a4a8 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -5,7 +5,7 @@ "music": "MUS_MACHUPI", "region_map_section": "MAPSEC_MT_PYRE", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_ROUTE", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index e1292803d..a42446e72 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -6,10 +6,10 @@ Route105_MapScripts:: @ 81EE1DB Route105_OnLoad: @ 81EE1EB call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105North + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105South end Route105_CloseRegiEntrance:: @ 81EE20B @@ -18,16 +18,16 @@ Route105_CloseRegiEntrance:: @ 81EE20B return Route105_OnTransition: @ 81EE21E - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH - call_if_eq UnusualWeather_StartKyogreWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH - call_if_eq UnusualWeather_StartKyogreWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH + call_if_eq AbnormalWeather_StartKyogreWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH + call_if_eq AbnormalWeather_StartKyogreWeather end Route105_OnFrame: @ 81EE240 - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route105_EventScript_Foster:: @ 81EE24A diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index cc1c1cd35..cddfe125c 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -268,49 +268,49 @@ "x": 19, "y": 11, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 19, "y": 10, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 19, "y": 12, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 19, "y": 13, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 86, "y": 9, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 85, "y": 10, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 85, "y": 11, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", @@ -373,28 +373,28 @@ "x": 19, "y": 14, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 87, "y": 8, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 87, "y": 6, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" }, { "type": "weather", "x": 87, "y": 7, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_ASH" + "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH" } ], "bg_events": [ diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 612e4a864..24c57c29c 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -18,7 +18,7 @@ Route113_EventScript_CheckSetAshWeather:: @ 81F216A goto_if_lt Route113_EventScript_DontSetAshWeather compare VAR_TEMP_0, 84 goto_if_gt Route113_EventScript_DontSetAshWeather - setweather WEATHER_ASH + setweather WEATHER_VOLCANIC_ASH return Route113_EventScript_DontSetAshWeather:: @ 81F2189 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 1873f6f7a..5e0e564b1 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -5,23 +5,23 @@ Route114_MapScripts:: @ 81F252F .byte 0 Route114_OnTransition: @ 81F253F - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH - call_if_eq UnusualWeather_StartGroudonWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH - call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH + call_if_eq AbnormalWeather_StartGroudonWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH + call_if_eq AbnormalWeather_StartGroudonWeather end Route114_OnLoad: @ 81F2561 - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114North + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114South end Route114_OnFrame: @ 81F2578 - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route114_EventScript_Man:: @ 81F2582 diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 74d0c6519..a9d0d93c1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -5,23 +5,23 @@ Route115_MapScripts:: @ 81F2920 .byte 0 Route115_OnLoad: @ 81F2930 - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115West + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115East end Route115_OnTransition: @ 81F2947 - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST - call_if_eq UnusualWeather_StartGroudonWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST - call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST + call_if_eq AbnormalWeather_StartGroudonWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST + call_if_eq AbnormalWeather_StartGroudonWeather end Route115_OnFrame: @ 81F2969 - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route115_EventScript_Woman:: @ 81F2973 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 91b731b44..2043c7c02 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -6,12 +6,12 @@ Route116_MapScripts:: @ 81F2C0C Route116_OnTransition: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH - call_if_eq UnusualWeather_StartGroudonWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH - call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH + call_if_eq AbnormalWeather_StartGroudonWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH + call_if_eq AbnormalWeather_StartGroudonWeather end Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47 @@ -19,14 +19,14 @@ Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47 return Route116_OnLoad: @ 81F2C4F - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116North + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116South end Route116_OnFrame: @ 81F2C66 - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route116_EventScript_WandasBoyfriend:: @ 81F2C70 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 17895430f..6eb657a11 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -6,23 +6,23 @@ Route118_MapScripts:: @ 81F3DBC Route118_OnTransition: @ 81F3DCC call GabbyAndTy_EventScript_UpdateLocation - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST - call_if_eq UnusualWeather_StartGroudonWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST - call_if_eq UnusualWeather_StartGroudonWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST + call_if_eq AbnormalWeather_StartGroudonWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST + call_if_eq AbnormalWeather_StartGroudonWeather end Route118_OnLoad: @ 81F3DF3 - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West end Route118_OnFrame: @ 81F3E0A - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route118_EventScript_GoodRodFisherman:: @ 81F3E14 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 0b7eb4f4a..c734ee3c4 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -36,7 +36,7 @@ Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8 call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated compare VAR_0x8004, 2 @ Both defeated goto_if_eq Route119_WeatherInstitute_1F_EventScript_StudyingRain - msgbox Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather, MSGBOX_DEFAULT + msgbox Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather, MSGBOX_DEFAULT release end @@ -116,7 +116,7 @@ Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E .string "And thus, the PROFESSOR is studying\n" .string "if the rain can be put to good use.$" -Route119_WeatherInstitute_1F_Text_NoticingUnusualWeather: @ 826FDE8 +Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather: @ 826FDE8 .string "On the 2nd floor of the INSTITUTE,\n" .string "we study the weather patterns over\l" .string "the HOENN region.\p" diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 04318bbb2..03ec9b6f0 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -131,19 +131,19 @@ Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA end Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7 - goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather + goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT release end -Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A +Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather:: @ 827010A setvar VAR_0x8004, 0 call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated compare VAR_0x8004, 2 @ Both defeated goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather - call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather - specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType + call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather + specialvar VAR_RESULT, GetAbnormalWeatherMapNameAndType compare VAR_RESULT, 1 goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT @@ -155,8 +155,8 @@ Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F release end -Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159 - special CreateUnusualWeatherEvent +Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather:: @ 8270159 + special CreateAbnormalWeatherEvent setflag FLAG_TEMP_2 return diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 048129a1d..35fc402cf 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -620,63 +620,63 @@ "x": 7, "y": 15, "elevation": 0, - "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + "weather": "COORD_EVENT_WEATHER_RAIN" }, { "type": "weather", "x": 7, "y": 16, "elevation": 0, - "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + "weather": "COORD_EVENT_WEATHER_RAIN" }, { "type": "weather", "x": 22, "y": 61, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + "weather": "COORD_EVENT_WEATHER_RAIN" }, { "type": "weather", "x": 12, "y": 64, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + "weather": "COORD_EVENT_WEATHER_RAIN" }, { "type": "weather", "x": 35, "y": 63, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 36, "y": 63, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 37, "y": 63, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 38, "y": 63, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 32, "y": 88, "elevation": 5, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", @@ -704,49 +704,49 @@ "x": 32, "y": 89, "elevation": 5, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 32, "y": 90, "elevation": 5, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 32, "y": 91, "elevation": 5, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 10, "y": 75, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 11, "y": 75, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 12, "y": 75, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" }, { "type": "weather", "x": 13, "y": 75, "elevation": 3, - "weather": "COORD_EVENT_WEATHER_CLOUDS" + "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS" } ], "bg_events": [ diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 986f63162..c5c00892a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -76,7 +76,7 @@ Route120_EventScript_SetWeather:: @ 81F54D8 return Route120_EventScript_SetCloudyWeather:: @ 81F54FF - setweather WEATHER_CLOUDS + setweather WEATHER_SUNNY_CLOUDS return Route120_EventScript_SetSunnyWeather:: @ 81F5503 @@ -92,7 +92,7 @@ Route120_EventScript_TrySetRainyWeather:: @ 81F5507 end Route120_EventScript_SetRainyWeather:: @ 81F5523 - setweather WEATHER_RAIN_LIGHT + setweather WEATHER_RAIN return Route120_EventScript_BerryBeauty:: @ 81F5527 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 8d0837320..92d43e6ad 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C .byte 0 Route124_OnTransition: @ 81F6572 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather end Route124_EventScript_HuntersHouseSign:: @ 81F657C diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 5489c929e..b771e75f9 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -5,24 +5,24 @@ Route125_MapScripts:: @ 81F6748 .byte 0 Route125_OnTransition: @ 81F6758 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST - call_if_eq UnusualWeather_StartKyogreWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST - call_if_eq UnusualWeather_StartKyogreWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST + call_if_eq AbnormalWeather_StartKyogreWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST + call_if_eq AbnormalWeather_StartKyogreWeather end Route125_OnLoad: @ 81F6783 - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125West + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125East end Route125_OnFrame: @ 81F679A - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route125_EventScript_Nolen:: @ 81F67A4 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 3624cc8a5..6fbc43592 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6 .byte 0 Route126_OnTransition: @ 81F68CC - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather end Route126_EventScript_Barry:: @ 81F68D6 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 09d37dd7c..323315b04 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -5,24 +5,24 @@ Route127_MapScripts:: @ 81F69D9 .byte 0 Route127_OnTransition: @ 81F69E9 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH - call_if_eq UnusualWeather_StartKyogreWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH - call_if_eq UnusualWeather_StartKyogreWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH + call_if_eq AbnormalWeather_StartKyogreWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH + call_if_eq AbnormalWeather_StartKyogreWeather end Route127_OnLoad: @ 81F6A14 - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127North + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127South end Route127_OnFrame: @ 81F6A2B - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route127_EventScript_Camden:: @ 81F6A35 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 1c8dbf6d8..68baf63ff 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38 .byte 0 Route128_OnTransition: @ 81F6B43 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather end Route128_OnFrame: @ 81F6B4D diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index ae6c67e87..ea53c3bf2 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -5,29 +5,29 @@ Route129_MapScripts:: @ 81F7284 .byte 0 Route129_OnLoad: @ 81F7294 - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST - call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129West + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST + call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129East end Route129_OnTransition: @ 81F72AB - compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq UnusualWeather_EventScript_HideMapNamePopup + compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1 + call_if_eq AbnormalWeather_EventScript_HideMapNamePopup compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge Route129_EventScript_CheckSetAlternatingWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST - call_if_eq UnusualWeather_StartKyogreWeather - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST - call_if_eq UnusualWeather_StartKyogreWeather + call_if_ge Route129_EventScript_CheckSetAbnormalWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST + call_if_eq AbnormalWeather_StartKyogreWeather + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST + call_if_eq AbnormalWeather_StartKyogreWeather end -Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather +Route129_EventScript_CheckSetAbnormalWeather:: @ 81F72D8 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather return Route129_OnFrame: @ 81F72E2 - map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 + map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1 .2byte 0 Route129_EventScript_Chase:: @ 81F72EC diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index f5bd7e051..141196a2d 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81F735F Route130_OnTransition: @ 81F7365 compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge Route130_EventScript_CheckSetAlternatingWeather + call_if_ge Route130_EventScript_CheckSetAbnormalWeather specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, TRUE goto_if_eq Route130_EventScript_SetMirageIslandLayout @@ -30,8 +30,8 @@ Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1 setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND end -Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather +Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather return Route130_EventScript_Rodney:: @ 81F73BF diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index d26100a10..b419adcf6 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -4,7 +4,7 @@ Route131_MapScripts:: @ 81F7404 Route131_OnTransition: @ 81F740A compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge Route131_EventScript_CheckSetAlternatingWeather + call_if_ge Route131_EventScript_CheckSetAbnormalWeather call Route131_EventScript_SetLayout end @@ -12,8 +12,8 @@ Route131_EventScript_SetLayout:: @ 81F741B setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR return -Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather +Route131_EventScript_CheckSetAbnormalWeather:: @ 81F741F + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather return Route131_EventScript_Richard:: @ 81F7429 diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 05fdafe64..a2f56a8b2 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN01", "region_map_section": "MAPSEC_RUSTURF_TUNNEL", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": true, "allow_escape_rope": true, diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 10904a4e0..210ef6e0d 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -5,7 +5,7 @@ "music": "MUS_TOZAN", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": false, "allow_escape_rope": true, diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 9a6e73085..4adac68a7 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -8,15 +8,15 @@ SkyPillar_Outside_OnTransition: @ 82392B8 compare VAR_SOOTOPOLIS_CITY_STATE, 3 call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather + call_if_ge SkyPillar_Outside_EventScript_CheckSetAbnormalWeather end SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF setflag FLAG_HIDE_MAP_NAME_POPUP return -SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather +SkyPillar_Outside_EventScript_CheckSetAbnormalWeather:: @ 82392D3 + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather return SkyPillar_Outside_OnLoad: @ 82392DD @@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL - setweather WEATHER_ALTERNATING + setweather WEATHER_ABNORMAL doweather special WaitWeather waitstate diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 5ce954eb8..a1e830913 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -106,18 +106,18 @@ SootopolisCity_EventScript_SetWeather:: @ 81E5805 compare VAR_SOOTOPOLIS_CITY_STATE, 6 goto_if_ge SootopolisCity_EventScript_SetNormalWeather compare VAR_SOOTOPOLIS_CITY_STATE, 1 - goto_if_eq SootopolisCity_EventScript_SetHeavyRain + goto_if_eq SootopolisCity_EventScript_SetDownpour compare VAR_SKY_PILLAR_STATE, 1 - goto_if_eq SootopolisCity_EventScript_SetHeavyRain + goto_if_eq SootopolisCity_EventScript_SetDownpour compare VAR_SKY_PILLAR_STATE, 1 - goto_if_le Common_EventScript_SetAlternatingWeather + goto_if_le Common_EventScript_SetAbnormalWeather return SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D return -SootopolisCity_EventScript_SetHeavyRain:: @ 81E583E - setweather WEATHER_RAIN_HEAVY +SootopolisCity_EventScript_SetDownpour:: @ 81E583E + setweather WEATHER_DOWNPOUR return SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842 @@ -215,7 +215,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_ALTERNATING + setweather WEATHER_ABNORMAL doweather setvar VAR_0x8004, 0 special Script_DoRayquazaScene @@ -315,7 +315,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 special RemoveCameraObject delay 60 fadescreenspeed 1, 8 - setweather WEATHER_ALTERNATING + setweather WEATHER_ABNORMAL doweather setvar VAR_0x8004, 0 special Script_DoRayquazaScene diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 40a1006b6..69c6d9991 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN01", "region_map_section": "MAPSEC_TERRA_CAVE", "requires_flash": false, - "weather": "WEATHER_FOG_1", + "weather": "WEATHER_FOG_HORIZONTAL", "map_type": "MAP_TYPE_UNDERGROUND", "allow_bike": false, "allow_escape_rope": true, diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 61f186298..46af23e87 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -47,13 +47,13 @@ TerraCave_End_EventScript_Groudon:: @ 823B0EC goto_if_eq TerraCave_End_EventScript_RanFromGroudon compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq TerraCave_End_EventScript_RanFromGroudon - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 + setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON releaseall end TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155 - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 + setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1 setflag FLAG_DEFEATED_GROUDON goto Common_EventScript_RemoveStaticPokemon end diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index f624ae2ae..c56a74b68 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_124", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 55eff4cca..aeebd4df7 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_125", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 661738011..6d6f35666 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_126", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc index 81435cf7b..e75acd635 100644 --- a/data/maps/Underwater3/scripts.inc +++ b/data/maps/Underwater3/scripts.inc @@ -3,6 +3,6 @@ Underwater3_MapScripts:: @ 81F7724 .byte 0 Underwater3_OnResume: @ 81F772A - call UnusualWeather_Underwater_SetupEscapeWarp + call AbnormalWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index 09b1d05da..bbe09e5d9 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_127", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json index 9a890427c..a74808675 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater5/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_129", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc index 6c435a44d..235d25aba 100644 --- a/data/maps/Underwater5/scripts.inc +++ b/data/maps/Underwater5/scripts.inc @@ -3,6 +3,6 @@ Underwater5_MapScripts:: @ 81F7731 .byte 0 Underwater5_OnResume: @ 81F7737 - call UnusualWeather_Underwater_SetupEscapeWarp + call AbnormalWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json index 771587fbc..4647edaf8 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater6/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc index 655dbde9f..21b639cd8 100644 --- a/data/maps/Underwater6/scripts.inc +++ b/data/maps/Underwater6/scripts.inc @@ -3,6 +3,6 @@ Underwater6_MapScripts:: @ 81F773D .byte 0 Underwater6_OnResume: @ 81F7743 - call UnusualWeather_Underwater_SetupEscapeWarp + call AbnormalWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json index 32e3a3a78..3801c2c86 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater7/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_UNK1", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index 5146731a4..4215dced9 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -3,6 +3,6 @@ Underwater7_MapScripts:: @ 81F7749 .byte 0 Underwater7_OnResume: @ 81F774F - call UnusualWeather_Underwater_SetupEscapeWarp + call AbnormalWeather_Underwater_SetupEscapeWarp end diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index 618807dc4..b4b15bc98 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -5,7 +5,7 @@ "music": "MUS_DAN01", "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index 87b4a5436..54e11075b 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 5cfb3c79b..d03bf9948 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_128", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 6c82073bd..624a763c9 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index 10358d2ba..b2b6b2804 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -5,7 +5,7 @@ "music": "MUS_DEEPDEEP", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "requires_flash": false, - "weather": "WEATHER_BUBBLES", + "weather": "WEATHER_UNDERWATER_BUBBLES", "map_type": "MAP_TYPE_UNDERWATER", "allow_bike": true, "allow_escape_rope": false, diff --git a/data/scripts/unusual_weather.inc b/data/scripts/abnormal_weather.inc index ad6985ac8..9a900f315 100644 --- a/data/scripts/unusual_weather.inc +++ b/data/scripts/abnormal_weather.inc @@ -1,44 +1,44 @@ -UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 +AbnormalWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 +AbnormalWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 +AbnormalWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C +AbnormalWeather_EventScript_PlaceTilesRoute115East:: @ 827394C setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F +AbnormalWeather_EventScript_PlaceTilesRoute116North:: @ 827395F setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 +AbnormalWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 +AbnormalWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 +AbnormalWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 return -UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB +AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB setmetatile 10, 28, METATILE_General_RoughWater, 0 setmetatile 11, 28, METATILE_General_RoughWater, 0 setmetatile 9, 29, METATILE_General_RoughWater, 0 @@ -53,7 +53,7 @@ UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB setmetatile 11, 31, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 +AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 setmetatile 20, 53, METATILE_General_RoughWater, 0 setmetatile 21, 53, METATILE_General_RoughWater, 0 setmetatile 19, 54, METATILE_General_RoughWater, 0 @@ -68,7 +68,7 @@ UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 setmetatile 21, 56, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 +AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 setmetatile 8, 16, METATILE_General_RoughWater, 0 setmetatile 9, 16, METATILE_General_RoughWater, 0 setmetatile 7, 17, METATILE_General_RoughWater, 0 @@ -83,7 +83,7 @@ UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 setmetatile 9, 19, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 +AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 setmetatile 53, 18, METATILE_General_RoughWater, 0 setmetatile 54, 18, METATILE_General_RoughWater, 0 setmetatile 52, 19, METATILE_General_RoughWater, 0 @@ -98,7 +98,7 @@ UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 setmetatile 54, 21, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F +AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F setmetatile 57, 9, METATILE_General_RoughWater, 0 setmetatile 58, 9, METATILE_General_RoughWater, 0 setmetatile 56, 10, METATILE_General_RoughWater, 0 @@ -113,7 +113,7 @@ UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F setmetatile 58, 12, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC +AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC setmetatile 61, 30, METATILE_General_RoughWater, 0 setmetatile 62, 30, METATILE_General_RoughWater, 0 setmetatile 60, 31, METATILE_General_RoughWater, 0 @@ -128,7 +128,7 @@ UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC setmetatile 62, 33, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 +AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 setmetatile 16, 14, METATILE_General_RoughWater, 0 setmetatile 17, 14, METATILE_General_RoughWater, 0 setmetatile 15, 15, METATILE_General_RoughWater, 0 @@ -143,7 +143,7 @@ UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 setmetatile 17, 17, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 +AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 setmetatile 42, 19, METATILE_General_RoughWater, 0 setmetatile 43, 19, METATILE_General_RoughWater, 0 setmetatile 41, 20, METATILE_General_RoughWater, 0 @@ -158,110 +158,110 @@ UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 setmetatile 43, 22, METATILE_General_RoughWater, 0 return -UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13 +AbnormalWeather_EventScript_HideMapNamePopup:: @ 8273D13 setflag FLAG_HIDE_MAP_NAME_POPUP return -UnusualWeather_StartKyogreWeather:: @ 8273D17 - setweather WEATHER_RAIN_HEAVY +AbnormalWeather_StartKyogreWeather:: @ 8273D17 + setweather WEATHER_DOWNPOUR return -UnusualWeather_StartGroudonWeather:: @ 8273D1B +AbnormalWeather_StartGroudonWeather:: @ 8273D1B setweather WEATHER_DROUGHT return -UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F +AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F lockall - compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START - goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage - goto UnusualWeather_EventScript_ShowSunEndedMessage + compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START + goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage + goto AbnormalWeather_EventScript_ShowSunEndedMessage end -UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 +AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 closemessage fadescreenswapbuffers 1 setweather WEATHER_SUNNY doweather - call UnusualWeather_EventScript_CleanupMapTiles + call AbnormalWeather_EventScript_CleanupMapTiles special DrawWholeMapView - setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE - setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 + setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE + setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0 clearflag FLAG_HIDE_MAP_NAME_POPUP fadescreenswapbuffers 0 releaseall end -UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 - msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 +AbnormalWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 + msgbox gText_AbnormalWeatherEnded_Rain, MSGBOX_DEFAULT + goto AbnormalWeather_EventScript_EndEventAndCleanup_2 end -UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F - msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT - goto UnusualWeather_EventScript_EndEventAndCleanup_2 +AbnormalWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F + msgbox gText_AbnormalWeatherEnded_Sun, MSGBOX_DEFAULT + goto AbnormalWeather_EventScript_EndEventAndCleanup_2 end -UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North - case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South - case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West - case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East - case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North - case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South - case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East - case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East - return - -UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 +AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D + switch VAR_ABNORMAL_WEATHER_LOCATION + case ABNORMAL_WEATHER_ROUTE_114_NORTH, AbnormalWeather_EventScript_CleanupRoute114North + case ABNORMAL_WEATHER_ROUTE_114_SOUTH, AbnormalWeather_EventScript_CleanupRoute114South + case ABNORMAL_WEATHER_ROUTE_115_WEST, AbnormalWeather_EventScript_CleanupRoute115West + case ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_EventScript_CleanupRoute115East + case ABNORMAL_WEATHER_ROUTE_116_NORTH, AbnormalWeather_EventScript_CleanupRoute116North + case ABNORMAL_WEATHER_ROUTE_116_SOUTH, AbnormalWeather_EventScript_CleanupRoute116South + case ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_EventScript_CleanupRoute118East + case ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_EventScript_CleanupRoute118West + case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_EventScript_CleanupRoute105North + case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_EventScript_CleanupRoute105South + case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_EventScript_CleanupRoute125West + case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_EventScript_CleanupRoute125East + case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_EventScript_CleanupRoute127North + case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_EventScript_CleanupRoute127South + case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_EventScript_CleanupRoute129West + case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_EventScript_CleanupRoute129East + return + +AbnormalWeather_EventScript_CleanupRoute114North:: @ 8273E23 setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 return -UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 +AbnormalWeather_EventScript_CleanupRoute114South:: @ 8273E36 setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 return -UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 +AbnormalWeather_EventScript_CleanupRoute115West:: @ 8273E49 setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 return -UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C +AbnormalWeather_EventScript_CleanupRoute115East:: @ 8273E5C setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 return -UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F +AbnormalWeather_EventScript_CleanupRoute116North:: @ 8273E6F setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 return -UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 +AbnormalWeather_EventScript_CleanupRoute116South:: @ 8273E82 setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 return -UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 +AbnormalWeather_EventScript_CleanupRoute118East:: @ 8273E95 setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 return -UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 +AbnormalWeather_EventScript_CleanupRoute118West:: @ 8273EA8 setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 return -UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB +AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB setmetatile 10, 28, METATILE_General_CalmWater, 0 setmetatile 11, 28, METATILE_General_CalmWater, 0 setmetatile 9, 29, METATILE_General_CalmWater, 0 @@ -276,7 +276,7 @@ UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB setmetatile 11, 31, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 +AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28 setmetatile 20, 53, METATILE_General_CalmWater, 0 setmetatile 21, 53, METATILE_General_CalmWater, 0 setmetatile 19, 54, METATILE_General_CalmWater, 0 @@ -291,7 +291,7 @@ UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 setmetatile 21, 56, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 +AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95 setmetatile 8, 16, METATILE_General_CalmWater, 0 setmetatile 9, 16, METATILE_General_CalmWater, 0 setmetatile 7, 17, METATILE_General_CalmWater, 0 @@ -306,7 +306,7 @@ UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 setmetatile 9, 19, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 +AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002 setmetatile 53, 18, METATILE_General_CalmWater, 0 setmetatile 54, 18, METATILE_General_CalmWater, 0 setmetatile 52, 19, METATILE_General_CalmWater, 0 @@ -321,7 +321,7 @@ UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 setmetatile 54, 21, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F +AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F setmetatile 57, 9, METATILE_General_CalmWater, 0 setmetatile 58, 9, METATILE_General_CalmWater, 0 setmetatile 56, 10, METATILE_General_CalmWater, 0 @@ -336,7 +336,7 @@ UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F setmetatile 58, 12, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC +AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC setmetatile 61, 30, METATILE_General_CalmWater, 0 setmetatile 62, 30, METATILE_General_CalmWater, 0 setmetatile 60, 31, METATILE_General_CalmWater, 0 @@ -351,7 +351,7 @@ UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC setmetatile 62, 33, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 +AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149 setmetatile 16, 14, METATILE_General_CalmWater, 0 setmetatile 17, 14, METATILE_General_CalmWater, 0 setmetatile 15, 15, METATILE_General_CalmWater, 0 @@ -366,7 +366,7 @@ UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 setmetatile 17, 17, METATILE_General_CalmWater, 0 return -UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 +AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6 setmetatile 42, 19, METATILE_General_CalmWater, 0 setmetatile 43, 19, METATILE_General_CalmWater, 0 setmetatile 41, 20, METATILE_General_CalmWater, 0 @@ -381,46 +381,46 @@ UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 setmetatile 43, 22, METATILE_General_CalmWater, 0 return -UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 - switch VAR_UNUSUAL_WEATHER_LOCATION - case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North - case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South - case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West - case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East - case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North - case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South - case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West - case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East +AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223 + switch VAR_ABNORMAL_WEATHER_LOCATION + case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105North + case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105South + case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125West + case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125East + case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127North + case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127South + case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129West + case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129East return -UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 +AbnormalWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 setescapewarp MAP_ROUTE105, 255, 11, 29 return -UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A +AbnormalWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A setescapewarp MAP_ROUTE105, 255, 21, 54 return -UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 +AbnormalWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 setescapewarp MAP_ROUTE125, 255, 9, 17 return -UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C +AbnormalWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C setescapewarp MAP_ROUTE125, 255, 54, 19 return -UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 +AbnormalWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 setescapewarp MAP_ROUTE127, 255, 58, 10 return -UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE +AbnormalWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE setescapewarp MAP_ROUTE127, 255, 62, 31 return -UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 +AbnormalWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 setescapewarp MAP_ROUTE129, 255, 17, 15 return -UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 +AbnormalWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 setescapewarp MAP_ROUTE129, 255, 43, 20 return diff --git a/data/specials.inc b/data/specials.inc index b2d2fe5fa..cd2df1ae0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -499,8 +499,8 @@ gSpecials:: @ 81DBA64 def_special ShouldShowBoxWasFullMessage def_special SetMatchCallRegisteredFlag def_special sub_8175280 - def_special CreateUnusualWeatherEvent - def_special GetUnusualWeatherMapNameAndType + def_special CreateAbnormalWeatherEvent + def_special GetAbnormalWeatherMapNameAndType def_special GetMartEmployeeObjectEventId def_special sub_80A08CC def_special Unused_SetWeatherSunny diff --git a/data/text/unusual_weather.inc b/data/text/abnormal_weather.inc index e6dc9b1d0..42e61e68d 100644 --- a/data/text/unusual_weather.inc +++ b/data/text/abnormal_weather.inc @@ -1,7 +1,7 @@ -gText_UnusualWeatherEnded_Rain:: @ 8273656 +gText_AbnormalWeatherEnded_Rain:: @ 8273656 .string "The massive downpour appears to\n" .string "have stopped…$" -gText_UnusualWeatherEnded_Sun:: @ 8273684 +gText_AbnormalWeatherEnded_Sun:: @ 8273684 .string "The intense sunshine appears to\n" .string "have subsided…$" |