diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-15 23:40:46 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-15 23:40:46 -0500 |
| commit | 5e97fb83269bbee6b5adf9c7aeb992f45a6dd563 (patch) | |
| tree | 2397b71c99e8e236a9f131c216d2c791ecd4ec52 | |
| parent | a465fd339c08791d247f6897230cef94a17d8ca4 (diff) | |
fix Route124 concatenation in map_events.s
| -rw-r--r-- | data/map_events.s | 13 | ||||
| -rwxr-xr-x | data/maps/events/Route124_DivingTreasureHuntersHouse.inc | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/data/map_events.s b/data/map_events.s index 68c8e510e..7156e4b6e 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -396,15 +396,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" diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc new file mode 100755 index 000000000..5d60c795e --- /dev/null +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -0,0 +1,12 @@ +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 |