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/Route104/map.json
+34 -34
View File
@@ -31,7 +31,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER",
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"x": 15,
"y": 60,
"elevation": 3,
@@ -44,7 +44,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_2",
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 25,
"y": 49,
"elevation": 3,
@@ -57,7 +57,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 31,
"y": 24,
"elevation": 3,
@@ -70,7 +70,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 27,
"y": 63,
"elevation": 3,
@@ -83,7 +83,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 30,
"y": 50,
"elevation": 3,
@@ -96,7 +96,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_3",
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 28,
"y": 74,
"elevation": 3,
@@ -109,7 +109,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT",
"graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT",
"x": 12,
"y": 54,
"elevation": 1,
@@ -122,7 +122,7 @@
"flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 12,
"y": 51,
"elevation": 4,
@@ -135,7 +135,7 @@
"flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY"
},
{
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
"graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 29,
"y": 8,
"elevation": 3,
@@ -148,7 +148,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 34,
"y": 6,
"elevation": 3,
@@ -161,7 +161,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 35,
"y": 6,
"elevation": 3,
@@ -174,7 +174,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 36,
"y": 6,
"elevation": 3,
@@ -187,7 +187,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 22,
"y": 41,
"elevation": 3,
@@ -200,7 +200,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 23,
"y": 41,
"elevation": 3,
@@ -213,7 +213,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 24,
"y": 41,
"elevation": 3,
@@ -226,7 +226,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 37,
"y": 8,
"elevation": 3,
@@ -239,7 +239,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 3,
"y": 22,
"elevation": 3,
@@ -252,7 +252,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 3,
"y": 23,
"elevation": 3,
@@ -265,7 +265,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 3,
"y": 24,
"elevation": 3,
@@ -278,7 +278,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
"graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 3,
"y": 25,
"elevation": 3,
@@ -291,7 +291,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 39,
"y": 15,
"elevation": 3,
@@ -304,7 +304,7 @@
"flag": "FLAG_ITEM_ROUTE_104_PP_UP"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 8,
"y": 19,
"elevation": 3,
@@ -317,7 +317,7 @@
"flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 27,
"y": 15,
"elevation": 3,
@@ -330,7 +330,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 28,
"y": 15,
"elevation": 3,
@@ -343,7 +343,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 21,
"y": 25,
"elevation": 3,
@@ -356,7 +356,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 11,
"y": 44,
"elevation": 3,
@@ -369,7 +369,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 29,
"y": 53,
"elevation": 3,
@@ -382,7 +382,7 @@
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 18,
"y": 67,
"elevation": 3,
@@ -395,7 +395,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 37,
"y": 22,
"elevation": 3,
@@ -408,7 +408,7 @@
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
},
{
"graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
"graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 35,
"y": 22,
"elevation": 3,
@@ -421,7 +421,7 @@
"flag": "FLAG_TEMP_11"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 8,
"elevation": 3,
@@ -434,7 +434,7 @@
"flag": "FLAG_ITEM_ROUTE_104_POTION"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 5,
"y": 26,
"elevation": 3,
@@ -447,7 +447,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
"graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 15,
"y": 59,
"elevation": 3,
@@ -460,7 +460,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 17,
"y": 50,
"elevation": 0,
data/maps/Route104/scripts.inc
+14 -14
View File
@@ -51,12 +51,12 @@ Route104_EventScript_RivalTrigger:: @ 81ECCB3
setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
delay 10
addobject 34
clearflag FLAG_HIDE_ROUTE_104_RIVAL
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBackUp
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBackUp
waitmovement 0
applymovement 34, Route104_Movement_RivalExitBrineysCottage
waitmovement 0
@@ -108,7 +108,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement 34, Route104_Movement_RivalWalkSlowLeft
msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT
closemessage
@@ -197,7 +197,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival
applymovement 34, Route104_Movement_RivalWalkSlowLeft
msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT
closemessage
@@ -358,13 +358,13 @@ Route104_EventScript_Girl2:: @ 81ED090
Route104_EventScript_SailToDewford:: @ 81ED099
setobjectpriority 8, MAP_ROUTE104, 0
setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0
applymovement 8, Route104_Movement_BrineyBoardBoat
waitmovement 0
removeobject 8
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBoardBoat
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBoardBoat
waitmovement 0
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
call Common_EventScript_PlayBrineysBoatMusic
goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall
goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls
@@ -372,13 +372,13 @@ Route104_EventScript_SailToDewford:: @ 81ED099
Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9
applymovement 7, Route104_Movement_SailToDewford
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewford
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford
waitmovement 0
goto Route104_EventScript_ArriveInDewford
Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
applymovement 7, Route104_Movement_SailToDewfordBeforeDadCalls
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
waitmovement 0
pokenavcall Route104_Text_DadPokenavCall
waitmessage
@@ -389,7 +389,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
closemessage
delay 30
setflag FLAG_ENABLE_NORMAN_MATCH_CALL
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls
applymovement 7, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104
waitmovement 7, MAP_ROUTE104
waitmovement 0
@@ -397,11 +397,11 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
Route104_EventScript_ArriveInDewford:: @ 81ED139
delay 50
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerExitBoat
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerExitBoat
waitmovement 0
call Common_EventScript_StopBrineysBoatMusic
showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerMoveForBriney
showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerMoveForBriney
waitmovement 0
setobjectxyperm 2, 12, 8
addobject 2
@@ -415,7 +415,7 @@ Route104_EventScript_ArriveInDewford:: @ 81ED139
setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
hideobjectat 7, MAP_ROUTE104
copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
resetobjectpriority 2, MAP_DEWFORD_TOWN
copyobjectxytoperm 2
setvar VAR_BOARD_BRINEY_BOAT_STATE, 0