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/Route109/map.json
+24 -24
View File
@@ -26,7 +26,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT",
"graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT",
"x": 21,
"y": 26,
"elevation": 1,
@@ -39,7 +39,7 @@
"flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 21,
"y": 24,
"elevation": 3,
@@ -52,7 +52,7 @@
"flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY"
},
{
"graphics_id": "EVENT_OBJ_GFX_SWIMMER_M",
"graphics_id": "OBJ_EVENT_GFX_SWIMMER_M",
"x": 12,
"y": 36,
"elevation": 3,
@@ -65,7 +65,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SWIMMER_F",
"graphics_id": "OBJ_EVENT_GFX_SWIMMER_F",
"x": 25,
"y": 39,
"elevation": 1,
@@ -78,7 +78,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 15,
"y": 17,
"elevation": 4,
@@ -91,7 +91,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 24,
"y": 13,
"elevation": 3,
@@ -104,7 +104,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 19,
"y": 10,
"elevation": 3,
@@ -117,7 +117,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 22,
"y": 7,
"elevation": 3,
@@ -130,7 +130,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 11,
"y": 6,
"elevation": 3,
@@ -143,7 +143,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 27,
"y": 46,
"elevation": 3,
@@ -156,7 +156,7 @@
"flag": "FLAG_ITEM_ROUTE_109_PP_UP"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 29,
"y": 32,
"elevation": 3,
@@ -169,7 +169,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 28,
"y": 31,
"elevation": 3,
@@ -182,7 +182,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
"graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 21,
"y": 56,
"elevation": 0,
@@ -195,7 +195,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 24,
"y": 18,
"elevation": 3,
@@ -208,7 +208,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 25,
"y": 18,
"elevation": 3,
@@ -221,7 +221,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 30,
"y": 32,
"elevation": 3,
@@ -234,7 +234,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 8,
"y": 41,
"elevation": 3,
@@ -247,7 +247,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 9,
"y": 41,
"elevation": 3,
@@ -260,7 +260,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 33,
"y": 6,
"elevation": 3,
@@ -273,7 +273,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"x": 32,
"y": 6,
"elevation": 3,
@@ -286,7 +286,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 17,
"y": 13,
"elevation": 3,
@@ -299,7 +299,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 27,
"y": 7,
"elevation": 3,
@@ -312,7 +312,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 25,
"y": 6,
"elevation": 3,
@@ -325,7 +325,7 @@
"flag": "FLAG_ITEM_ROUTE_109_POTION"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_5",
"graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 17,
"y": 56,
"elevation": 3,
data/maps/Route109/scripts.inc
+9 -9
View File
@@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F
Route109_EventScript_StartDepartForDewford:: @ 81EE760
call EventScript_BackupMrBrineyLocation
setobjectpriority 2, MAP_ROUTE109, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0
applymovement 2, Route109_Movement_BrineyEnterBoat
waitmovement 0
removeobject 2
@@ -15,33 +15,33 @@ Route109_EventScript_StartDepartForDewford:: @ 81EE760
end
Route109_EventScript_EnterBoatSouth:: @ 81EE7A5
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth
waitmovement 0
goto Route109_EventScript_DoSailToDewford
end
Route109_EventScript_EnterBoatEast:: @ 81EE7B5
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast
waitmovement 0
goto Route109_EventScript_DoSailToDewford
end
Route109_EventScript_EnterBoatWest:: @ 81EE7C5
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest
waitmovement 0
goto Route109_EventScript_DoSailToDewford
end
Route109_EventScript_DoSailToDewford:: @ 81EE7D5
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
call Common_EventScript_PlayBrineysBoatMusic
applymovement 1, Route109_Movement_SailToDewford
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_SailToDewford
waitmovement 0
delay 50
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat
showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerExitBoat
waitmovement 0
addobject 4
clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
@@ -56,7 +56,7 @@ Route109_EventScript_DoSailToDewford:: @ 81EE7D5
msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
closemessage
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
resetobjectpriority 2, MAP_DEWFORD_TOWN
copyobjectxytoperm 2
release