diff options
| author | huderlem <huderlem@gmail.com> | 2020-02-12 18:34:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 18:34:19 -0600 |
| commit | 204c431993dad29661a9ff47326787cd0cf381e6 (patch) | |
| tree | bda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /data/maps/BattleFrontier_ReceptionGate | |
| parent | 66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff) | |
| parent | 6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff) | |
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'data/maps/BattleFrontier_ReceptionGate')
| -rw-r--r-- | data/maps/BattleFrontier_ReceptionGate/map.json | 12 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_ReceptionGate/scripts.inc | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ff891ad5b..ab82eec3e 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 11, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 8, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 8, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 0, "y": 4, "elevation": 0, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index cb01034ad..94fadd69a 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter waitmovement 0 goto BattleFrontier_ReceptionGate_EventScript_ScottScene end @@ -40,18 +40,18 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229 closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement 2, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark applymovement 2, Common_Movement_ExclamationMark - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_GreeterFaceScott applymovement 2, BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottEnter waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere, MSGBOX_DEFAULT |