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/LittlerootTown_MaysHouse_1F/map.json
+7 -7
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_MOM",
"graphics_id": "OBJ_EVENT_GFX_MOM",
"x": 8,
"y": 6,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM"
},
{
"graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY",
"graphics_id": "OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY",
"x": 6,
"y": 5,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX",
"graphics_id": "OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX",
"x": 9,
"y": 3,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 8,
"y": 7,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM"
},
{
"graphics_id": "EVENT_OBJ_GFX_NORMAN",
"graphics_id": "OBJ_EVENT_GFX_NORMAN",
"x": 5,
"y": 6,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 9,
"y": 5,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL",
"x": 2,
"y": 8,
"elevation": 3,
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+6 -6
View File
@@ -62,7 +62,7 @@ LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
lockall
msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
applymovement 1, LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs
waitmovement 0
warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
@@ -95,7 +95,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
waitmovement 0
applymovement 4, Common_Movement_Delay48
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement 4, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach
waitmovement 0
special GetRivalSonDaughterString
@@ -217,7 +217,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
end
LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -263,19 +263,19 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
step_end
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1
waitmovement 0
return
LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E
applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2
applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2
applymovement 7, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2
waitmovement 0
return