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/LilycoveCity_ContestLobby/map.json
+25 -25
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 14,
"y": 2,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 15,
"y": 2,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 26,
"y": 9,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARTIST",
"graphics_id": "OBJ_EVENT_GFX_ARTIST",
"x": 9,
"y": 1,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 18,
"y": 8,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_2",
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 4,
"y": 9,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARTIST",
"graphics_id": "OBJ_EVENT_GFX_ARTIST",
"x": 3,
"y": 4,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_REPORTER_M",
"graphics_id": "OBJ_EVENT_GFX_REPORTER_M",
"x": 13,
"y": 10,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 23,
"y": 8,
"elevation": 3,
@@ -132,7 +132,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 28,
"y": 9,
"elevation": 3,
@@ -145,7 +145,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ARTIST",
"graphics_id": "OBJ_EVENT_GFX_ARTIST",
"x": 21,
"y": 1,
"elevation": 0,
@@ -158,7 +158,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_FISHERMAN",
"graphics_id": "OBJ_EVENT_GFX_FISHERMAN",
"x": 5,
"y": 6,
"elevation": 3,
@@ -171,7 +171,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 0,
"y": 8,
"elevation": 3,
@@ -184,7 +184,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 8,
"y": 7,
"elevation": 3,
@@ -197,7 +197,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 22,
"y": 9,
"elevation": 3,
@@ -210,7 +210,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 26,
"y": 5,
"elevation": 3,
@@ -223,7 +223,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_1",
"graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 24,
"y": 9,
"elevation": 3,
@@ -236,7 +236,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_5",
"graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 27,
"y": 3,
"elevation": 3,
@@ -249,7 +249,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 28,
"y": 3,
"elevation": 3,
@@ -262,7 +262,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 28,
"y": 7,
"elevation": 3,
@@ -275,7 +275,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_2",
"x": 26,
"y": 7,
"elevation": 3,
@@ -288,7 +288,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
"x": 27,
"y": 7,
"elevation": 3,
@@ -301,7 +301,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 26,
"y": 3,
"elevation": 3,
@@ -314,7 +314,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 26,
"y": 5,
"elevation": 3,
@@ -327,7 +327,7 @@
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 9,
"y": 10,
"elevation": 3,
data/maps/LilycoveCity_ContestLobby/scripts.inc
+6 -6
View File
@@ -38,7 +38,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
addobject 4
applymovement 4, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer
waitmovement 4
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist
applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
lockall
@@ -212,7 +212,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
addobject 11
applymovement 11, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer
waitmovement 11
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist
applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
lockall
@@ -424,12 +424,12 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670
delay 20
applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist
applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_ComeThroughHere, MSGBOX_DEFAULT
closemessage
applymovement 1, LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall
applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall
waitmovement 0
releaseall
return
@@ -947,7 +947,7 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
delay 20
applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist
applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist
waitmovement 0
messageautoscroll LilycoveCity_ContestLobby_Text_ComeThroughHere
waitmessage
@@ -955,7 +955,7 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
closemessage
call LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer
applymovement 2, LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall
applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall
applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall
waitmovement 0
release
return