Standardize EVENT_OBJECT to OBJECT_EVENT

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
+6 -6
View File
@@ -26,7 +26,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 16,
"y": 8,
"elevation": 3,
@@ -39,7 +39,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
"graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH",
"x": 9,
"y": 13,
"elevation": 0,
@@ -52,7 +52,7 @@
"flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE"
},
{
"graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG",
"graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG",
"x": 7,
"y": 14,
"elevation": 3,
@@ -65,7 +65,7 @@
"flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG"
},
{
"graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1",
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1",
"x": 10,
"y": 13,
"elevation": 0,
@@ -78,7 +78,7 @@
"flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON"
},
{
"graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH",
"graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH",
"x": 5,
"y": 11,
"elevation": 3,
@@ -91,7 +91,7 @@
"flag": "FLAG_HIDE_ROUTE_101_BIRCH"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 2,
"y": 13,
"elevation": 3,
+6 -6
View File
@@ -23,7 +23,7 @@ Route101_EventScript_StartBirchRescue:: @ 81EBCDE
closemessage
setobjectxy 2, 0, 15
setobjectxy 4, 0, 16
applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_EnterScene
applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_EnterScene
applymovement 2, Route101_Movement_BirchRunAway1
applymovement 4, Route101_Movement_PoochyenaChase1
waitmovement 0
@@ -45,7 +45,7 @@ Route101_EventScript_PreventExitSouth:: @ 81EBD4E
lockall
msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitSouth
applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitSouth
waitmovement 0
releaseall
end
@@ -54,7 +54,7 @@ Route101_EventScript_PreventExitWest:: @ 81EBD64
lockall
msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitWest
applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitWest
waitmovement 0
releaseall
end
@@ -63,7 +63,7 @@ Route101_EventScript_PreventExitNorth:: @ 81EBD7A
lockall
msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitNorth
applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitNorth
waitmovement 0
releaseall
end
@@ -222,8 +222,8 @@ Route101_EventScript_BirchsBag:: @ 81EBE16
setflag FLAG_RESCUED_BIRCH
fadescreen 1
removeobject 4
setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
special ChooseStarter
waitstate