diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 08:08:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 08:08:51 -0500 |
| commit | bebcea402921d23232f7657fcfdab810f8699399 (patch) | |
| tree | a59ea431d486bf23cde76e35ca789d1a0d113f3e /data/maps/events/SecretBase_Tree3.inc | |
| parent | f810c9ecade3d793a139f67cd8f63effc5644b99 (diff) | |
| parent | e01dd90bb36f850fe88f2b1edae65c74b3bc48b1 (diff) | |
Merge pull request #263 from huderlem/event_object_movement
Sync event object movement with pokeruby
Diffstat (limited to 'data/maps/events/SecretBase_Tree3.inc')
| -rw-r--r-- | data/maps/events/SecretBase_Tree3.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 6fbd60683..a13916bc7 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,11 +1,11 @@ -SecretBase_Tree3_MapObjects: @ 8539124 +SecretBase_Tree3_EventObjects: @ 8539124 object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, NONE SecretBase_Tree3_MapEvents:: @ 8539294 - map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 |