diff options
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1167562ce..605cf23ac 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2,11 +2,14 @@ #include "constants/apprentice.h" #include "constants/battle.h" #include "constants/battle_arena.h" +#include "constants/battle_dome.h" +#include "constants/battle_factory.h" #include "constants/battle_frontier.h" #include "constants/battle_palace.h" #include "constants/battle_pike.h" #include "constants/battle_pyramid.h" #include "constants/battle_setup.h" +#include "constants/battle_tent.h" #include "constants/battle_tower.h" #include "constants/berry.h" #include "constants/cable_club.h" @@ -453,21 +456,6 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/SSTidalLowerDeck/scripts.inc" .include "data/maps/SSTidalRooms/scripts.inc" .include "data/maps/BattlePyramidSquare01/scripts.inc" - .include "data/maps/BattlePyramidSquare02/scripts.inc" - .include "data/maps/BattlePyramidSquare03/scripts.inc" - .include "data/maps/BattlePyramidSquare04/scripts.inc" - .include "data/maps/BattlePyramidSquare05/scripts.inc" - .include "data/maps/BattlePyramidSquare06/scripts.inc" - .include "data/maps/BattlePyramidSquare07/scripts.inc" - .include "data/maps/BattlePyramidSquare08/scripts.inc" - .include "data/maps/BattlePyramidSquare09/scripts.inc" - .include "data/maps/BattlePyramidSquare10/scripts.inc" - .include "data/maps/BattlePyramidSquare11/scripts.inc" - .include "data/maps/BattlePyramidSquare12/scripts.inc" - .include "data/maps/BattlePyramidSquare13/scripts.inc" - .include "data/maps/BattlePyramidSquare14/scripts.inc" - .include "data/maps/BattlePyramidSquare15/scripts.inc" - .include "data/maps/BattlePyramidSquare16/scripts.inc" .include "data/maps/UnionRoom/scripts.inc" .include "data/maps/SafariZone_Northwest/scripts.inc" .include "data/maps/SafariZone_North/scripts.inc" @@ -775,8 +763,8 @@ Common_EventScript_NoRoomForDecor:: @ 8272071 msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT return -Common_EventScript_SetAlternatingWeather:: @ 827207A - setweather WEATHER_ALTERNATING +Common_EventScript_SetAbnormalWeather:: @ 827207A + setweather WEATHER_ABNORMAL return Common_EventScript_PlayGymBadgeFanfare:: @ 827207E @@ -1024,7 +1012,7 @@ gText_LegendaryFlewAway:: @ 8273204 .include "data/text/pc_transfer.inc" .include "data/text/mevent.inc" - .include "data/text/unusual_weather.inc" + .include "data/text/abnormal_weather.inc" EventScript_SelectWithoutRegisteredItem:: @ 82736B3 msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN @@ -1074,7 +1062,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776 .include "data/scripts/pc_transfer.inc" .include "data/scripts/mevent.inc" - .include "data/scripts/unusual_weather.inc" + .include "data/scripts/abnormal_weather.inc" .include "data/scripts/trainer_script.inc" .include "data/scripts/berry_tree.inc" .include "data/scripts/secret_base.inc" |