diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-20 23:12:51 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-20 23:12:51 -0500 |
| commit | 82cb741d8b2b2d88c1e23d2d5ccf5443892538fa (patch) | |
| tree | c05b6424006d1d46a3d38c0205c1dfce986c6fdc /data/maps/RustboroCity_DevonCorp_3F | |
| parent | ec3e86f1d2f78bb9fece0956e246862cea3c07b9 (diff) | |
Standardize EVENT_OBJECT to OBJECT_EVENT
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_3F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/map.json | 6 | ||||
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/scripts.inc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 3a6fdaa51..aacaaaa9c 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 143ff4543..c85310fc6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_OnWarp: @ 8212455 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F - turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST + turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST end RustboroCity_DevonCorp_3F_OnFrame: @ 8212464 @@ -39,13 +39,13 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem_std ITEM_LETTER |