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_OceanicMuseum_1F/map.json
+14 -14
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 7,
"y": 7,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 18,
"y": 5,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 12,
"y": 2,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 2,
"y": 8,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 3,
"y": 4,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 14,
"y": 4,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 12,
"y": 7,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 8,
"y": 3,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 4,
"y": 2,
"elevation": 3,
@@ -132,7 +132,7 @@
"flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10,
"y": 2,
"elevation": 3,
@@ -145,7 +145,7 @@
"flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"x": 17,
"y": 7,
"elevation": 3,
@@ -158,7 +158,7 @@
"flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 18,
"y": 8,
"elevation": 3,
@@ -171,7 +171,7 @@
"flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 9,
"y": 4,
"elevation": 3,
@@ -184,7 +184,7 @@
"flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT"
},
{
"graphics_id": "EVENT_OBJ_GFX_REPORTER_M",
"graphics_id": "OBJ_EVENT_GFX_REPORTER_M",
"x": 7,
"y": 4,
"elevation": 3,
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+6 -6
View File
@@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 820AD96
SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 820AD9F
lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee
end
SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 820ADB0
lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee
end
@@ -26,7 +26,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee
closemessage
hidemoneybox
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
waitmovement 0
releaseall
end
@@ -49,7 +49,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18
msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT
closemessage
hidemoneybox
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
waitmovement 0
releaseall
end
@@ -168,7 +168,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8
end
SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth
applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
@@ -181,7 +181,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83
end
SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast
applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast
applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited