diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-13 19:25:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 19:25:41 -0500 |
| commit | ff7e11c0b0b34fce0891b7bc1731971b2e0bfbc4 (patch) | |
| tree | daa010cdfdbf3fbf8868ac72d88fc40e2f332e28 /data/event_scripts.s | |
| parent | 7455bd9b9a6c02e5ff567400fde3ea6315be5837 (diff) | |
| parent | ef8370566f14c22b9927db09b8ff69a98049c796 (diff) | |
Merge branch 'master' into doc-scriptclean
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 9dfc8c891..65f106a06 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -40,6 +40,7 @@ #include "constants/trainer_hill.h" #include "constants/trainers.h" #include "constants/tv.h" +#include "constants/union_room.h" #include "constants/vars.h" #include "constants/weather.h" .include "asm/macros.inc" @@ -442,18 +443,7 @@ gStdScripts_End:: @ 81DC2CC .include "data/maps/TradeCenter/scripts.inc" .include "data/maps/RecordCorner/scripts.inc" .include "data/maps/BattleColosseum4P/scripts.inc" - .include "data/maps/LinkContestRoom1/scripts.inc" - .include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc" - .include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc" - .include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc" - .include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc" - .include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc" - .include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc" - .include "data/maps/LinkContestRoom2/scripts.inc" - .include "data/maps/LinkContestRoom3/scripts.inc" - .include "data/maps/LinkContestRoom4/scripts.inc" - .include "data/maps/LinkContestRoom5/scripts.inc" - .include "data/maps/LinkContestRoom6/scripts.inc" + .include "data/maps/ContestHall/scripts.inc" .include "data/maps/InsideOfTruck/scripts.inc" .include "data/maps/SSTidalCorridor/scripts.inc" .include "data/maps/SSTidalLowerDeck/scripts.inc" @@ -1103,7 +1093,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776 .include "data/scripts/day_care.inc" .include "data/scripts/flash.inc" .include "data/scripts/players_house.inc" - .include "data/scripts/pokeblocks.inc" + .include "data/scripts/berry_blender.inc" .include "data/text/mauville_man.inc" .include "data/text/trainers.inc" .include "data/scripts/repel.inc" @@ -1122,7 +1112,7 @@ Common_EventScript_LegendaryFlewAway:: @ 8273776 .include "data/scripts/apprentice.inc" .include "data/text/battle_dome.inc" .include "data/scripts/battle_pike.inc" - .include "data/text/contest_hall.inc" + .include "data/text/blend_master.inc" .include "data/text/battle_tent.inc" .include "data/text/event_ticket_2.inc" .include "data/text/move_tutors.inc" |