document setweather calls

This commit is contained in:
Melody 2018-12-24 16:23:58 -05:00
parent 370b1093cd
commit 1e87810414
11 changed files with 22 additions and 21 deletions

View File

@ -11,6 +11,7 @@
#include "constants/species.h" #include "constants/species.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/vars.h" #include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/event.inc" .include "asm/macros/event.inc"
.include "constants/constants.inc" .include "constants/constants.inc"

View File

@ -7,12 +7,12 @@ FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
end end
FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98
setweather 1 setweather WEATHER_CLOUDS
doweather doweather
end end
FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D
setweather 0 setweather WEATHER_NONE
doweather doweather
end end

View File

@ -26,7 +26,7 @@ JaggedPass_MapScript1_23068B: @ 823068B
end end
JaggedPass_EventScript_230697:: @ 8230697 JaggedPass_EventScript_230697:: @ 8230697
setweather 7 setweather WEATHER_ASH
doweather doweather
return return

View File

@ -13,16 +13,16 @@ MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8
return return
MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9 MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9
setweather 6 setweather WEATHER_FOG_1
return return
MtPyre_Exterior_EventScript_231FED:: @ 8231FED MtPyre_Exterior_EventScript_231FED:: @ 8231FED
setweather 6 setweather WEATHER_FOG_1
doweather doweather
end end
MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2 MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2
setweather 2 setweather WEATHER_SUNNY
doweather doweather
end end

View File

@ -42,7 +42,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230 applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_269230
waitmovement 0 waitmovement 0
delay 50 delay 50
setweather 0 setweather WEATHER_NONE
doweather doweather
waitse waitse
playmoncry SPECIES_HO_OH, 2 playmoncry SPECIES_HO_OH, 2

View File

@ -81,7 +81,7 @@ Route111_EventScript_1F0DE6:: @ 81F0DE6
goto_if_lt Route111_EventScript_1F0E25 goto_if_lt Route111_EventScript_1F0E25
Route111_EventScript_1F0E22:: @ 81F0E22 Route111_EventScript_1F0E22:: @ 81F0E22
setweather 8 setweather WEATHER_SANDSTORM
Route111_EventScript_1F0E25:: @ 81F0E25 Route111_EventScript_1F0E25:: @ 81F0E25
return return
@ -259,14 +259,14 @@ Route111_Movement_1F0FAE: @ 81F0FAE
step_end step_end
Route111_EventScript_1F0FB0:: @ 81F0FB0 Route111_EventScript_1F0FB0:: @ 81F0FB0
setweather 2 setweather WEATHER_SUNNY
fadenewbgm MUS_DOORO_X1 fadenewbgm MUS_DOORO_X1
doweather doweather
setvar VAR_TEMP_3, 0 setvar VAR_TEMP_3, 0
end end
Route111_EventScript_1F0FBD:: @ 81F0FBD Route111_EventScript_1F0FBD:: @ 81F0FBD
setweather 8 setweather WEATHER_SANDSTORM
fadenewbgm MUS_ASHROAD fadenewbgm MUS_ASHROAD
doweather doweather
end end

View File

@ -18,7 +18,7 @@ Route113_EventScript_1F216A:: @ 81F216A
goto_if_lt Route113_EventScript_1F2189 goto_if_lt Route113_EventScript_1F2189
compare VAR_TEMP_0, 84 compare VAR_TEMP_0, 84
goto_if_gt Route113_EventScript_1F2189 goto_if_gt Route113_EventScript_1F2189
setweather 7 setweather WEATHER_ASH
return return
Route113_EventScript_1F2189:: @ 81F2189 Route113_EventScript_1F2189:: @ 81F2189

View File

@ -76,11 +76,11 @@ Route120_EventScript_1F54D8:: @ 81F54D8
return return
Route120_EventScript_1F54FF:: @ 81F54FF Route120_EventScript_1F54FF:: @ 81F54FF
setweather 1 setweather WEATHER_CLOUDS
return return
Route120_EventScript_1F5503:: @ 81F5503 Route120_EventScript_1F5503:: @ 81F5503
setweather 2 setweather WEATHER_SUNNY
return return
Route120_EventScript_1F5507:: @ 81F5507 Route120_EventScript_1F5507:: @ 81F5507
@ -92,7 +92,7 @@ Route120_EventScript_1F5507:: @ 81F5507
end end
Route120_EventScript_1F5523:: @ 81F5523 Route120_EventScript_1F5523:: @ 81F5523
setweather 3 setweather WEATHER_RAIN_LIGHT
return return
Route120_EventScript_1F5527:: @ 81F5527 Route120_EventScript_1F5527:: @ 81F5527

View File

@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC
msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
setweather 0 setweather WEATHER_NONE
doweather doweather
special sub_80B05B4 special sub_80B05B4
waitstate waitstate

View File

@ -72,7 +72,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
closemessage closemessage
setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_SYS_WEATHER_CTRL
setweather 15 setweather WEATHER_15
doweather doweather
special WaitWeather special WaitWeather
waitstate waitstate

View File

@ -117,7 +117,7 @@ SootopolisCity_EventScript_1E583D:: @ 81E583D
return return
SootopolisCity_EventScript_1E583E:: @ 81E583E SootopolisCity_EventScript_1E583E:: @ 81E583E
setweather 13 setweather WEATHER_RAIN_HEAVY
return return
SootopolisCity_EventScript_1E5842:: @ 81E5842 SootopolisCity_EventScript_1E5842:: @ 81E5842
@ -214,7 +214,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed 1, 8
setweather 15 setweather WEATHER_15
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_813B7D8 special sub_813B7D8
@ -314,7 +314,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
special RemoveCameraObject special RemoveCameraObject
delay 60 delay 60
fadescreenspeed 1, 8 fadescreenspeed 1, 8
setweather 15 setweather WEATHER_15
doweather doweather
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special sub_813B7D8 special sub_813B7D8
@ -532,7 +532,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
special sub_8139560 special sub_8139560
waitstate waitstate
waitmoncry waitmoncry
setweather 0 setweather WEATHER_NONE
doweather doweather
applymovement 11, SootopolisCity_Movement_1E5E5B applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0 waitmovement 0
@ -585,7 +585,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
special sub_8139560 special sub_8139560
waitstate waitstate
waitmoncry waitmoncry
setweather 0 setweather WEATHER_NONE
doweather doweather
applymovement 11, SootopolisCity_Movement_1E5E5B applymovement 11, SootopolisCity_Movement_1E5E5B
waitmovement 0 waitmovement 0