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/SlateportCity/map.json
+35 -35
View File
@@ -31,7 +31,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 21,
"y": 11,
"elevation": 3,
@@ -44,7 +44,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_1",
"graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 34,
"y": 29,
"elevation": 3,
@@ -57,7 +57,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 5,
"y": 13,
"elevation": 3,
@@ -70,7 +70,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 26,
"y": 29,
"elevation": 3,
@@ -83,7 +83,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 31,
"y": 27,
"elevation": 3,
@@ -96,7 +96,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_COOK",
"graphics_id": "OBJ_EVENT_GFX_COOK",
"x": 5,
"y": 43,
"elevation": 3,
@@ -109,7 +109,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 20,
"y": 37,
"elevation": 3,
@@ -122,7 +122,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_1",
"graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 8,
"y": 42,
"elevation": 3,
@@ -135,7 +135,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMERAMAN",
"graphics_id": "OBJ_EVENT_GFX_CAMERAMAN",
"x": 29,
"y": 13,
"elevation": 3,
@@ -148,7 +148,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
},
{
"graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
"graphics_id": "OBJ_EVENT_GFX_REPORTER_F",
"x": 28,
"y": 14,
"elevation": 3,
@@ -161,7 +161,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 28,
"y": 13,
"elevation": 3,
@@ -174,7 +174,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 37,
"y": 41,
"elevation": 3,
@@ -187,7 +187,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 28,
"y": 46,
"elevation": 3,
@@ -200,7 +200,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 9,
"y": 50,
"elevation": 3,
@@ -213,7 +213,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 16,
"y": 46,
"elevation": 3,
@@ -226,7 +226,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 8,
"y": 24,
"elevation": 3,
@@ -239,7 +239,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 15,
"y": 31,
"elevation": 3,
@@ -252,7 +252,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 30,
"y": 27,
"elevation": 3,
@@ -265,7 +265,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 29,
"y": 27,
"elevation": 3,
@@ -278,7 +278,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
"graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
"x": 6,
"y": 38,
"elevation": 3,
@@ -291,7 +291,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
"graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
"x": 5,
"y": 51,
"elevation": 3,
@@ -304,7 +304,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_5",
"graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 34,
"y": 51,
"elevation": 3,
@@ -317,7 +317,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 4,
"y": 47,
"elevation": 3,
@@ -330,7 +330,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
"graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
"x": 11,
"y": 47,
"elevation": 3,
@@ -343,7 +343,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"x": 5,
"y": 47,
"elevation": 3,
@@ -356,7 +356,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 22,
"y": 27,
"elevation": 3,
@@ -369,7 +369,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 23,
"y": 27,
"elevation": 3,
@@ -382,7 +382,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 24,
"y": 27,
"elevation": 3,
@@ -395,7 +395,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 21,
"y": 26,
"elevation": 3,
@@ -408,7 +408,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 20,
"y": 26,
"elevation": 3,
@@ -421,7 +421,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 26,
"y": 27,
"elevation": 3,
@@ -434,7 +434,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 28,
"y": 27,
"elevation": 3,
@@ -447,7 +447,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 25,
"y": 27,
"elevation": 3,
@@ -460,7 +460,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 11,
"y": 37,
"elevation": 3,
@@ -473,7 +473,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCOTT",
"graphics_id": "OBJ_EVENT_GFX_SCOTT",
"x": 10,
"y": 12,
"elevation": 0,
data/maps/SlateportCity/scripts.inc
+6 -6
View File
@@ -56,7 +56,7 @@ SlateportCity_OnFrame: @ 81DCD12
SlateportCity_EventScript_ScottScene:: @ 81DCD1C
lockall
addobject 35
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
applymovement 35, SlateportCity_Movement_ScottApproachPlayer
waitmovement 0
msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT
@@ -572,7 +572,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8
waitmovement 0
delay 25
applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern
applymovement 10, SlateportCity_Movement_GabbyExit
applymovement 9, SlateportCity_Movement_TyExit
waitmovement 0
@@ -604,7 +604,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8
msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT
closemessage
applymovement 11, SlateportCity_Movement_SternEnterHarbor
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor
waitmovement 0
removeobject 11
clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
@@ -888,19 +888,19 @@ SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE
SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC
lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
waitmovement 0
opendoor 10, 12
waitdooranim
addobject 35
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown
applymovement 35, SlateportCity_Movement_ScottExitBattleTent
waitmovement 0
closedoor 10, 12
waitdooranim
msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit
applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent
waitmovement 0
removeobject 35