dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize EVENT_OBJECT to OBJECT_EVENT

Browse Source
This commit is contained in:
GriffinR
2019-11-20 23:12:51 -05:00
parent ec3e86f1d2
commit 82cb741d8b
611 changed files with 4984 additions and 4984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SafariZone_South/map.json
+6 -6
View File
@@ -31,7 +31,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 32,
"y": 34,
"elevation": 4,
@@ -44,7 +44,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 26,
"y": 28,
"elevation": 3,
@@ -57,7 +57,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 16,
"y": 6,
"elevation": 5,
@@ -70,7 +70,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 15,
"y": 31,
"elevation": 3,
@@ -83,7 +83,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 36,
"y": 16,
"elevation": 3,
@@ -96,7 +96,7 @@
"flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 36,
"y": 17,
"elevation": 3,
data/maps/SafariZone_South/scripts.inc
+3 -3
View File
@@ -9,7 +9,7 @@ SafariZone_South_OnFrame: @ 823D284
SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E
lockall
applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerEnter
applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerEnter
waitmovement 0
applymovement 1, SafariZone_South_Movement_ExitAttendantBlockDoor
waitmovement 0
@@ -76,7 +76,7 @@ SafariZone_South_EventScript_ExitEarly:: @ 823D31A
SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F
applymovement 1, SafariZone_South_Movement_MoveExitAttendantNorth
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth
applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth
waitmovement 0
goto SafariZone_South_EventScript_Exit
end
@@ -84,7 +84,7 @@ SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F
SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359
applymovement 1, SafariZone_South_Movement_MoveExitAttendantEast
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast
applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast
waitmovement 0
goto SafariZone_South_EventScript_Exit
end