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/LavaridgeTown/map.json
+9 -9
View File
@@ -21,7 +21,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 8,
"y": 7,
"elevation": 3,
@@ -34,7 +34,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 5,
"y": 1,
"elevation": 3,
@@ -47,7 +47,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 5,
"y": 8,
"elevation": 3,
@@ -60,7 +60,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 10,
"y": 13,
"elevation": 3,
@@ -73,7 +73,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN",
"graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN",
"x": 4,
"y": 4,
"elevation": 3,
@@ -86,7 +86,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN",
"graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN",
"x": 5,
"y": 4,
"elevation": 3,
@@ -99,7 +99,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_3",
"graphics_id": "OBJ_EVENT_GFX_VAR_3",
"x": 6,
"y": 16,
"elevation": 3,
@@ -112,7 +112,7 @@
"flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 12,
"y": 15,
"elevation": 0,
@@ -125,7 +125,7 @@
"flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 4,
"y": 7,
"elevation": 3,
data/maps/LavaridgeTown/scripts.inc
+2 -2
View File
@@ -134,7 +134,7 @@ LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C
waitmovement 0
applymovement 8, Common_Movement_Delay48
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
@@ -149,7 +149,7 @@ LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC
return
LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7
applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit
applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit
applymovement 7, LavaridgeTown_Movement_RivalExit1
waitmovement 0
return