summaryrefslogtreecommitdiff
path: root/data/maps/SecretBase_Shrub2
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-07-24 21:18:36 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-07-24 21:18:36 -0700
commite92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch)
treeb3e357be8cec0c64a84773a7b63f54f97825cbaf /data/maps/SecretBase_Shrub2
parent156fb472e10c10751268d2339b2526c8bd07e34f (diff)
parent5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff)
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/SecretBase_Shrub2')
-rw-r--r--data/maps/SecretBase_Shrub2/events.inc30
-rw-r--r--data/maps/SecretBase_Shrub2/header.inc8
2 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc
index a370d2e72..1acb5d0a1 100644
--- a/data/maps/SecretBase_Shrub2/events.inc
+++ b/data/maps/SecretBase_Shrub2/events.inc
@@ -1,19 +1,19 @@
SecretBase_Shrub2_EventObjects: @ 8538990
- object_event 1, 255, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173
- object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174
- object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175
- object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176
- object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177
- object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178
- object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179
- object_event 8, 246, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180
- object_event 9, 247, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181
- object_event 10, 248, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182
- object_event 11, 249, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, 183
- object_event 12, 250, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, 184
- object_event 13, 251, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, 185
- object_event 14, 252, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, 186
- object_event 15, 253, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, 187
+ object_event 1, 255, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173
+ object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 174
+ object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 175
+ object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 176
+ object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 177
+ object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 178
+ object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 179
+ object_event 8, 246, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 180
+ object_event 9, 247, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 181
+ object_event 10, 248, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 182
+ object_event 11, 249, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 183
+ object_event 12, 250, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 184
+ object_event 13, 251, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 185
+ object_event 14, 252, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 186
+ object_event 15, 253, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 187
SecretBase_Shrub2_MapWarps: @ 8538AF8
warp_def 7, 5, 0, 126, MAP_NONE
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 760781e47..7beeb3d8b 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -5,11 +5,11 @@ SecretBase_Shrub2: @ 8484BC4
.4byte 0x0
.2byte MUS_MACHI_S3
.2byte 208
- .byte 86
+ .byte MAPSEC_SECRET_BASE
.byte 0
- .byte 0
- .byte 9
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_SECRET_BASE
.2byte 0
.byte 12
- .byte 8
+ .byte MAP_BATTLE_SCENE_FRONTIER