diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/map_events.s | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/map_events.s')
| -rw-r--r-- | data/map_events.s | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/data/map_events.s b/data/map_events.s index 68c8e510e..a06eb36d0 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,3 +1,10 @@ +#include "constants/flags.h" +#include "constants/items.h" +#include "constants/map_objects.h" +#include "constants/maps.h" +#include "constants/secret_bases.h" +#include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -396,15 +403,4 @@ .include "data/maps/events/Route119_WeatherInstitute_1F.inc" .include "data/maps/events/Route119_WeatherInstitute_2F.inc" .include "data/maps/events/Route119_House.inc" -Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 - warp_def 3, 8, 0, 0, Route124 - warp_def 4, 8, 0, 0, Route124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 - -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 - map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" |