dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Sync weather names

Browse Source
This commit is contained in:
GriffinR
2019-12-01 19:19:47 -05:00
committed by huderlem
parent 7beddd16dd
commit a4191040c9
92 changed files with 499 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+4 -4
View File
@@ -763,8 +763,8 @@ Common_EventScript_NoRoomForDecor:: @ 8272071
msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
return return
Common_EventScript_SetAlternatingWeather:: @ 827207A Common_EventScript_SetAbnormalWeather:: @ 827207A
setweather WEATHER_ALTERNATING setweather WEATHER_ABNORMAL
return return
Common_EventScript_PlayGymBadgeFanfare:: @ 827207E Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
@@ -1012,7 +1012,7 @@ gText_LegendaryFlewAway:: @ 8273204
.include "data/text/pc_transfer.inc" .include "data/text/pc_transfer.inc"
.include "data/text/mevent.inc" .include "data/text/mevent.inc"
.include "data/text/unusual_weather.inc" .include "data/text/abnormal_weather.inc"
EventScript_SelectWithoutRegisteredItem:: @ 82736B3 EventScript_SelectWithoutRegisteredItem:: @ 82736B3
msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
@@ -1062,7 +1062,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776
.include "data/scripts/pc_transfer.inc" .include "data/scripts/pc_transfer.inc"
.include "data/scripts/mevent.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/trainer_script.inc"
.include "data/scripts/berry_tree.inc" .include "data/scripts/berry_tree.inc"
.include "data/scripts/secret_base.inc" .include "data/scripts/secret_base.inc"
data/maps/AbandonedShip_CaptainsOffice/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Corridors_1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Corridors_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Room_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Rooms2_1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Rooms2_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Rooms_1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Rooms_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/AbandonedShip_Underwater1/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/AbandonedShip_Underwater2/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_ABANDONED_SHIP", "region_map_section": "MAPSEC_ABANDONED_SHIP",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/CaveOfOrigin_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_NONE", "music": "MUS_NONE",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN03", "music": "MUS_DAN03",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true, "requires_flash": true,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN03", "music": "MUS_DAN03",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN", "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": true, "requires_flash": true,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/EverGrandeCity/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 81E7D1B
.byte 0 .byte 0
EverGrandeCity_OnTransition: @ 81E7D21 EverGrandeCity_OnTransition: @ 81E7D21
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
end end
EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B
data/maps/FarawayIsland_Entrance/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ FarawayIsland_Entrance_OnTransition: @ 8267C94
end end
FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98 FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98
setweather WEATHER_CLOUDS setweather WEATHER_SUNNY_CLOUDS
doweather doweather
end end
data/maps/FarawayIsland_Interior/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_FARAWAY_ISLAND", "region_map_section": "MAPSEC_FARAWAY_ISLAND",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_INDOOR", "map_type": "MAP_TYPE_INDOOR",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/JaggedPass/map.json
+1 -1
View File
@@ -156,7 +156,7 @@
"x": 21, "x": 21,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
data/maps/JaggedPass/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ JaggedPass_OnTransition: @ 823068B
end end
JaggedPass_EventScript_SetWeatherAsh:: @ 8230697 JaggedPass_EventScript_SetWeatherAsh:: @ 8230697
setweather WEATHER_ASH setweather WEATHER_VOLCANIC_ASH
doweather doweather
return return
data/maps/LavaridgeTown_Gym_1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_GIM", "music": "MUS_GIM",
"region_map_section": "MAPSEC_LAVARIDGE_TOWN", "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_INDOOR", "map_type": "MAP_TYPE_INDOOR",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/LavaridgeTown_Gym_B1F/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_GIM", "music": "MUS_GIM",
"region_map_section": "MAPSEC_LAVARIDGE_TOWN", "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_INDOOR", "map_type": "MAP_TYPE_INDOOR",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/LilycoveCity/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ LilycoveCity_OnTransition: @ 81E2B47
setflag FLAG_VISITED_LILYCOVE_CITY setflag FLAG_VISITED_LILYCOVE_CITY
setvar VAR_CONTEST_HALL_STATE, 0 setvar VAR_CONTEST_HALL_STATE, 0
setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER 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 call Common_EventScript_SetupRivalGfxId
end end
data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+1 -1
View File
@@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp
.byte 0 .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 @ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors
LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80 LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80
map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
data/maps/MarineCave_End/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN01", "music": "MUS_DAN01",
"region_map_section": "MAPSEC_MARINE_CAVE", "region_map_section": "MAPSEC_MARINE_CAVE",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/MarineCave_End/scripts.inc
+2 -2
View File
@@ -47,13 +47,13 @@ MarineCave_End_EventScript_Kyogre:: @ 823B01B
goto_if_eq MarineCave_End_EventScript_RanFromKyogre goto_if_eq MarineCave_End_EventScript_RanFromKyogre
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq MarineCave_End_EventScript_RanFromKyogre 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 setflag FLAG_DEFEATED_KYOGRE
releaseall releaseall
end end
MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084 MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084
setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
setflag FLAG_DEFEATED_KYOGRE setflag FLAG_DEFEATED_KYOGRE
goto Common_EventScript_RemoveStaticPokemon goto Common_EventScript_RemoveStaticPokemon
end end
data/maps/MossdeepCity/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ MossdeepCity_OnTransition: @ 81E4A9C
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 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 end
MossdeepCity_EventScript_PokefanF:: @ 81E4AB2 MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
data/maps/MtChimney/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_TOZAN", "music": "MUS_TOZAN",
"region_map_section": "MAPSEC_MT_CHIMNEY", "region_map_section": "MAPSEC_MT_CHIMNEY",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_ASH", "weather": "WEATHER_VOLCANIC_ASH",
"map_type": "MAP_TYPE_ROUTE", "map_type": "MAP_TYPE_ROUTE",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/MtPyre_Exterior/scripts.inc
+2 -2
View File
@@ -13,11 +13,11 @@ MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
return return
MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9 MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
setweather WEATHER_FOG_1 setweather WEATHER_FOG_HORIZONTAL
return return
MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
setweather WEATHER_FOG_1 setweather WEATHER_FOG_HORIZONTAL
doweather doweather
end end
data/maps/MtPyre_Summit/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_MACHUPI", "music": "MUS_MACHUPI",
"region_map_section": "MAPSEC_MT_PYRE", "region_map_section": "MAPSEC_MT_PYRE",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_ROUTE", "map_type": "MAP_TYPE_ROUTE",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/NavelRock_Top/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_RG_NANADUNGEON", "music": "MUS_RG_NANADUNGEON",
"region_map_section": "MAPSEC_NAVEL_ROCK2", "region_map_section": "MAPSEC_NAVEL_ROCK2",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/PetalburgWoods/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN01", "music": "MUS_DAN01",
"region_map_section": "MAPSEC_PETALBURG_WOODS", "region_map_section": "MAPSEC_PETALBURG_WOODS",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_ROUTE", "map_type": "MAP_TYPE_ROUTE",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Route105/scripts.inc
+11 -11
View File
@@ -6,10 +6,10 @@ Route105_MapScripts:: @ 81EE1DB
Route105_OnLoad: @ 81EE1EB Route105_OnLoad: @ 81EE1EB
call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105North call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105North
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute105South call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105South
end end
Route105_CloseRegiEntrance:: @ 81EE20B Route105_CloseRegiEntrance:: @ 81EE20B
@@ -18,16 +18,16 @@ Route105_CloseRegiEntrance:: @ 81EE20B
return return
Route105_OnTransition: @ 81EE21E Route105_OnTransition: @ 81EE21E
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_SOUTH
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
end end
Route105_OnFrame: @ 81EE240 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 .2byte 0
Route105_EventScript_Foster:: @ 81EE24A Route105_EventScript_Foster:: @ 81EE24A
data/maps/Route113/map.json
+11 -11
View File
@@ -268,49 +268,49 @@
"x": 19, "x": 19,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 19, "x": 19,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 19, "x": 19,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 19, "x": 19,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 86, "x": 86,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 85, "x": 85,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 85, "x": 85,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
@@ -373,28 +373,28 @@
"x": 19, "x": 19,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 87, "x": 87,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 87, "x": 87,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
}, },
{ {
"type": "weather", "type": "weather",
"x": 87, "x": 87,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_ASH" "weather": "COORD_EVENT_WEATHER_VOLCANIC_ASH"
} }
], ],
"bg_events": [ "bg_events": [
data/maps/Route113/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ Route113_EventScript_CheckSetAshWeather:: @ 81F216A
goto_if_lt Route113_EventScript_DontSetAshWeather goto_if_lt Route113_EventScript_DontSetAshWeather
compare VAR_TEMP_0, 84 compare VAR_TEMP_0, 84
goto_if_gt Route113_EventScript_DontSetAshWeather goto_if_gt Route113_EventScript_DontSetAshWeather
setweather WEATHER_ASH setweather WEATHER_VOLCANIC_ASH
return return
Route113_EventScript_DontSetAshWeather:: @ 81F2189 Route113_EventScript_DontSetAshWeather:: @ 81F2189
data/maps/Route114/scripts.inc
+11 -11
View File
@@ -5,23 +5,23 @@ Route114_MapScripts:: @ 81F252F
.byte 0 .byte 0
Route114_OnTransition: @ 81F253F Route114_OnTransition: @ 81F253F
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
end end
Route114_OnLoad: @ 81F2561 Route114_OnLoad: @ 81F2561
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114North
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114South
end end
Route114_OnFrame: @ 81F2578 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 .2byte 0
Route114_EventScript_Man:: @ 81F2582 Route114_EventScript_Man:: @ 81F2582
data/maps/Route115/scripts.inc
+11 -11
View File
@@ -5,23 +5,23 @@ Route115_MapScripts:: @ 81F2920
.byte 0 .byte 0
Route115_OnLoad: @ 81F2930 Route115_OnLoad: @ 81F2930
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115West
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115East
end end
Route115_OnTransition: @ 81F2947 Route115_OnTransition: @ 81F2947
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
end end
Route115_OnFrame: @ 81F2969 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 .2byte 0
Route115_EventScript_Woman:: @ 81F2973 Route115_EventScript_Woman:: @ 81F2973
data/maps/Route116/scripts.inc
+11 -11
View File
@@ -6,12 +6,12 @@ Route116_MapScripts:: @ 81F2C0C
Route116_OnTransition: @ 81F2C1C Route116_OnTransition: @ 81F2C1C
call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
end end
Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47 Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
@@ -19,14 +19,14 @@ Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
return return
Route116_OnLoad: @ 81F2C4F Route116_OnLoad: @ 81F2C4F
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116North
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116South
end end
Route116_OnFrame: @ 81F2C66 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 .2byte 0
Route116_EventScript_WandasBoyfriend:: @ 81F2C70 Route116_EventScript_WandasBoyfriend:: @ 81F2C70
data/maps/Route118/scripts.inc
+11 -11
View File
@@ -6,23 +6,23 @@ Route118_MapScripts:: @ 81F3DBC
Route118_OnTransition: @ 81F3DCC Route118_OnTransition: @ 81F3DCC
call GabbyAndTy_EventScript_UpdateLocation call GabbyAndTy_EventScript_UpdateLocation
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
call_if_eq UnusualWeather_StartGroudonWeather call_if_eq AbnormalWeather_StartGroudonWeather
end end
Route118_OnLoad: @ 81F3DF3 Route118_OnLoad: @ 81F3DF3
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West
end end
Route118_OnFrame: @ 81F3E0A 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 .2byte 0
Route118_EventScript_GoodRodFisherman:: @ 81F3E14 Route118_EventScript_GoodRodFisherman:: @ 81F3E14
data/maps/Route119_WeatherInstitute_1F/scripts.inc
+2 -2
View File
@@ -36,7 +36,7 @@ Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8
call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated
compare VAR_0x8004, 2 @ Both defeated compare VAR_0x8004, 2 @ Both defeated
goto_if_eq Route119_WeatherInstitute_1F_EventScript_StudyingRain 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 release
end end
@@ -116,7 +116,7 @@ Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E
.string "And thus, the PROFESSOR is studying\n" .string "And thus, the PROFESSOR is studying\n"
.string "if the rain can be put to good use.$" .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 "On the 2nd floor of the INSTITUTE,\n"
.string "we study the weather patterns over\l" .string "we study the weather patterns over\l"
.string "the HOENN region.\p" .string "the HOENN region.\p"
data/maps/Route119_WeatherInstitute_2F/scripts.inc
+6 -6
View File
@@ -131,19 +131,19 @@ Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA
end end
Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7 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 msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT
release release
end end
Route119_WeatherInstitute_2F_EventScript_TryStartUnusualWeather:: @ 827010A Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather:: @ 827010A
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
compare VAR_0x8004, 2 @ Both defeated compare VAR_0x8004, 2 @ Both defeated
goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather goto_if_eq Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather
call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather
specialvar VAR_RESULT, GetUnusualWeatherMapNameAndType specialvar VAR_RESULT, GetAbnormalWeatherMapNameAndType
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather goto_if_eq Route119_WeatherInstitute_2F_EventScript_KyogreWeather
msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT msgbox Route119_WeatherInstitute_2F_Text_GroudonWeather, MSGBOX_DEFAULT
@@ -155,8 +155,8 @@ Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F
release release
end end
Route119_WeatherInstitute_2F_EventScript_CreateUnusualWeather:: @ 8270159 Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather:: @ 8270159
special CreateUnusualWeatherEvent special CreateAbnormalWeatherEvent
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
return return
data/maps/Route120/map.json
+16 -16
View File
@@ -620,63 +620,63 @@
"x": 7, "x": 7,
"y": 15, "y": 15,
"elevation": 0, "elevation": 0,
"weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" "weather": "COORD_EVENT_WEATHER_RAIN"
}, },
{ {
"type": "weather", "type": "weather",
"x": 7, "x": 7,
"y": 16, "y": 16,
"elevation": 0, "elevation": 0,
"weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" "weather": "COORD_EVENT_WEATHER_RAIN"
}, },
{ {
"type": "weather", "type": "weather",
"x": 22, "x": 22,
"y": 61, "y": 61,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" "weather": "COORD_EVENT_WEATHER_RAIN"
}, },
{ {
"type": "weather", "type": "weather",
"x": 12, "x": 12,
"y": 64, "y": 64,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" "weather": "COORD_EVENT_WEATHER_RAIN"
}, },
{ {
"type": "weather", "type": "weather",
"x": 35, "x": 35,
"y": 63, "y": 63,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 36, "x": 36,
"y": 63, "y": 63,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 37, "x": 37,
"y": 63, "y": 63,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 38, "x": 38,
"y": 63, "y": 63,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 32, "x": 32,
"y": 88, "y": 88,
"elevation": 5, "elevation": 5,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
@@ -704,49 +704,49 @@
"x": 32, "x": 32,
"y": 89, "y": 89,
"elevation": 5, "elevation": 5,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 32, "x": 32,
"y": 90, "y": 90,
"elevation": 5, "elevation": 5,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 32, "x": 32,
"y": 91, "y": 91,
"elevation": 5, "elevation": 5,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 10, "x": 10,
"y": 75, "y": 75,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 11, "x": 11,
"y": 75, "y": 75,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 12, "x": 12,
"y": 75, "y": 75,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
}, },
{ {
"type": "weather", "type": "weather",
"x": 13, "x": 13,
"y": 75, "y": 75,
"elevation": 3, "elevation": 3,
"weather": "COORD_EVENT_WEATHER_CLOUDS" "weather": "COORD_EVENT_WEATHER_SUNNY_CLOUDS"
} }
], ],
"bg_events": [ "bg_events": [
data/maps/Route120/scripts.inc
+2 -2
View File
@@ -76,7 +76,7 @@ Route120_EventScript_SetWeather:: @ 81F54D8
return return
Route120_EventScript_SetCloudyWeather:: @ 81F54FF Route120_EventScript_SetCloudyWeather:: @ 81F54FF
setweather WEATHER_CLOUDS setweather WEATHER_SUNNY_CLOUDS
return return
Route120_EventScript_SetSunnyWeather:: @ 81F5503 Route120_EventScript_SetSunnyWeather:: @ 81F5503
@@ -92,7 +92,7 @@ Route120_EventScript_TrySetRainyWeather:: @ 81F5507
end end
Route120_EventScript_SetRainyWeather:: @ 81F5523 Route120_EventScript_SetRainyWeather:: @ 81F5523
setweather WEATHER_RAIN_LIGHT setweather WEATHER_RAIN
return return
Route120_EventScript_BerryBeauty:: @ 81F5527 Route120_EventScript_BerryBeauty:: @ 81F5527
data/maps/Route124/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ Route124_MapScripts:: @ 81F656C
.byte 0 .byte 0
Route124_OnTransition: @ 81F6572 Route124_OnTransition: @ 81F6572
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
end end
Route124_EventScript_HuntersHouseSign:: @ 81F657C Route124_EventScript_HuntersHouseSign:: @ 81F657C
data/maps/Route125/scripts.inc
+12 -12
View File
@@ -5,24 +5,24 @@ Route125_MapScripts:: @ 81F6748
.byte 0 .byte 0
Route125_OnTransition: @ 81F6758 Route125_OnTransition: @ 81F6758
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
end end
Route125_OnLoad: @ 81F6783 Route125_OnLoad: @ 81F6783
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125West
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125East
end end
Route125_OnFrame: @ 81F679A 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 .2byte 0
Route125_EventScript_Nolen:: @ 81F67A4 Route125_EventScript_Nolen:: @ 81F67A4
data/maps/Route126/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ Route126_MapScripts:: @ 81F68C6
.byte 0 .byte 0
Route126_OnTransition: @ 81F68CC Route126_OnTransition: @ 81F68CC
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
end end
Route126_EventScript_Barry:: @ 81F68D6 Route126_EventScript_Barry:: @ 81F68D6
data/maps/Route127/scripts.inc
+12 -12
View File
@@ -5,24 +5,24 @@ Route127_MapScripts:: @ 81F69D9
.byte 0 .byte 0
Route127_OnTransition: @ 81F69E9 Route127_OnTransition: @ 81F69E9
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
end end
Route127_OnLoad: @ 81F6A14 Route127_OnLoad: @ 81F6A14
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127North
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127South
end end
Route127_OnFrame: @ 81F6A2B 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 .2byte 0
Route127_EventScript_Camden:: @ 81F6A35 Route127_EventScript_Camden:: @ 81F6A35
data/maps/Route128/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38
.byte 0 .byte 0
Route128_OnTransition: @ 81F6B43 Route128_OnTransition: @ 81F6B43
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
end end
Route128_OnFrame: @ 81F6B4D Route128_OnFrame: @ 81F6B4D
data/maps/Route129/scripts.inc
+14 -14
View File
@@ -5,29 +5,29 @@ Route129_MapScripts:: @ 81F7284
.byte 0 .byte 0
Route129_OnLoad: @ 81F7294 Route129_OnLoad: @ 81F7294
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129West
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129East
end end
Route129_OnTransition: @ 81F72AB Route129_OnTransition: @ 81F72AB
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
call_if_eq UnusualWeather_EventScript_HideMapNamePopup call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
compare VAR_SOOTOPOLIS_CITY_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route129_EventScript_CheckSetAlternatingWeather call_if_ge Route129_EventScript_CheckSetAbnormalWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
call_if_eq UnusualWeather_StartKyogreWeather call_if_eq AbnormalWeather_StartKyogreWeather
end end
Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8 Route129_EventScript_CheckSetAbnormalWeather:: @ 81F72D8
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return return
Route129_OnFrame: @ 81F72E2 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 .2byte 0
Route129_EventScript_Chase:: @ 81F72EC Route129_EventScript_Chase:: @ 81F72EC
data/maps/Route130/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81F735F
Route130_OnTransition: @ 81F7365 Route130_OnTransition: @ 81F7365
compare VAR_SOOTOPOLIS_CITY_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route130_EventScript_CheckSetAlternatingWeather call_if_ge Route130_EventScript_CheckSetAbnormalWeather
specialvar VAR_RESULT, IsMirageIslandPresent specialvar VAR_RESULT, IsMirageIslandPresent
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq Route130_EventScript_SetMirageIslandLayout goto_if_eq Route130_EventScript_SetMirageIslandLayout
@@ -30,8 +30,8 @@ Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
end end
Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5 Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return return
Route130_EventScript_Rodney:: @ 81F73BF Route130_EventScript_Rodney:: @ 81F73BF
data/maps/Route131/scripts.inc
+3 -3
View File
@@ -4,7 +4,7 @@ Route131_MapScripts:: @ 81F7404
Route131_OnTransition: @ 81F740A Route131_OnTransition: @ 81F740A
compare VAR_SOOTOPOLIS_CITY_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge Route131_EventScript_CheckSetAlternatingWeather call_if_ge Route131_EventScript_CheckSetAbnormalWeather
call Route131_EventScript_SetLayout call Route131_EventScript_SetLayout
end end
@@ -12,8 +12,8 @@ Route131_EventScript_SetLayout:: @ 81F741B
setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
return return
Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F Route131_EventScript_CheckSetAbnormalWeather:: @ 81F741F
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return return
Route131_EventScript_Richard:: @ 81F7429 Route131_EventScript_Richard:: @ 81F7429
data/maps/RusturfTunnel/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN01", "music": "MUS_DAN01",
"region_map_section": "MAPSEC_RUSTURF_TUNNEL", "region_map_section": "MAPSEC_RUSTURF_TUNNEL",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/SeafloorCavern_Room9/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_TOZAN", "music": "MUS_TOZAN",
"region_map_section": "MAPSEC_SEAFLOOR_CAVERN", "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/SkyPillar_Outside/scripts.inc
+4 -4
View File
@@ -8,15 +8,15 @@ SkyPillar_Outside_OnTransition: @ 82392B8
compare VAR_SOOTOPOLIS_CITY_STATE, 3 compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup
compare VAR_SOOTOPOLIS_CITY_STATE, 4 compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_ge SkyPillar_Outside_EventScript_CheckSetAlternatingWeather call_if_ge SkyPillar_Outside_EventScript_CheckSetAbnormalWeather
end end
SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF
setflag FLAG_HIDE_MAP_NAME_POPUP setflag FLAG_HIDE_MAP_NAME_POPUP
return return
SkyPillar_Outside_EventScript_CheckSetAlternatingWeather:: @ 82392D3 SkyPillar_Outside_EventScript_CheckSetAbnormalWeather:: @ 82392D3
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
return return
SkyPillar_Outside_OnLoad: @ 82392DD SkyPillar_Outside_OnLoad: @ 82392DD
@@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT
closemessage closemessage
setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_SYS_WEATHER_CTRL
setweather WEATHER_ALTERNATING setweather WEATHER_ABNORMAL
doweather doweather
special WaitWeather special WaitWeather
waitstate waitstate
data/maps/SootopolisCity/scripts.inc
+7 -7
View File
@@ -106,18 +106,18 @@ SootopolisCity_EventScript_SetWeather:: @ 81E5805
compare VAR_SOOTOPOLIS_CITY_STATE, 6 compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_SetNormalWeather goto_if_ge SootopolisCity_EventScript_SetNormalWeather
compare VAR_SOOTOPOLIS_CITY_STATE, 1 compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_eq SootopolisCity_EventScript_SetHeavyRain goto_if_eq SootopolisCity_EventScript_SetDownpour
compare VAR_SKY_PILLAR_STATE, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_eq SootopolisCity_EventScript_SetHeavyRain goto_if_eq SootopolisCity_EventScript_SetDownpour
compare VAR_SKY_PILLAR_STATE, 1 compare VAR_SKY_PILLAR_STATE, 1
goto_if_le Common_EventScript_SetAlternatingWeather goto_if_le Common_EventScript_SetAbnormalWeather
return return
SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D
return return
SootopolisCity_EventScript_SetHeavyRain:: @ 81E583E SootopolisCity_EventScript_SetDownpour:: @ 81E583E
setweather WEATHER_RAIN_HEAVY setweather WEATHER_DOWNPOUR
return return
SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842 SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842
@@ -215,7 +215,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed 1, 8
setweather WEATHER_ALTERNATING setweather WEATHER_ABNORMAL
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special Script_DoRayquazaScene special Script_DoRayquazaScene
@@ -315,7 +315,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed 1, 8
setweather WEATHER_ALTERNATING setweather WEATHER_ABNORMAL
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special Script_DoRayquazaScene special Script_DoRayquazaScene
data/maps/SouthernIsland_Interior/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN02", "music": "MUS_DAN02",
"region_map_section": "MAPSEC_SOUTHERN_ISLAND", "region_map_section": "MAPSEC_SOUTHERN_ISLAND",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_SHADE", "weather": "WEATHER_CLOUDY",
"map_type": "MAP_TYPE_ROUTE", "map_type": "MAP_TYPE_ROUTE",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/TerraCave_End/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN01", "music": "MUS_DAN01",
"region_map_section": "MAPSEC_TERRA_CAVE", "region_map_section": "MAPSEC_TERRA_CAVE",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_FOG_1", "weather": "WEATHER_FOG_HORIZONTAL",
"map_type": "MAP_TYPE_UNDERGROUND", "map_type": "MAP_TYPE_UNDERGROUND",
"allow_bike": false, "allow_bike": false,
"allow_escape_rope": true, "allow_escape_rope": true,
data/maps/TerraCave_End/scripts.inc
+2 -2
View File
@@ -47,13 +47,13 @@ TerraCave_End_EventScript_Groudon:: @ 823B0EC
goto_if_eq TerraCave_End_EventScript_RanFromGroudon goto_if_eq TerraCave_End_EventScript_RanFromGroudon
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq TerraCave_End_EventScript_RanFromGroudon 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 setflag FLAG_DEFEATED_GROUDON
releaseall releaseall
end end
TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155 TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155
setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1 setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
setflag FLAG_DEFEATED_GROUDON setflag FLAG_DEFEATED_GROUDON
goto Common_EventScript_RemoveStaticPokemon goto Common_EventScript_RemoveStaticPokemon
end end
data/maps/Underwater1/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_124", "region_map_section": "MAPSEC_UNDERWATER_124",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater2/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_125", "region_map_section": "MAPSEC_UNDERWATER_125",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater3/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_126", "region_map_section": "MAPSEC_UNDERWATER_126",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater3/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ Underwater3_MapScripts:: @ 81F7724
.byte 0 .byte 0
Underwater3_OnResume: @ 81F772A Underwater3_OnResume: @ 81F772A
call UnusualWeather_Underwater_SetupEscapeWarp call AbnormalWeather_Underwater_SetupEscapeWarp
end end
data/maps/Underwater4/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_127", "region_map_section": "MAPSEC_UNDERWATER_127",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater5/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_129", "region_map_section": "MAPSEC_UNDERWATER_129",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater5/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ Underwater5_MapScripts:: @ 81F7731
.byte 0 .byte 0
Underwater5_OnResume: @ 81F7737 Underwater5_OnResume: @ 81F7737
call UnusualWeather_Underwater_SetupEscapeWarp call AbnormalWeather_Underwater_SetupEscapeWarp
end end
data/maps/Underwater6/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater6/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ Underwater6_MapScripts:: @ 81F773D
.byte 0 .byte 0
Underwater6_OnResume: @ 81F7743 Underwater6_OnResume: @ 81F7743
call UnusualWeather_Underwater_SetupEscapeWarp call AbnormalWeather_Underwater_SetupEscapeWarp
end end
data/maps/Underwater7/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_UNK1", "region_map_section": "MAPSEC_UNDERWATER_UNK1",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater7/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ Underwater7_MapScripts:: @ 81F7749
.byte 0 .byte 0
Underwater7_OnResume: @ 81F774F Underwater7_OnResume: @ 81F774F
call UnusualWeather_Underwater_SetupEscapeWarp call AbnormalWeather_Underwater_SetupEscapeWarp
end end
data/maps/Underwater_MarineCave/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DAN01", "music": "MUS_DAN01",
"region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater_Route134/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater_SeafloorCavern/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_128", "region_map_section": "MAPSEC_UNDERWATER_128",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater_SealedChamber/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/maps/Underwater_SootopolisCity/map.json
+1 -1
View File
@@ -5,7 +5,7 @@
"music": "MUS_DEEPDEEP", "music": "MUS_DEEPDEEP",
"region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
"requires_flash": false, "requires_flash": false,
"weather": "WEATHER_BUBBLES", "weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER", "map_type": "MAP_TYPE_UNDERWATER",
"allow_bike": true, "allow_bike": true,
"allow_escape_rope": false, "allow_escape_rope": false,
data/scripts/unusual_weather.inc → data/scripts/abnormal_weather.inc
+86 -86
View File
@@ -1,44 +1,44 @@
UnusualWeather_EventScript_PlaceTilesRoute114North:: @ 8273913 AbnormalWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1 setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1
setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0 setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute114South:: @ 8273926 AbnormalWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute115West:: @ 8273939 AbnormalWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute115East:: @ 827394C AbnormalWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1 setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0 setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute116North:: @ 827395F AbnormalWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1 setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1
setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0 setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute116South:: @ 8273972 AbnormalWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0 setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute118East:: @ 8273985 AbnormalWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0 setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute118West:: @ 8273998 AbnormalWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1 setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1
setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0 setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
setmetatile 10, 28, METATILE_General_RoughWater, 0 setmetatile 10, 28, METATILE_General_RoughWater, 0
setmetatile 11, 28, METATILE_General_RoughWater, 0 setmetatile 11, 28, METATILE_General_RoughWater, 0
setmetatile 9, 29, 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 setmetatile 11, 31, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18 AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
setmetatile 20, 53, METATILE_General_RoughWater, 0 setmetatile 20, 53, METATILE_General_RoughWater, 0
setmetatile 21, 53, METATILE_General_RoughWater, 0 setmetatile 21, 53, METATILE_General_RoughWater, 0
setmetatile 19, 54, 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 setmetatile 21, 56, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85 AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
setmetatile 8, 16, METATILE_General_RoughWater, 0 setmetatile 8, 16, METATILE_General_RoughWater, 0
setmetatile 9, 16, METATILE_General_RoughWater, 0 setmetatile 9, 16, METATILE_General_RoughWater, 0
setmetatile 7, 17, 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 setmetatile 9, 19, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2 AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
setmetatile 53, 18, METATILE_General_RoughWater, 0 setmetatile 53, 18, METATILE_General_RoughWater, 0
setmetatile 54, 18, METATILE_General_RoughWater, 0 setmetatile 54, 18, METATILE_General_RoughWater, 0
setmetatile 52, 19, 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 setmetatile 54, 21, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
setmetatile 57, 9, METATILE_General_RoughWater, 0 setmetatile 57, 9, METATILE_General_RoughWater, 0
setmetatile 58, 9, METATILE_General_RoughWater, 0 setmetatile 58, 9, METATILE_General_RoughWater, 0
setmetatile 56, 10, 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 setmetatile 58, 12, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
setmetatile 61, 30, METATILE_General_RoughWater, 0 setmetatile 61, 30, METATILE_General_RoughWater, 0
setmetatile 62, 30, METATILE_General_RoughWater, 0 setmetatile 62, 30, METATILE_General_RoughWater, 0
setmetatile 60, 31, 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 setmetatile 62, 33, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39 AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
setmetatile 16, 14, METATILE_General_RoughWater, 0 setmetatile 16, 14, METATILE_General_RoughWater, 0
setmetatile 17, 14, METATILE_General_RoughWater, 0 setmetatile 17, 14, METATILE_General_RoughWater, 0
setmetatile 15, 15, 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 setmetatile 17, 17, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6 AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
setmetatile 42, 19, METATILE_General_RoughWater, 0 setmetatile 42, 19, METATILE_General_RoughWater, 0
setmetatile 43, 19, METATILE_General_RoughWater, 0 setmetatile 43, 19, METATILE_General_RoughWater, 0
setmetatile 41, 20, 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 setmetatile 43, 22, METATILE_General_RoughWater, 0
return return
UnusualWeather_EventScript_HideMapNamePopup:: @ 8273D13 AbnormalWeather_EventScript_HideMapNamePopup:: @ 8273D13
setflag FLAG_HIDE_MAP_NAME_POPUP setflag FLAG_HIDE_MAP_NAME_POPUP
return return
UnusualWeather_StartKyogreWeather:: @ 8273D17 AbnormalWeather_StartKyogreWeather:: @ 8273D17
setweather WEATHER_RAIN_HEAVY setweather WEATHER_DOWNPOUR
return return
UnusualWeather_StartGroudonWeather:: @ 8273D1B AbnormalWeather_StartGroudonWeather:: @ 8273D1B
setweather WEATHER_DROUGHT setweather WEATHER_DROUGHT
return return
UnusualWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
lockall lockall
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START
goto_if_ge UnusualWeather_EventScript_ShowRainEndedMessage goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage
goto UnusualWeather_EventScript_ShowSunEndedMessage goto AbnormalWeather_EventScript_ShowSunEndedMessage
end end
UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
closemessage closemessage
fadescreenswapbuffers 1 fadescreenswapbuffers 1
setweather WEATHER_SUNNY setweather WEATHER_SUNNY
doweather doweather
call UnusualWeather_EventScript_CleanupMapTiles call AbnormalWeather_EventScript_CleanupMapTiles
special DrawWholeMapView special DrawWholeMapView
setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE
setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0
clearflag FLAG_HIDE_MAP_NAME_POPUP clearflag FLAG_HIDE_MAP_NAME_POPUP
fadescreenswapbuffers 0 fadescreenswapbuffers 0
releaseall releaseall
end end
UnusualWeather_EventScript_ShowRainEndedMessage:: @ 8273D51 AbnormalWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
msgbox gText_UnusualWeatherEnded_Rain, MSGBOX_DEFAULT msgbox gText_AbnormalWeatherEnded_Rain, MSGBOX_DEFAULT
goto UnusualWeather_EventScript_EndEventAndCleanup_2 goto AbnormalWeather_EventScript_EndEventAndCleanup_2
end end
UnusualWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F AbnormalWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
msgbox gText_UnusualWeatherEnded_Sun, MSGBOX_DEFAULT msgbox gText_AbnormalWeatherEnded_Sun, MSGBOX_DEFAULT
goto UnusualWeather_EventScript_EndEventAndCleanup_2 goto AbnormalWeather_EventScript_EndEventAndCleanup_2
end end
UnusualWeather_EventScript_CleanupMapTiles:: @ 8273D6D AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D
switch VAR_UNUSUAL_WEATHER_LOCATION switch VAR_ABNORMAL_WEATHER_LOCATION
case UNUSUAL_WEATHER_ROUTE_114_NORTH, UnusualWeather_EventScript_CleanupRoute114North case ABNORMAL_WEATHER_ROUTE_114_NORTH, AbnormalWeather_EventScript_CleanupRoute114North
case UNUSUAL_WEATHER_ROUTE_114_SOUTH, UnusualWeather_EventScript_CleanupRoute114South case ABNORMAL_WEATHER_ROUTE_114_SOUTH, AbnormalWeather_EventScript_CleanupRoute114South
case UNUSUAL_WEATHER_ROUTE_115_WEST, UnusualWeather_EventScript_CleanupRoute115West case ABNORMAL_WEATHER_ROUTE_115_WEST, AbnormalWeather_EventScript_CleanupRoute115West
case UNUSUAL_WEATHER_ROUTE_115_EAST, UnusualWeather_EventScript_CleanupRoute115East case ABNORMAL_WEATHER_ROUTE_115_EAST, AbnormalWeather_EventScript_CleanupRoute115East
case UNUSUAL_WEATHER_ROUTE_116_NORTH, UnusualWeather_EventScript_CleanupRoute116North case ABNORMAL_WEATHER_ROUTE_116_NORTH, AbnormalWeather_EventScript_CleanupRoute116North
case UNUSUAL_WEATHER_ROUTE_116_SOUTH, UnusualWeather_EventScript_CleanupRoute116South case ABNORMAL_WEATHER_ROUTE_116_SOUTH, AbnormalWeather_EventScript_CleanupRoute116South
case UNUSUAL_WEATHER_ROUTE_118_EAST, UnusualWeather_EventScript_CleanupRoute118East case ABNORMAL_WEATHER_ROUTE_118_EAST, AbnormalWeather_EventScript_CleanupRoute118East
case UNUSUAL_WEATHER_ROUTE_118_WEST, UnusualWeather_EventScript_CleanupRoute118West case ABNORMAL_WEATHER_ROUTE_118_WEST, AbnormalWeather_EventScript_CleanupRoute118West
case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_EventScript_CleanupRoute105North case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_EventScript_CleanupRoute105North
case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_EventScript_CleanupRoute105South case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_EventScript_CleanupRoute105South
case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_EventScript_CleanupRoute125West case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_EventScript_CleanupRoute125West
case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_EventScript_CleanupRoute125East case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_EventScript_CleanupRoute125East
case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_EventScript_CleanupRoute127North case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_EventScript_CleanupRoute127North
case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_EventScript_CleanupRoute127South case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_EventScript_CleanupRoute127South
case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_EventScript_CleanupRoute129West case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_EventScript_CleanupRoute129West
case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_EventScript_CleanupRoute129East case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_EventScript_CleanupRoute129East
return return
UnusualWeather_EventScript_CleanupRoute114North:: @ 8273E23 AbnormalWeather_EventScript_CleanupRoute114North:: @ 8273E23
setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1 setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1
setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1 setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1
return return
UnusualWeather_EventScript_CleanupRoute114South:: @ 8273E36 AbnormalWeather_EventScript_CleanupRoute114South:: @ 8273E36
setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1
return return
UnusualWeather_EventScript_CleanupRoute115West:: @ 8273E49 AbnormalWeather_EventScript_CleanupRoute115West:: @ 8273E49
setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1
return return
UnusualWeather_EventScript_CleanupRoute115East:: @ 8273E5C AbnormalWeather_EventScript_CleanupRoute115East:: @ 8273E5C
setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1
setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1 setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1
return return
UnusualWeather_EventScript_CleanupRoute116North:: @ 8273E6F AbnormalWeather_EventScript_CleanupRoute116North:: @ 8273E6F
setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1 setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1
setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1 setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1
return return
UnusualWeather_EventScript_CleanupRoute116South:: @ 8273E82 AbnormalWeather_EventScript_CleanupRoute116South:: @ 8273E82
setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1 setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1 setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1
return return
UnusualWeather_EventScript_CleanupRoute118East:: @ 8273E95 AbnormalWeather_EventScript_CleanupRoute118East:: @ 8273E95
setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1 setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1 setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1
return return
UnusualWeather_EventScript_CleanupRoute118West:: @ 8273EA8 AbnormalWeather_EventScript_CleanupRoute118West:: @ 8273EA8
setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1 setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1
setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1 setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1
return return
UnusualWeather_EventScript_CleanupRoute105North:: @ 8273EBB AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB
setmetatile 10, 28, METATILE_General_CalmWater, 0 setmetatile 10, 28, METATILE_General_CalmWater, 0
setmetatile 11, 28, METATILE_General_CalmWater, 0 setmetatile 11, 28, METATILE_General_CalmWater, 0
setmetatile 9, 29, 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 setmetatile 11, 31, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute105South:: @ 8273F28 AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28
setmetatile 20, 53, METATILE_General_CalmWater, 0 setmetatile 20, 53, METATILE_General_CalmWater, 0
setmetatile 21, 53, METATILE_General_CalmWater, 0 setmetatile 21, 53, METATILE_General_CalmWater, 0
setmetatile 19, 54, 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 setmetatile 21, 56, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute125West:: @ 8273F95 AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95
setmetatile 8, 16, METATILE_General_CalmWater, 0 setmetatile 8, 16, METATILE_General_CalmWater, 0
setmetatile 9, 16, METATILE_General_CalmWater, 0 setmetatile 9, 16, METATILE_General_CalmWater, 0
setmetatile 7, 17, 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 setmetatile 9, 19, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute125East:: @ 8274002 AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002
setmetatile 53, 18, METATILE_General_CalmWater, 0 setmetatile 53, 18, METATILE_General_CalmWater, 0
setmetatile 54, 18, METATILE_General_CalmWater, 0 setmetatile 54, 18, METATILE_General_CalmWater, 0
setmetatile 52, 19, 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 setmetatile 54, 21, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute127North:: @ 827406F AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F
setmetatile 57, 9, METATILE_General_CalmWater, 0 setmetatile 57, 9, METATILE_General_CalmWater, 0
setmetatile 58, 9, METATILE_General_CalmWater, 0 setmetatile 58, 9, METATILE_General_CalmWater, 0
setmetatile 56, 10, 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 setmetatile 58, 12, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute127South:: @ 82740DC AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC
setmetatile 61, 30, METATILE_General_CalmWater, 0 setmetatile 61, 30, METATILE_General_CalmWater, 0
setmetatile 62, 30, METATILE_General_CalmWater, 0 setmetatile 62, 30, METATILE_General_CalmWater, 0
setmetatile 60, 31, 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 setmetatile 62, 33, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute129West:: @ 8274149 AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149
setmetatile 16, 14, METATILE_General_CalmWater, 0 setmetatile 16, 14, METATILE_General_CalmWater, 0
setmetatile 17, 14, METATILE_General_CalmWater, 0 setmetatile 17, 14, METATILE_General_CalmWater, 0
setmetatile 15, 15, 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 setmetatile 17, 17, METATILE_General_CalmWater, 0
return return
UnusualWeather_EventScript_CleanupRoute129East:: @ 82741B6 AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6
setmetatile 42, 19, METATILE_General_CalmWater, 0 setmetatile 42, 19, METATILE_General_CalmWater, 0
setmetatile 43, 19, METATILE_General_CalmWater, 0 setmetatile 43, 19, METATILE_General_CalmWater, 0
setmetatile 41, 20, 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 setmetatile 43, 22, METATILE_General_CalmWater, 0
return return
UnusualWeather_Underwater_SetupEscapeWarp:: @ 8274223 AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223
switch VAR_UNUSUAL_WEATHER_LOCATION switch VAR_ABNORMAL_WEATHER_LOCATION
case UNUSUAL_WEATHER_ROUTE_105_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105North case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105North
case UNUSUAL_WEATHER_ROUTE_105_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute105South case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105South
case UNUSUAL_WEATHER_ROUTE_125_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute125West case ABNORMAL_WEATHER_ROUTE_125_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125West
case UNUSUAL_WEATHER_ROUTE_125_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute125East case ABNORMAL_WEATHER_ROUTE_125_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute125East
case UNUSUAL_WEATHER_ROUTE_127_NORTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127North case ABNORMAL_WEATHER_ROUTE_127_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127North
case UNUSUAL_WEATHER_ROUTE_127_SOUTH, UnusualWeather_Underwater_SetupEscapeWarpRoute127South case ABNORMAL_WEATHER_ROUTE_127_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute127South
case UNUSUAL_WEATHER_ROUTE_129_WEST, UnusualWeather_Underwater_SetupEscapeWarpRoute129West case ABNORMAL_WEATHER_ROUTE_129_WEST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129West
case UNUSUAL_WEATHER_ROUTE_129_EAST, UnusualWeather_Underwater_SetupEscapeWarpRoute129East case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129East
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281 AbnormalWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
setescapewarp MAP_ROUTE105, 255, 11, 29 setescapewarp MAP_ROUTE105, 255, 11, 29
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A AbnormalWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
setescapewarp MAP_ROUTE105, 255, 21, 54 setescapewarp MAP_ROUTE105, 255, 21, 54
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293 AbnormalWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
setescapewarp MAP_ROUTE125, 255, 9, 17 setescapewarp MAP_ROUTE125, 255, 9, 17
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C AbnormalWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
setescapewarp MAP_ROUTE125, 255, 54, 19 setescapewarp MAP_ROUTE125, 255, 54, 19
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5 AbnormalWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
setescapewarp MAP_ROUTE127, 255, 58, 10 setescapewarp MAP_ROUTE127, 255, 58, 10
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE AbnormalWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
setescapewarp MAP_ROUTE127, 255, 62, 31 setescapewarp MAP_ROUTE127, 255, 62, 31
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7 AbnormalWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
setescapewarp MAP_ROUTE129, 255, 17, 15 setescapewarp MAP_ROUTE129, 255, 17, 15
return return
UnusualWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0 AbnormalWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
setescapewarp MAP_ROUTE129, 255, 43, 20 setescapewarp MAP_ROUTE129, 255, 43, 20
return return
data/specials.inc
+2 -2
View File
@@ -499,8 +499,8 @@ gSpecials:: @ 81DBA64
def_special ShouldShowBoxWasFullMessage def_special ShouldShowBoxWasFullMessage
def_special SetMatchCallRegisteredFlag def_special SetMatchCallRegisteredFlag
def_special sub_8175280 def_special sub_8175280
def_special CreateUnusualWeatherEvent def_special CreateAbnormalWeatherEvent
def_special GetUnusualWeatherMapNameAndType def_special GetAbnormalWeatherMapNameAndType
def_special GetMartEmployeeObjectEventId def_special GetMartEmployeeObjectEventId
def_special sub_80A08CC def_special sub_80A08CC
def_special Unused_SetWeatherSunny def_special Unused_SetWeatherSunny
data/text/unusual_weather.inc → data/text/abnormal_weather.inc
+2 -2
View File
@@ -1,7 +1,7 @@
gText_UnusualWeatherEnded_Rain:: @ 8273656 gText_AbnormalWeatherEnded_Rain:: @ 8273656
.string "The massive downpour appears to\n" .string "The massive downpour appears to\n"
.string "have stopped…$" .string "have stopped…$"
gText_UnusualWeatherEnded_Sun:: @ 8273684 gText_AbnormalWeatherEnded_Sun:: @ 8273684
.string "The intense sunshine appears to\n" .string "The intense sunshine appears to\n"
.string "have subsided…$" .string "have subsided…$"
include/constants/vars.h
+3 -3
View File
@@ -69,9 +69,9 @@
#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034
#define VAR_DEOXYS_ROCK_LEVEL 0x4035 #define VAR_DEOXYS_ROCK_LEVEL 0x4035
#define VAR_PC_BOX_TO_SEND_MON 0x4036 #define VAR_PC_BOX_TO_SEND_MON 0x4036
#define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 #define VAR_ABNORMAL_WEATHER_LOCATION 0x4037
#define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038 #define VAR_ABNORMAL_WEATHER_STEP_COUNTER 0x4038
#define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039 #define VAR_SHOULD_END_ABNORMAL_WEATHER 0x4039
#define VAR_FARAWAY_ISLAND_STEP_COUNTER 0x403A #define VAR_FARAWAY_ISLAND_STEP_COUNTER 0x403A
#define VAR_REGICE_STEPS_1 0x403B #define VAR_REGICE_STEPS_1 0x403B
#define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_2 0x403C
include/constants/weather.h
+52 -52
View File
@@ -1,66 +1,66 @@
#ifndef GUARD_CONSTANTS_WEATHER_H #ifndef GUARD_CONSTANTS_WEATHER_H
#define GUARD_CONSTANTS_WEATHER_H #define GUARD_CONSTANTS_WEATHER_H
#define WEATHER_NONE 0 #define WEATHER_NONE 0
#define WEATHER_CLOUDS 1 #define WEATHER_SUNNY_CLOUDS 1
#define WEATHER_SUNNY 2 #define WEATHER_SUNNY 2
#define WEATHER_RAIN_LIGHT 3 #define WEATHER_RAIN 3
#define WEATHER_SNOW 4 #define WEATHER_SNOW 4
#define WEATHER_RAIN_MED 5 #define WEATHER_RAIN_THUNDERSTORM 5
#define WEATHER_FOG_1 6 #define WEATHER_FOG_HORIZONTAL 6
#define WEATHER_ASH 7 #define WEATHER_VOLCANIC_ASH 7
#define WEATHER_SANDSTORM 8 #define WEATHER_SANDSTORM 8
#define WEATHER_FOG_2 9 #define WEATHER_FOG_DIAGONAL 9
#define WEATHER_FOG_3 10 #define WEATHER_UNDERWATER 10
#define WEATHER_SHADE 11 #define WEATHER_CLOUDY 11
#define WEATHER_DROUGHT 12 #define WEATHER_DROUGHT 12
#define WEATHER_RAIN_HEAVY 13 #define WEATHER_DOWNPOUR 13
#define WEATHER_BUBBLES 14 #define WEATHER_UNDERWATER_BUBBLES 14
#define WEATHER_ALTERNATING 15 #define WEATHER_ABNORMAL 15
#define WEATHER_ROUTE119_CYCLE 20 #define WEATHER_ROUTE119_CYCLE 20
#define WEATHER_ROUTE123_CYCLE 21 #define WEATHER_ROUTE123_CYCLE 21
// These are used in maps' coord_weather_event entries. // These are used in maps' coord_weather_event entries.
// They are not a one-to-one mapping with the engine's // They are not a one-to-one mapping with the engine's
// internal weather constants above. // internal weather constants above.
#define COORD_EVENT_WEATHER_CLOUDS 1 #define COORD_EVENT_WEATHER_SUNNY_CLOUDS 1
#define COORD_EVENT_WEATHER_SUNNY 2 #define COORD_EVENT_WEATHER_SUNNY 2
#define COORD_EVENT_WEATHER_RAIN_LIGHT 3 #define COORD_EVENT_WEATHER_RAIN 3
#define COORD_EVENT_WEATHER_SNOW 4 #define COORD_EVENT_WEATHER_SNOW 4
#define COORD_EVENT_WEATHER_RAIN_MED 5 #define COORD_EVENT_WEATHER_RAIN_THUNDERSTORM 5
#define COORD_EVENT_WEATHER_FOG_1 6 #define COORD_EVENT_WEATHER_FOG_HORIZONTAL 6
#define COORD_EVENT_WEATHER_FOG_2 7 #define COORD_EVENT_WEATHER_FOG_DIAGONAL 7
#define COORD_EVENT_WEATHER_ASH 8 #define COORD_EVENT_WEATHER_VOLCANIC_ASH 8
#define COORD_EVENT_WEATHER_SANDSTORM 9 #define COORD_EVENT_WEATHER_SANDSTORM 9
#define COORD_EVENT_WEATHER_SHADE 10 #define COORD_EVENT_WEATHER_CLOUDY 10
#define COORD_EVENT_WEATHER_DROUGHT 11 #define COORD_EVENT_WEATHER_DROUGHT 11
#define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20 #define COORD_EVENT_WEATHER_ROUTE119_CYCLE 20
#define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21 #define COORD_EVENT_WEATHER_ROUTE123_CYCLE 21
// These are the "unusual weather events" that are used // These are the "abnormal weather events" that are used
// to find Kyogre and Groudon. // to find Kyogre and Groudon.
#define UNUSUAL_WEATHER_COUNT_PER_LEGENDARY 8 #define ABNORMAL_WEATHER_COUNT_PER_LEGENDARY 8
#define UNUSUAL_WEATHER_GROUDON_LOCATIONS_START 1 #define ABNORMAL_WEATHER_GROUDON_LOCATIONS_START 1
#define UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START 1 + UNUSUAL_WEATHER_COUNT_PER_LEGENDARY #define ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START 1 + ABNORMAL_WEATHER_COUNT_PER_LEGENDARY
#define UNUSUAL_WEATHER_NONE 0 #define ABNORMAL_WEATHER_NONE 0
// Groudon locations // Groudon locations
#define UNUSUAL_WEATHER_ROUTE_114_NORTH 1 #define ABNORMAL_WEATHER_ROUTE_114_NORTH 1
#define UNUSUAL_WEATHER_ROUTE_114_SOUTH 2 #define ABNORMAL_WEATHER_ROUTE_114_SOUTH 2
#define UNUSUAL_WEATHER_ROUTE_115_WEST 3 #define ABNORMAL_WEATHER_ROUTE_115_WEST 3
#define UNUSUAL_WEATHER_ROUTE_115_EAST 4 #define ABNORMAL_WEATHER_ROUTE_115_EAST 4
#define UNUSUAL_WEATHER_ROUTE_116_NORTH 5 #define ABNORMAL_WEATHER_ROUTE_116_NORTH 5
#define UNUSUAL_WEATHER_ROUTE_116_SOUTH 6 #define ABNORMAL_WEATHER_ROUTE_116_SOUTH 6
#define UNUSUAL_WEATHER_ROUTE_118_EAST 7 #define ABNORMAL_WEATHER_ROUTE_118_EAST 7
#define UNUSUAL_WEATHER_ROUTE_118_WEST 8 #define ABNORMAL_WEATHER_ROUTE_118_WEST 8
// Kyogre locations // Kyogre locations
#define UNUSUAL_WEATHER_ROUTE_105_NORTH 9 #define ABNORMAL_WEATHER_ROUTE_105_NORTH 9
#define UNUSUAL_WEATHER_ROUTE_105_SOUTH 10 #define ABNORMAL_WEATHER_ROUTE_105_SOUTH 10
#define UNUSUAL_WEATHER_ROUTE_125_WEST 11 #define ABNORMAL_WEATHER_ROUTE_125_WEST 11
#define UNUSUAL_WEATHER_ROUTE_125_EAST 12 #define ABNORMAL_WEATHER_ROUTE_125_EAST 12
#define UNUSUAL_WEATHER_ROUTE_127_NORTH 13 #define ABNORMAL_WEATHER_ROUTE_127_NORTH 13
#define UNUSUAL_WEATHER_ROUTE_127_SOUTH 14 #define ABNORMAL_WEATHER_ROUTE_127_SOUTH 14
#define UNUSUAL_WEATHER_ROUTE_129_WEST 15 #define ABNORMAL_WEATHER_ROUTE_129_WEST 15
#define UNUSUAL_WEATHER_ROUTE_129_EAST 16 #define ABNORMAL_WEATHER_ROUTE_129_EAST 16
#endif // GUARD_CONSTANTS_WEATHER_H #endif // GUARD_CONSTANTS_WEATHER_H
include/event_scripts.h
+1 -1
View File
@@ -546,7 +546,7 @@ extern const u8 EventScript_FallDownHole[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[]; extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
extern const u8 EventScript_FieldPoison[]; extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[]; extern const u8 EventScript_EggHatch[];
extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 AbnormalWeather_EventScript_EndEventAndCleanup_1[];
extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
extern const u8 MauvilleCity_EventScript_RegisterWallyCall[]; extern const u8 MauvilleCity_EventScript_RegisterWallyCall[];
extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[]; extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[];
include/field_specials.h
+1 -1
View File
@@ -10,7 +10,7 @@ u16 GetPCBoxToSendMon(void);
bool8 InMultiBattleRoom(void); bool8 InMultiBattleRoom(void);
void UpdateTrainerFansAfterLinkBattle(void); void UpdateTrainerFansAfterLinkBattle(void);
void IncrementBirthIslandRockStepCount(void); void IncrementBirthIslandRockStepCount(void);
bool8 UnusualWeatherHasExpired(void); bool8 AbnormalWeatherHasExpired(void);
bool8 ShouldDoBrailleRegicePuzzle(void); bool8 ShouldDoBrailleRegicePuzzle(void);
bool32 ShouldDoWallyCall(void); bool32 ShouldDoWallyCall(void);
bool32 ShouldDoScottFortreeCall(void); bool32 ShouldDoScottFortreeCall(void);
src/battle_util.c
+3 -3
View File
@@ -1830,9 +1830,9 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
{ {
switch (GetCurrentWeather()) switch (GetCurrentWeather())
{ {
case WEATHER_RAIN_LIGHT: case WEATHER_RAIN:
case WEATHER_RAIN_MED: case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_RAIN_HEAVY: case WEATHER_DOWNPOUR:
if (!(gBattleWeather & WEATHER_RAIN_ANY)) if (!(gBattleWeather & WEATHER_RAIN_ANY))
{ {
gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
src/cable_car.c
+4 -4
View File
@@ -307,7 +307,7 @@ static void CableCarMainCallback_Setup(void)
gMain.state++; gMain.state++;
break; break;
case 5: case 5:
if (sCableCar->weather == WEATHER_ASH) if (sCableCar->weather == WEATHER_VOLCANIC_ASH)
{ {
gMain.state++; gMain.state++;
} }
@@ -425,7 +425,7 @@ static void sub_81503E4(u8 taskId)
case 1: case 1:
switch (sCableCar->weather) switch (sCableCar->weather)
{ {
case WEATHER_ASH: case WEATHER_VOLCANIC_ASH:
if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0) if (gWeatherPtr->sprites.s2.ashSprites[0] != NULL && gWeatherPtr->sprites.s2.ashSprites[0]->oam.priority != 0)
{ {
for (; i < NUM_ASH_SPRITES; i++) for (; i < NUM_ASH_SPRITES; i++)
@@ -815,7 +815,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].pos2.y = 4; gSprites[spriteId].pos2.y = 4;
gSprites[spriteId].data[0] = 200; gSprites[spriteId].data[0] = 200;
gSprites[spriteId].data[1] = 99; gSprites[spriteId].data[1] = 99;
sCableCar->weather = WEATHER_ASH; sCableCar->weather = WEATHER_VOLCANIC_ASH;
sCableCar->unk4 = 0x15e; sCableCar->unk4 = 0x15e;
SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY); SetCurrentAndNextWeatherNoDelay(WEATHER_SUNNY);
break; break;
@@ -841,7 +841,7 @@ static void LoadCableCarSprites(void)
gSprites[spriteId].data[1] = 0x41; gSprites[spriteId].data[1] = 0x41;
sCableCar->weather = WEATHER_SUNNY; sCableCar->weather = WEATHER_SUNNY;
sCableCar->unk4 = 0x109; sCableCar->unk4 = 0x109;
SetCurrentAndNextWeatherNoDelay(WEATHER_ASH); SetCurrentAndNextWeatherNoDelay(WEATHER_VOLCANIC_ASH);
break; break;
} }
for (i = 0; i < 9; i++) for (i = 0; i < 9; i++)
src/coord_event_weather.c
+20 -20
View File
@@ -11,30 +11,30 @@ struct CoordEventWeather
static void CoordEventWeather_Clouds(void); static void CoordEventWeather_Clouds(void);
static void CoordEventWeather_Sunny(void); static void CoordEventWeather_Sunny(void);
static void CoordEventWeather_LightRain(void); static void CoordEventWeather_Rain(void);
static void CoordEventWeather_Snow(void); static void CoordEventWeather_Snow(void);
static void CoordEventWeather_Thunderstorm(void); static void CoordEventWeather_Thunderstorm(void);
static void CoordEventWeather_Fog(void); static void CoordEventWeather_HorizontalFog(void);
static void CoordEventWeather_DiagonalFog(void); static void CoordEventWeather_DiagonalFog(void);
static void CoordEventWeather_Ash(void); static void CoordEventWeather_Ash(void);
static void CoordEventWeather_Sandstorm(void); static void CoordEventWeather_Sandstorm(void);
static void CoordEventWeather_Dark(void); static void CoordEventWeather_Cloudy(void);
static void CoordEventWeather_Drought(void); static void CoordEventWeather_Drought(void);
static void CoordEventWeather_Route119Cycle(void); static void CoordEventWeather_Route119Cycle(void);
static void CoordEventWeather_Route123Cycle(void); static void CoordEventWeather_Route123Cycle(void);
static const struct CoordEventWeather sCoordEventWeatherFuncs[] = static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
{ {
{ COORD_EVENT_WEATHER_CLOUDS, CoordEventWeather_Clouds }, { COORD_EVENT_WEATHER_SUNNY_CLOUDS, CoordEventWeather_Clouds },
{ COORD_EVENT_WEATHER_SUNNY, CoordEventWeather_Sunny }, { COORD_EVENT_WEATHER_SUNNY, CoordEventWeather_Sunny },
{ COORD_EVENT_WEATHER_RAIN_LIGHT, CoordEventWeather_LightRain }, { COORD_EVENT_WEATHER_RAIN, CoordEventWeather_Rain },
{ COORD_EVENT_WEATHER_SNOW, CoordEventWeather_Snow }, { COORD_EVENT_WEATHER_SNOW, CoordEventWeather_Snow },
{ COORD_EVENT_WEATHER_RAIN_MED, CoordEventWeather_Thunderstorm }, { COORD_EVENT_WEATHER_RAIN_THUNDERSTORM, CoordEventWeather_Thunderstorm },
{ COORD_EVENT_WEATHER_FOG_1, CoordEventWeather_Fog }, { COORD_EVENT_WEATHER_FOG_HORIZONTAL, CoordEventWeather_HorizontalFog },
{ COORD_EVENT_WEATHER_FOG_2, CoordEventWeather_DiagonalFog }, { COORD_EVENT_WEATHER_FOG_DIAGONAL, CoordEventWeather_DiagonalFog },
{ COORD_EVENT_WEATHER_ASH, CoordEventWeather_Ash }, { COORD_EVENT_WEATHER_VOLCANIC_ASH, CoordEventWeather_Ash },
{ COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm }, { COORD_EVENT_WEATHER_SANDSTORM, CoordEventWeather_Sandstorm },
{ COORD_EVENT_WEATHER_SHADE, CoordEventWeather_Dark }, { COORD_EVENT_WEATHER_CLOUDY, CoordEventWeather_Cloudy },
{ COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought }, { COORD_EVENT_WEATHER_DROUGHT, CoordEventWeather_Drought },
{ COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle }, { COORD_EVENT_WEATHER_ROUTE119_CYCLE, CoordEventWeather_Route119Cycle },
{ COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle }, { COORD_EVENT_WEATHER_ROUTE123_CYCLE, CoordEventWeather_Route123Cycle },
@@ -42,7 +42,7 @@ static const struct CoordEventWeather sCoordEventWeatherFuncs[] =
static void CoordEventWeather_Clouds(void) static void CoordEventWeather_Clouds(void)
{ {
SetWeather(WEATHER_CLOUDS); SetWeather(WEATHER_SUNNY_CLOUDS);
} }
static void CoordEventWeather_Sunny(void) static void CoordEventWeather_Sunny(void)
@@ -50,9 +50,9 @@ static void CoordEventWeather_Sunny(void)
SetWeather(WEATHER_SUNNY); SetWeather(WEATHER_SUNNY);
} }
static void CoordEventWeather_LightRain(void) static void CoordEventWeather_Rain(void)
{ {
SetWeather(WEATHER_RAIN_LIGHT); SetWeather(WEATHER_RAIN);
} }
static void CoordEventWeather_Snow(void) static void CoordEventWeather_Snow(void)
@@ -62,22 +62,22 @@ static void CoordEventWeather_Snow(void)
static void CoordEventWeather_Thunderstorm(void) static void CoordEventWeather_Thunderstorm(void)
{ {
SetWeather(WEATHER_RAIN_MED); SetWeather(WEATHER_RAIN_THUNDERSTORM);
} }
static void CoordEventWeather_Fog(void) static void CoordEventWeather_HorizontalFog(void)
{ {
SetWeather(WEATHER_FOG_1); SetWeather(WEATHER_FOG_HORIZONTAL);
} }
static void CoordEventWeather_DiagonalFog(void) static void CoordEventWeather_DiagonalFog(void)
{ {
SetWeather(WEATHER_FOG_2); SetWeather(WEATHER_FOG_DIAGONAL);
} }
static void CoordEventWeather_Ash(void) static void CoordEventWeather_Ash(void)
{ {
SetWeather(WEATHER_ASH); SetWeather(WEATHER_VOLCANIC_ASH);
} }
static void CoordEventWeather_Sandstorm(void) static void CoordEventWeather_Sandstorm(void)
@@ -85,9 +85,9 @@ static void CoordEventWeather_Sandstorm(void)
SetWeather(WEATHER_SANDSTORM); SetWeather(WEATHER_SANDSTORM);
} }
static void CoordEventWeather_Dark(void) static void CoordEventWeather_Cloudy(void)
{ {
SetWeather(WEATHER_SHADE); SetWeather(WEATHER_CLOUDY);
} }
static void CoordEventWeather_Drought(void) static void CoordEventWeather_Drought(void)
src/field_control_avatar.c
+2 -2
View File
@@ -558,9 +558,9 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
ScriptContext1_SetupScript(EventScript_EggHatch); ScriptContext1_SetupScript(EventScript_EggHatch);
return TRUE; return TRUE;
} }
if (UnusualWeatherHasExpired() == TRUE) if (AbnormalWeatherHasExpired() == TRUE)
{ {
ScriptContext1_SetupScript(UnusualWeather_EventScript_EndEventAndCleanup_1); ScriptContext1_SetupScript(AbnormalWeather_EventScript_EndEventAndCleanup_1);
return TRUE; return TRUE;
} }
if (ShouldDoBrailleRegicePuzzle() == TRUE) if (ShouldDoBrailleRegicePuzzle() == TRUE)
src/field_specials.c
+23 -23
View File
@@ -3542,36 +3542,36 @@ bool8 IsDestinationBoxFull(void)
return FALSE; return FALSE;
} }
void CreateUnusualWeatherEvent(void) void CreateAbnormalWeatherEvent(void)
{ {
u16 randomValue = Random(); u16 randomValue = Random();
VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0); VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, 0);
if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE) if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
{ {
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_GROUDON_LOCATIONS_START);
} }
else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE) else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
{ {
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START);
} }
else if ((randomValue & 1) == 0) else if ((randomValue & 1) == 0)
{ {
randomValue = Random(); randomValue = Random();
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_GROUDON_LOCATIONS_START); VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_GROUDON_LOCATIONS_START);
} }
else else
{ {
randomValue = Random(); randomValue = Random();
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, (randomValue % UNUSUAL_WEATHER_COUNT_PER_LEGENDARY) + UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START); VarSet(VAR_ABNORMAL_WEATHER_LOCATION, (randomValue % ABNORMAL_WEATHER_COUNT_PER_LEGENDARY) + ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START);
} }
} }
// Saves the map name for the current unusual weather location in gStringVar1, then // Saves the map name for the current abnormal weather location in gStringVar1, then
// returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon. // returns TRUE if the weather is for Kyogre, and FALSE if it's for Groudon.
bool32 GetUnusualWeatherMapNameAndType(void) bool32 GetAbnormalWeatherMapNameAndType(void)
{ {
static const u8 sUnusualWeatherMapNumbers[] = { static const u8 sAbnormalWeatherMapNumbers[] = {
MAP_NUM(ROUTE114), MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114), MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115), MAP_NUM(ROUTE115),
@@ -3590,11 +3590,11 @@ bool32 GetUnusualWeatherMapNameAndType(void)
MAP_NUM(ROUTE129) MAP_NUM(ROUTE129)
}; };
u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
GetMapName(gStringVar1, sUnusualWeatherMapNumbers[unusualWeather - 1], 0); GetMapName(gStringVar1, sAbnormalWeatherMapNumbers[abnormalWeather - 1], 0);
if (unusualWeather < UNUSUAL_WEATHER_KYOGRE_LOCATIONS_START) if (abnormalWeather < ABNORMAL_WEATHER_KYOGRE_LOCATIONS_START)
{ {
return FALSE; return FALSE;
} }
@@ -3604,10 +3604,10 @@ bool32 GetUnusualWeatherMapNameAndType(void)
} }
} }
bool8 UnusualWeatherHasExpired(void) bool8 AbnormalWeatherHasExpired(void)
{ {
// Duplicate array. // Duplicate array.
static const u8 sUnusualWeatherMapNumbers_2[] = { static const u8 sAbnormalWeatherMapNumbers[] = {
MAP_NUM(ROUTE114), MAP_NUM(ROUTE114),
MAP_NUM(ROUTE114), MAP_NUM(ROUTE114),
MAP_NUM(ROUTE115), MAP_NUM(ROUTE115),
@@ -3626,17 +3626,17 @@ bool8 UnusualWeatherHasExpired(void)
MAP_NUM(ROUTE129) MAP_NUM(ROUTE129)
}; };
u16 steps = VarGet(VAR_UNUSUAL_WEATHER_STEP_COUNTER); u16 steps = VarGet(VAR_ABNORMAL_WEATHER_STEP_COUNTER);
u16 unusualWeather = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); u16 abnormalWeather = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
if (unusualWeather == UNUSUAL_WEATHER_NONE) if (abnormalWeather == ABNORMAL_WEATHER_NONE)
{ {
return FALSE; return FALSE;
} }
if (++steps > 999) if (++steps > 999)
{ {
VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, 0); VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, 0);
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_MARINE_CAVE))
{ {
switch (gSaveBlock1Ptr->location.mapNum) switch (gSaveBlock1Ptr->location.mapNum)
@@ -3646,7 +3646,7 @@ bool8 UnusualWeatherHasExpired(void)
case MAP_NUM(MARINE_CAVE_END): case MAP_NUM(MARINE_CAVE_END):
case MAP_NUM(TERRA_CAVE_ENTRANCE): case MAP_NUM(TERRA_CAVE_ENTRANCE):
case MAP_NUM(TERRA_CAVE_END): case MAP_NUM(TERRA_CAVE_END):
VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1); VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
return FALSE; return FALSE;
default: default:
break; break;
@@ -3661,27 +3661,27 @@ bool8 UnusualWeatherHasExpired(void)
case MAP_NUM(UNDERWATER5): case MAP_NUM(UNDERWATER5):
case MAP_NUM(UNDERWATER6): case MAP_NUM(UNDERWATER6):
case MAP_NUM(UNDERWATER7): case MAP_NUM(UNDERWATER7):
VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 1); VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
return FALSE; return FALSE;
default: default:
break; break;
} }
} }
if (gSaveBlock1Ptr->location.mapNum == sUnusualWeatherMapNumbers_2[unusualWeather - 1] && if (gSaveBlock1Ptr->location.mapNum == sAbnormalWeatherMapNumbers[abnormalWeather - 1] &&
gSaveBlock1Ptr->location.mapGroup == 0) gSaveBlock1Ptr->location.mapGroup == 0)
{ {
return TRUE; return TRUE;
} }
else else
{ {
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE); VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE);
return FALSE; return FALSE;
} }
} }
else else
{ {
VarSet(VAR_UNUSUAL_WEATHER_STEP_COUNTER, steps); VarSet(VAR_ABNORMAL_WEATHER_STEP_COUNTER, steps);
return FALSE; return FALSE;
} }
} }
src/field_weather.c
+23 -23
View File
@@ -188,7 +188,7 @@ void StartWeather(void)
void SetNextWeather(u8 weather) void SetNextWeather(u8 weather)
{ {
if (weather != WEATHER_RAIN_LIGHT && weather != WEATHER_RAIN_MED && weather != WEATHER_RAIN_HEAVY) if (weather != WEATHER_RAIN && weather != WEATHER_RAIN_THUNDERSTORM && weather != WEATHER_DOWNPOUR)
{ {
PlayRainStoppingSoundEffect(); PlayRainStoppingSoundEffect();
} }
@@ -371,11 +371,11 @@ static void FadeInScreenWithWeather(void)
switch (gWeatherPtr->currWeather) switch (gWeatherPtr->currWeather)
{ {
case WEATHER_RAIN_LIGHT: case WEATHER_RAIN:
case WEATHER_RAIN_MED: case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_RAIN_HEAVY: case WEATHER_DOWNPOUR:
case WEATHER_SNOW: case WEATHER_SNOW:
case WEATHER_SHADE: case WEATHER_CLOUDY:
if (FadeInScreen_RainShowShade() == FALSE) if (FadeInScreen_RainShowShade() == FALSE)
{ {
gWeatherPtr->gammaIndex = 3; gWeatherPtr->gammaIndex = 3;
@@ -389,17 +389,17 @@ static void FadeInScreenWithWeather(void)
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
} }
break; break;
case WEATHER_FOG_1: case WEATHER_FOG_HORIZONTAL:
if (FadeInScreen_Fog1() == FALSE) if (FadeInScreen_Fog1() == FALSE)
{ {
gWeatherPtr->gammaIndex = 0; gWeatherPtr->gammaIndex = 0;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
} }
break; break;
case WEATHER_ASH: case WEATHER_VOLCANIC_ASH:
case WEATHER_SANDSTORM: case WEATHER_SANDSTORM:
case WEATHER_FOG_2: case WEATHER_FOG_DIAGONAL:
case WEATHER_FOG_3: case WEATHER_UNDERWATER:
default: default:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
@@ -763,12 +763,12 @@ void FadeScreen(u8 mode, s8 delay)
switch (gWeatherPtr->currWeather) switch (gWeatherPtr->currWeather)
{ {
case WEATHER_RAIN_LIGHT: case WEATHER_RAIN:
case WEATHER_RAIN_MED: case WEATHER_RAIN_THUNDERSTORM:
case WEATHER_RAIN_HEAVY: case WEATHER_DOWNPOUR:
case WEATHER_SNOW: case WEATHER_SNOW:
case WEATHER_FOG_1: case WEATHER_FOG_HORIZONTAL:
case WEATHER_SHADE: case WEATHER_CLOUDY:
case WEATHER_DROUGHT: case WEATHER_DROUGHT:
useWeatherPal = TRUE; useWeatherPal = TRUE;
break; break;
@@ -816,7 +816,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
case WEATHER_PAL_STATE_SCREEN_FADING_IN: case WEATHER_PAL_STATE_SCREEN_FADING_IN:
if (gWeatherPtr->unknown_6CA != 0) if (gWeatherPtr->unknown_6CA != 0)
{ {
if (gWeatherPtr->currWeather == WEATHER_FOG_1) if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL)
MarkFogSpritePalToLighten(paletteIndex); MarkFogSpritePalToLighten(paletteIndex);
paletteIndex *= 16; paletteIndex *= 16;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
@@ -831,7 +831,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
// WEATHER_PAL_STATE_CHANGING_WEATHER // WEATHER_PAL_STATE_CHANGING_WEATHER
// WEATHER_PAL_STATE_CHANGING_IDLE // WEATHER_PAL_STATE_CHANGING_IDLE
default: default:
if (gWeatherPtr->currWeather != WEATHER_FOG_1) if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL)
{ {
ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex); ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
} }
@@ -995,34 +995,34 @@ void sub_80AC274(u8 a)
switch (a) switch (a)
{ {
case 1: case 1:
SetWeather(WEATHER_CLOUDS); SetWeather(WEATHER_SUNNY_CLOUDS);
break; break;
case 2: case 2:
SetWeather(WEATHER_SUNNY); SetWeather(WEATHER_SUNNY);
break; break;
case 3: case 3:
SetWeather(WEATHER_RAIN_LIGHT); SetWeather(WEATHER_RAIN);
break; break;
case 4: case 4:
SetWeather(WEATHER_SNOW); SetWeather(WEATHER_SNOW);
break; break;
case 5: case 5:
SetWeather(WEATHER_RAIN_MED); SetWeather(WEATHER_RAIN_THUNDERSTORM);
break; break;
case 6: case 6:
SetWeather(WEATHER_FOG_1); SetWeather(WEATHER_FOG_HORIZONTAL);
break; break;
case 7: case 7:
SetWeather(WEATHER_FOG_2); SetWeather(WEATHER_FOG_DIAGONAL);
break; break;
case 8: case 8:
SetWeather(WEATHER_ASH); SetWeather(WEATHER_VOLCANIC_ASH);
break; break;
case 9: case 9:
SetWeather(WEATHER_SANDSTORM); SetWeather(WEATHER_SANDSTORM);
break; break;
case 10: case 10:
SetWeather(WEATHER_SHADE); SetWeather(WEATHER_CLOUDY);
break; break;
} }
} }
src/field_weather_effect.c
+59 -59
View File
@@ -14,7 +14,7 @@
#include "gpu_regs.h" #include "gpu_regs.h"
// EWRAM // EWRAM
EWRAM_DATA static u8 gCurrentAlternatingWeather = 0; EWRAM_DATA static u8 gCurrentAbnormalWeather = 0;
EWRAM_DATA static u16 gUnusedWeatherRelated = 0; EWRAM_DATA static u16 gUnusedWeatherRelated = 0;
// CONST // CONST
@@ -516,9 +516,9 @@ bool8 LightRain_Finish(void)
switch (gWeatherPtr->finishStep) switch (gWeatherPtr->finishStep)
{ {
case 0: case 0:
if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT if (gWeatherPtr->nextWeather == WEATHER_RAIN
|| gWeatherPtr->nextWeather == WEATHER_RAIN_MED || gWeatherPtr->nextWeather == WEATHER_RAIN_THUNDERSTORM
|| gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY) || gWeatherPtr->nextWeather == WEATHER_DOWNPOUR)
{ {
gWeatherPtr->finishStep = 0xFF; gWeatherPtr->finishStep = 0xFF;
return FALSE; return FALSE;
@@ -1178,9 +1178,9 @@ bool8 Rain_Finish(void)
Rain_Main(); Rain_Main();
if (gWeatherPtr->unknown_6EA) if (gWeatherPtr->unknown_6EA)
{ {
if (gWeatherPtr->nextWeather == WEATHER_RAIN_LIGHT if (gWeatherPtr->nextWeather == WEATHER_RAIN
|| gWeatherPtr->nextWeather == WEATHER_RAIN_MED || gWeatherPtr->nextWeather == WEATHER_RAIN_THUNDERSTORM
|| gWeatherPtr->nextWeather == WEATHER_RAIN_HEAVY) || gWeatherPtr->nextWeather == WEATHER_DOWNPOUR)
return FALSE; return FALSE;
gWeatherPtr->targetRainSpriteCount = 0; gWeatherPtr->targetRainSpriteCount = 0;
@@ -1365,7 +1365,7 @@ void Fog1_Main(void)
{ {
case 0: case 0:
CreateFog1Sprites(); CreateFog1Sprites();
if (gWeatherPtr->currWeather == WEATHER_FOG_1) if (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL)
Weather_SetTargetBlendCoeffs(12, 8, 3); Weather_SetTargetBlendCoeffs(12, 8, 3);
else else
Weather_SetTargetBlendCoeffs(4, 16, 0); Weather_SetTargetBlendCoeffs(4, 16, 0);
@@ -2399,13 +2399,13 @@ static void UpdateBubbleSprite(struct Sprite *sprite)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Unused function. // Unused function.
static void UnusedSetCurrentAlternatingWeather(u32 a0, u32 a1) static void UnusedSetCurrentAbnormalWeather(u32 a0, u32 a1)
{ {
gCurrentAlternatingWeather = a0; gCurrentAbnormalWeather = a0;
gUnusedWeatherRelated = a1; gUnusedWeatherRelated = a1;
} }
static void Task_DoAlternatingWeather(u8 taskId) static void Task_DoAbnormalWeather(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
@@ -2415,7 +2415,7 @@ static void Task_DoAlternatingWeather(u8 taskId)
if (data[15]-- <= 0) if (data[15]-- <= 0)
{ {
SetNextWeather(data[1]); SetNextWeather(data[1]);
gCurrentAlternatingWeather = data[1]; gCurrentAbnormalWeather = data[1];
data[15] = 600; data[15] = 600;
data[0]++; data[0]++;
} }
@@ -2424,7 +2424,7 @@ static void Task_DoAlternatingWeather(u8 taskId)
if (data[15]-- <= 0) if (data[15]-- <= 0)
{ {
SetNextWeather(data[2]); SetNextWeather(data[2]);
gCurrentAlternatingWeather = data[2]; gCurrentAbnormalWeather = data[2];
data[15] = 600; data[15] = 600;
data[0] = 0; data[0] = 0;
} }
@@ -2432,27 +2432,27 @@ static void Task_DoAlternatingWeather(u8 taskId)
} }
} }
static void CreateAlternatingWeatherTask(void) static void CreateAbnormalWeatherTask(void)
{ {
u8 taskId = CreateTask(Task_DoAlternatingWeather, 0); u8 taskId = CreateTask(Task_DoAbnormalWeather, 0);
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
data[15] = 600; data[15] = 600;
if (gCurrentAlternatingWeather == WEATHER_RAIN_HEAVY) if (gCurrentAbnormalWeather == WEATHER_DOWNPOUR)
{ {
data[1] = WEATHER_DROUGHT; data[1] = WEATHER_DROUGHT;
data[2] = WEATHER_RAIN_HEAVY; data[2] = WEATHER_DOWNPOUR;
} }
else if (gCurrentAlternatingWeather == WEATHER_DROUGHT) else if (gCurrentAbnormalWeather == WEATHER_DROUGHT)
{ {
data[1] = WEATHER_RAIN_HEAVY; data[1] = WEATHER_DOWNPOUR;
data[2] = WEATHER_DROUGHT; data[2] = WEATHER_DROUGHT;
} }
else else
{ {
gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
data[1] = WEATHER_DROUGHT; data[1] = WEATHER_DROUGHT;
data[2] = WEATHER_RAIN_HEAVY; data[2] = WEATHER_DOWNPOUR;
} }
} }
@@ -2494,17 +2494,17 @@ void DoCurrentWeather(void)
{ {
u8 weather = GetSav1Weather(); u8 weather = GetSav1Weather();
if (weather == WEATHER_ALTERNATING) if (weather == WEATHER_ABNORMAL)
{ {
if (!FuncIsActiveTask(Task_DoAlternatingWeather)) if (!FuncIsActiveTask(Task_DoAbnormalWeather))
CreateAlternatingWeatherTask(); CreateAbnormalWeatherTask();
weather = gCurrentAlternatingWeather; weather = gCurrentAbnormalWeather;
} }
else else
{ {
if (FuncIsActiveTask(Task_DoAlternatingWeather)) if (FuncIsActiveTask(Task_DoAbnormalWeather))
DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather)); DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
} }
SetNextWeather(weather); SetNextWeather(weather);
} }
@@ -2513,17 +2513,17 @@ void ResumePausedWeather(void)
{ {
u8 weather = GetSav1Weather(); u8 weather = GetSav1Weather();
if (weather == WEATHER_ALTERNATING) if (weather == WEATHER_ABNORMAL)
{ {
if (!FuncIsActiveTask(Task_DoAlternatingWeather)) if (!FuncIsActiveTask(Task_DoAbnormalWeather))
CreateAlternatingWeatherTask(); CreateAbnormalWeatherTask();
weather = gCurrentAlternatingWeather; weather = gCurrentAbnormalWeather;
} }
else else
{ {
if (FuncIsActiveTask(Task_DoAlternatingWeather)) if (FuncIsActiveTask(Task_DoAbnormalWeather))
DestroyTask(FindTaskIdByFunc(Task_DoAlternatingWeather)); DestroyTask(FindTaskIdByFunc(Task_DoAbnormalWeather));
gCurrentAlternatingWeather = WEATHER_RAIN_HEAVY; gCurrentAbnormalWeather = WEATHER_DOWNPOUR;
} }
SetCurrentAndNextWeather(weather); SetCurrentAndNextWeather(weather);
} }
@@ -2531,15 +2531,15 @@ void ResumePausedWeather(void)
static const u8 sWeatherCycleRoute119[] = static const u8 sWeatherCycleRoute119[] =
{ {
WEATHER_SUNNY, WEATHER_SUNNY,
WEATHER_RAIN_LIGHT, WEATHER_RAIN,
WEATHER_RAIN_MED, WEATHER_RAIN_THUNDERSTORM,
WEATHER_RAIN_LIGHT, WEATHER_RAIN,
}; };
static const u8 sWeatherCycleRoute123[] = static const u8 sWeatherCycleRoute123[] =
{ {
WEATHER_SUNNY, WEATHER_SUNNY,
WEATHER_SUNNY, WEATHER_SUNNY,
WEATHER_RAIN_LIGHT, WEATHER_RAIN,
WEATHER_SUNNY, WEATHER_SUNNY,
}; };
@@ -2547,25 +2547,25 @@ static u8 TranslateWeatherNum(u8 weather)
{ {
switch (weather) switch (weather)
{ {
case WEATHER_NONE: return WEATHER_NONE; case WEATHER_NONE: return WEATHER_NONE;
case WEATHER_CLOUDS: return WEATHER_CLOUDS; case WEATHER_SUNNY_CLOUDS: return WEATHER_SUNNY_CLOUDS;
case WEATHER_SUNNY: return WEATHER_SUNNY; case WEATHER_SUNNY: return WEATHER_SUNNY;
case WEATHER_RAIN_LIGHT: return WEATHER_RAIN_LIGHT; case WEATHER_RAIN: return WEATHER_RAIN;
case WEATHER_SNOW: return WEATHER_SNOW; case WEATHER_SNOW: return WEATHER_SNOW;
case WEATHER_RAIN_MED: return WEATHER_RAIN_MED; case WEATHER_RAIN_THUNDERSTORM: return WEATHER_RAIN_THUNDERSTORM;
case WEATHER_FOG_1: return WEATHER_FOG_1; case WEATHER_FOG_HORIZONTAL: return WEATHER_FOG_HORIZONTAL;
case WEATHER_ASH: return WEATHER_ASH; case WEATHER_VOLCANIC_ASH: return WEATHER_VOLCANIC_ASH;
case WEATHER_SANDSTORM: return WEATHER_SANDSTORM; case WEATHER_SANDSTORM: return WEATHER_SANDSTORM;
case WEATHER_FOG_2: return WEATHER_FOG_2; case WEATHER_FOG_DIAGONAL: return WEATHER_FOG_DIAGONAL;
case WEATHER_FOG_3: return WEATHER_FOG_3; case WEATHER_UNDERWATER: return WEATHER_UNDERWATER;
case WEATHER_SHADE: return WEATHER_SHADE; case WEATHER_CLOUDY: return WEATHER_CLOUDY;
case WEATHER_DROUGHT: return WEATHER_DROUGHT; case WEATHER_DROUGHT: return WEATHER_DROUGHT;
case WEATHER_RAIN_HEAVY: return WEATHER_RAIN_HEAVY; case WEATHER_DOWNPOUR: return WEATHER_DOWNPOUR;
case WEATHER_BUBBLES: return WEATHER_BUBBLES; case WEATHER_UNDERWATER_BUBBLES: return WEATHER_UNDERWATER_BUBBLES;
case WEATHER_ALTERNATING: return WEATHER_ALTERNATING; case WEATHER_ABNORMAL: return WEATHER_ABNORMAL;
case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE119_CYCLE: return sWeatherCycleRoute119[gSaveBlock1Ptr->weatherCycleStage];
case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage]; case WEATHER_ROUTE123_CYCLE: return sWeatherCycleRoute123[gSaveBlock1Ptr->weatherCycleStage];
default: return WEATHER_NONE; default: return WEATHER_NONE;
} }
} }
@@ -2579,7 +2579,7 @@ void UpdateWeatherPerDay(u16 increment)
static void UpdateRainCounter(u8 newWeather, u8 oldWeather) static void UpdateRainCounter(u8 newWeather, u8 oldWeather)
{ {
if (newWeather != oldWeather if (newWeather != oldWeather
&& (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED)) && (newWeather == WEATHER_RAIN || newWeather == WEATHER_RAIN_THUNDERSTORM))
IncrementGameStat(GAME_STAT_GOT_RAINED_ON); IncrementGameStat(GAME_STAT_GOT_RAINED_ON);
} }
src/map_name_popup.c
+1 -1
View File
@@ -371,7 +371,7 @@ static void LoadMapNamePopUpWindowBg(void)
LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), gMapPopUp_Outline_Table[popUpThemeId], 0x400, 0x21D); LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), gMapPopUp_Outline_Table[popUpThemeId], 0x400, 0x21D);
CallWindowFunction(popupWindowId, sub_80D4A78); CallWindowFunction(popupWindowId, sub_80D4A78);
PutWindowTilemap(popupWindowId); PutWindowTilemap(popupWindowId);
if(gMapHeader.weather == WEATHER_BUBBLES) if (gMapHeader.weather == WEATHER_UNDERWATER_BUBBLES)
LoadPalette(&gUnknown_0857F444, 0xE0, 0x20); LoadPalette(&gUnknown_0857F444, 0xE0, 0x20);
else else
LoadPalette(gMapPopUp_Palette_Table[popUpThemeId], 0xE0, 0x20); LoadPalette(gMapPopUp_Palette_Table[popUpThemeId], 0xE0, 0x20);
src/overworld.c
+4 -4
View File
@@ -432,11 +432,11 @@ static void Overworld_ResetStateAfterWhiteOut(void)
FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_USE_STRENGTH);
FlagClear(FLAG_SYS_USE_FLASH); FlagClear(FLAG_SYS_USE_FLASH);
// If you were defeated by Kyogre/Groudon and the step counter has // If you were defeated by Kyogre/Groudon and the step counter has
// maxed out, end the unusual weather. // maxed out, end the abnormal weather.
if (VarGet(VAR_SHOULD_END_UNUSUAL_WEATHER) == 1) if (VarGet(VAR_SHOULD_END_ABNORMAL_WEATHER) == 1)
{ {
VarSet(VAR_SHOULD_END_UNUSUAL_WEATHER, 0); VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 0);
VarSet(VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE); VarSet(VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE);
} }
} }
src/region_map.c
+2 -2
View File
@@ -1259,7 +1259,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void)
{ {
s16 idx; s16 idx;
idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION) - 1; idx = VarGet(VAR_ABNORMAL_WEATHER_LOCATION) - 1;
if (idx < 0 || idx > 15) if (idx < 0 || idx > 15)
{ {
idx = 0; idx = 0;
@@ -1271,7 +1271,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y)
{ {
u16 idx; u16 idx;
idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); idx = VarGet(VAR_ABNORMAL_WEATHER_LOCATION);
if (idx < 9 || idx > 16) if (idx < 9 || idx > 16)
{ {
idx = 9; idx = 9;