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/MossdeepCity_Gym/map.json
+36 -36
View File
@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TATE",
"graphics_id": "OBJ_EVENT_GFX_TATE",
"x": 23,
"y": 7,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 1,
"y": 30,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 5,
"y": 20,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 4,
"y": 29,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 4,
"y": 23,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 6,
"y": 9,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 6,
"y": 3,
"elevation": 0,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_2",
"graphics_id": "OBJ_EVENT_GFX_MAN_2",
"x": 5,
"y": 33,
"elevation": 0,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LIZA",
"graphics_id": "OBJ_EVENT_GFX_LIZA",
"x": 24,
"y": 7,
"elevation": 0,
@@ -132,7 +132,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 2,
"y": 30,
"elevation": 3,
@@ -145,7 +145,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 1,
"y": 29,
"elevation": 3,
@@ -158,7 +158,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 4,
"y": 30,
"elevation": 3,
@@ -171,7 +171,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 5,
"y": 29,
"elevation": 3,
@@ -184,7 +184,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 5,
"y": 21,
"elevation": 3,
@@ -197,7 +197,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 7,
"y": 9,
"elevation": 3,
@@ -210,7 +210,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 10,
"y": 8,
"elevation": 3,
@@ -223,7 +223,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 9,
"y": 8,
"elevation": 3,
@@ -236,7 +236,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 7,
"y": 5,
"elevation": 3,
@@ -249,7 +249,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 6,
"y": 6,
"elevation": 3,
@@ -262,7 +262,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 12,
"y": 5,
"elevation": 3,
@@ -275,7 +275,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 11,
"y": 5,
"elevation": 3,
@@ -288,7 +288,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 11,
"y": 34,
"elevation": 3,
@@ -301,7 +301,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 12,
"y": 33,
"elevation": 3,
@@ -314,7 +314,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 12,
"y": 34,
"elevation": 3,
@@ -327,7 +327,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 22,
"y": 25,
"elevation": 3,
@@ -340,7 +340,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 23,
"y": 26,
"elevation": 3,
@@ -353,7 +353,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 25,
"y": 25,
"elevation": 0,
@@ -366,7 +366,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 22,
"y": 23,
"elevation": 3,
@@ -379,7 +379,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 21,
"y": 23,
"elevation": 3,
@@ -392,7 +392,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 21,
"y": 22,
"elevation": 3,
@@ -405,7 +405,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 22,
"y": 22,
"elevation": 3,
@@ -418,7 +418,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 25,
"y": 22,
"elevation": 3,
@@ -431,7 +431,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 24,
"y": 22,
"elevation": 3,
@@ -444,7 +444,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 24,
"y": 23,
"elevation": 3,
@@ -457,7 +457,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 6,
"y": 5,
"elevation": 3,
@@ -470,7 +470,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE",
"graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE",
"x": 23,
"y": 25,
"elevation": 3,
data/maps/MossdeepCity_Gym/scripts.inc
+8 -8
View File
@@ -117,7 +117,7 @@ MossdeepCity_Gym_EventScript_Switch1:: @ 8220999
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1
setflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1
@@ -132,7 +132,7 @@ MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8
MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0
clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, 0
setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, 1
@@ -143,7 +143,7 @@ MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2
setflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1
@@ -152,7 +152,7 @@ MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5
MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24
clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, 0
setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, 1
@@ -163,7 +163,7 @@ MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3
setflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0
setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1
@@ -172,7 +172,7 @@ MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49
MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78
clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, 1
@@ -183,7 +183,7 @@ MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D
lockall
goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4
setflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0
setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1
@@ -192,7 +192,7 @@ MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D
MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC
clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
waitmovement 0
setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, 0
setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, 1