summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s1
-rw-r--r--data/maps/FarawayIsland_Entrance/scripts.inc4
-rw-r--r--data/maps/JaggedPass/scripts.inc2
-rw-r--r--data/maps/MtPyre_Exterior/scripts.inc6
-rw-r--r--data/maps/NavelRock_Top/scripts.inc2
-rw-r--r--data/maps/Route111/scripts.inc6
-rw-r--r--data/maps/Route113/scripts.inc2
-rw-r--r--data/maps/Route120/scripts.inc6
-rw-r--r--data/maps/SeafloorCavern_Room9/scripts.inc2
-rw-r--r--data/maps/SkyPillar_Outside/scripts.inc2
-rw-r--r--data/maps/SootopolisCity/scripts.inc10
11 files changed, 22 insertions, 21 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1bccdbc57..5b15bf090 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -11,6 +11,7 @@
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/vars.h"
+#include "constants/weather.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc
index 512171b37..8661c4c52 100644
--- a/data/maps/FarawayIsland_Entrance/scripts.inc
+++ b/data/maps/FarawayIsland_Entrance/scripts.inc
@@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
end
FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98
- setweather 1
+ setweather WEATHER_CLOUDS
doweather
end
FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
- setweather 0
+ setweather WEATHER_NONE
doweather
end
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 0760cc05a..a140093ca 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -26,7 +26,7 @@ JaggedPass_MapScript1_23068B: @ 823068B
end
JaggedPass_EventScript_230697:: @ 8230697
- setweather 7
+ setweather WEATHER_ASH
doweather
return
diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc
index 6f078c06c..fe51946dc 100644
--- a/data/maps/MtPyre_Exterior/scripts.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
@@ -13,16 +13,16 @@ MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8
return
MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9
- setweather 6
+ setweather WEATHER_FOG_1
return
MtPyre_Exterior_EventScript_231FED:: @ 8231FED
- setweather 6
+ setweather WEATHER_FOG_1
doweather
end
MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2
- setweather 2
+ setweather WEATHER_SUNNY
doweather
end
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
index 61b046daf..28d55d68f 100644
--- a/data/maps/NavelRock_Top/scripts.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -42,7 +42,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230
waitmovement 0
delay 50
- setweather 0
+ setweather WEATHER_NONE
doweather
waitse
playmoncry SPECIES_HO_OH, 2
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 0149299c1..95a7c89ed 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -81,7 +81,7 @@ Route111_EventScript_1F0DE6:: @ 81F0DE6
goto_if_lt Route111_EventScript_1F0E25
Route111_EventScript_1F0E22:: @ 81F0E22
- setweather 8
+ setweather WEATHER_SANDSTORM
Route111_EventScript_1F0E25:: @ 81F0E25
return
@@ -259,14 +259,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE
step_end
Route111_EventScript_1F0FB0:: @ 81F0FB0
- setweather 2
+ setweather WEATHER_SUNNY
fadenewbgm MUS_DOORO_X1
doweather
setvar VAR_TEMP_3, 0
end
Route111_EventScript_1F0FBD:: @ 81F0FBD
- setweather 8
+ setweather WEATHER_SANDSTORM
fadenewbgm MUS_ASHROAD
doweather
end
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 85aa250ab..7668432ab 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -18,7 +18,7 @@ Route113_EventScript_1F216A:: @ 81F216A
goto_if_lt Route113_EventScript_1F2189
compare VAR_TEMP_0, 84
goto_if_gt Route113_EventScript_1F2189
- setweather 7
+ setweather WEATHER_ASH
return
Route113_EventScript_1F2189:: @ 81F2189
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index ccd77b4cc..cde0fbbd3 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -76,11 +76,11 @@ Route120_EventScript_1F54D8:: @ 81F54D8
return
Route120_EventScript_1F54FF:: @ 81F54FF
- setweather 1
+ setweather WEATHER_CLOUDS
return
Route120_EventScript_1F5503:: @ 81F5503
- setweather 2
+ setweather WEATHER_SUNNY
return
Route120_EventScript_1F5507:: @ 81F5507
@@ -92,7 +92,7 @@ Route120_EventScript_1F5507:: @ 81F5507
end
Route120_EventScript_1F5523:: @ 81F5523
- setweather 3
+ setweather WEATHER_RAIN_LIGHT
return
Route120_EventScript_1F5527:: @ 81F5527
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 951f967a3..212496eef 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
- setweather 0
+ setweather WEATHER_NONE
doweather
special sub_80B05B4
waitstate
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 4f5680522..4e7701de6 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
closemessage
setflag FLAG_SYS_WEATHER_CTRL
- setweather 15
+ setweather WEATHER_15
doweather
special WaitWeather
waitstate
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 38b60e430..c050fb0b1 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -117,7 +117,7 @@ SootopolisCity_EventScript_1E583D:: @ 81E583D
return
SootopolisCity_EventScript_1E583E:: @ 81E583E
- setweather 13
+ setweather WEATHER_RAIN_HEAVY
return
SootopolisCity_EventScript_1E5842:: @ 81E5842
@@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
- setweather 15
+ setweather WEATHER_15
doweather
setvar VAR_0x8004, 0
special sub_813B7D8
@@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
special RemoveCameraObject
delay 60
fadescreenspeed 1, 8
- setweather 15
+ setweather WEATHER_15
doweather
setvar VAR_0x8004, 0
special sub_813B7D8
@@ -532,7 +532,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
special sub_8139560
waitstate
waitmoncry
- setweather 0
+ setweather WEATHER_NONE
doweather
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
@@ -585,7 +585,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
special sub_8139560
waitstate
waitmoncry
- setweather 0
+ setweather WEATHER_NONE
doweather
applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 03:52:21 +0000