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/Route119_WeatherInstitute_2F | |
| parent | ec3e86f1d2f78bb9fece0956e246862cea3c07b9 (diff) | |
Standardize EVENT_OBJECT to OBJECT_EVENT
Diffstat (limited to 'data/maps/Route119_WeatherInstitute_2F')
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_2F/map.json | 16 | ||||
| -rw-r--r-- | data/maps/Route119_WeatherInstitute_2F/scripts.inc | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index c5b0adcc6..fce896243 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 15, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 4, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 0, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 7, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 16, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 19, "y": 6, "elevation": 3, diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index df1021530..04318bbb2 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -50,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 closemessage addobject 7 @ Aqua grunt applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay + applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage @@ -72,7 +72,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition + applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer |