summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data-de/event_scripts.s5
-rw-r--r--data/event_scripts.s5
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc2
-rw-r--r--data/scripts/maps/JaggedPass.inc2
-rw-r--r--data/scripts/maps/LavaridgeTown.inc2
-rw-r--r--data/scripts/maps/MtPyre_Exterior.inc6
-rw-r--r--data/scripts/maps/Route111.inc6
-rw-r--r--data/scripts/maps/Route113.inc2
-rw-r--r--data/scripts/maps/Route120.inc6
-rw-r--r--data/scripts/maps/SeafloorCavern_Room9.inc2
10 files changed, 20 insertions, 18 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index ab511dcd6..b8cc5d8f6 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -8,6 +8,7 @@
#include "constants/opponents.h"
#include "constants/songs.h"
#include "constants/species.h"
+#include "constants/weather.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
@@ -2096,9 +2097,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1
Route128_EventScript_1A02C1:: @ 81A02C1
SootopolisCity_EventScript_1A02C1:: @ 81A02C1
.ifdef SAPPHIRE
- setweather 13
+ setweather WEATHER_RAIN_HEAVY
.else
- setweather 12
+ setweather WEATHER_DROUGHT
.endif
return
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b751a2e63..8b0011893 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -8,6 +8,7 @@
#include "constants/opponents.h"
#include "constants/songs.h"
#include "constants/species.h"
+#include "constants/weather.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
@@ -2090,9 +2091,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1
Route128_EventScript_1A02C1:: @ 81A02C1
SootopolisCity_EventScript_1A02C1:: @ 81A02C1
.ifdef SAPPHIRE
- setweather 13
+ setweather WEATHER_RAIN_HEAVY
.else
- setweather 12
+ setweather WEATHER_DROUGHT
.endif
return
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index 904759cf1..315dda886 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -33,7 +33,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
.endif
closemessage
- setweather 0
+ setweather WEATHER_NONE
doweather
special WaitWeather
waitstate
diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc
index bf1f0233d..efe5d6a6e 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/scripts/maps/JaggedPass.inc
@@ -13,7 +13,7 @@ JaggedPass_MapScript1_15D274:: @ 815D274
end
JaggedPass_EventScript_15D280:: @ 815D280
- setweather 7
+ setweather WEATHER_ASH
doweather
return
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index e81c3b69f..f1a6deed0 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -286,7 +286,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
message LavaridgeTown_Text_16C2EA
waitfanfare
waitmessage
- giveegg 360
+ giveegg SPECIES_WYNAUT
release
end
diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc
index 76f1736c2..ec5864df5 100644
--- a/data/scripts/maps/MtPyre_Exterior.inc
+++ b/data/scripts/maps/MtPyre_Exterior.inc
@@ -13,15 +13,15 @@ MtPyre_Exterior_EventScript_15D492:: @ 815D492
return
MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3
- setweather 6
+ setweather WEATHER_FOG_1
return
MtPyre_Exterior_EventScript_15D4A7:: @ 815D4A7
- setweather 6
+ setweather WEATHER_FOG_1
doweather
end
MtPyre_Exterior_EventScript_15D4AC:: @ 815D4AC
- setweather 2
+ setweather WEATHER_SUNNY
doweather
end
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index d0f4e6394..c3d807f66 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -34,7 +34,7 @@ Route111_EventScript_14FFCD:: @ 814FFCD
goto_if 0, Route111_EventScript_15000C
Route111_EventScript_150009:: @ 8150009
- setweather 8
+ setweather WEATHER_SANDSTORM
Route111_EventScript_15000C:: @ 815000C
return
@@ -221,14 +221,14 @@ Route111_Movement_1501BA:: @ 81501BA
step_end
Route111_EventScript_1501BC:: @ 81501BC
- setweather 2
+ setweather WEATHER_SUNNY
fadenewbgm BGM_DOORO_X1
doweather
setvar VAR_TEMP_3, 0
end
Route111_EventScript_1501C9:: @ 81501C9
- setweather 8
+ setweather WEATHER_SANDSTORM
fadenewbgm BGM_ASHROAD
doweather
end
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc
index 1b589fcde..a1593ba1e 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/scripts/maps/Route113.inc
@@ -18,7 +18,7 @@ Route113_EventScript_1505E5:: @ 81505E5
goto_if 0, Route113_EventScript_150604
compare VAR_TEMP_0, 84
goto_if 2, Route113_EventScript_150604
- setweather 7
+ setweather WEATHER_ASH
return
Route113_EventScript_150604:: @ 8150604
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index d2866cceb..3858c0e4f 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -90,11 +90,11 @@ Route120_EventScript_1516EA:: @ 81516EA
return
Route120_EventScript_151711:: @ 8151711
- setweather 1
+ setweather WEATHER_CLOUDS
return
Route120_EventScript_151715:: @ 8151715
- setweather 2
+ setweather WEATHER_SUNNY
return
Route120_EventScript_151719:: @ 8151719
@@ -106,7 +106,7 @@ Route120_EventScript_151719:: @ 8151719
end
Route120_EventScript_151735:: @ 8151735
- setweather 3
+ setweather WEATHER_RAIN_LIGHT
return
Route120_EventScript_151739:: @ 8151739
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index 54c99b371..afc076a65 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -62,7 +62,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
.else
msgbox SeafloorCavern_Room9_Text_1B49C1, 4
.endif
- setweather 0
+ setweather WEATHER_NONE
doweather
special sub_8081924
waitstate
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 15:43:06 +0000