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/Route110_TrickHouseEnd | |
| parent | ec3e86f1d2f78bb9fece0956e246862cea3c07b9 (diff) | |
Standardize EVENT_OBJECT to OBJECT_EVENT
Diffstat (limited to 'data/maps/Route110_TrickHouseEnd')
| -rw-r--r-- | data/maps/Route110_TrickHouseEnd/map.json | 2 | ||||
| -rw-r--r-- | data/maps/Route110_TrickHouseEnd/scripts.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 6bf0d7985..859a3f143 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 91d70160f..c4645a46a 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -241,11 +241,11 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom waitmovement 0 delay 4 turnobject 1, DIR_EAST |