Skip to content

Commit

Permalink
Standardize EVENT_OBJECT to OBJECT_EVENT
Browse files Browse the repository at this point in the history
  • Loading branch information
@GriffinRichards
GriffinRichards committed Nov 21, 2019
1 parent ec3e86f commit 82cb741
Show file tree
Hide file tree
Showing 611 changed files with 4,984 additions and 4,984 deletions.
2 changes: 1 addition & 1 deletion common_syms/faraway_island.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
sPlayerToMewDeltaX
sPlayerToMewDeltaY
sMewDirectionCandidates
sMewDirectionCandidates
4 changes: 2 additions & 2 deletions data/event_scripts.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,11 +850,11 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216

EventScript_UnusedBoardFerry:: @ 827222B
delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
showobjectat 255, MAP_PETALBURG_CITY
delay 30
applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry
applymovement OBJ_EVENT_ID_PLAYER, Movement_UnusedBoardFerry
waitmovement 0
delay 30
return
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AbandonedShip_CaptainsOffice/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 3,
"y": 4,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 0,
"y": 6,
"elevation": 3,
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AbandonedShip_Corridors_1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 17,
"y": 7,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 5,
"y": 10,
"elevation": 3,
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AbandonedShip_Corridors_B1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 2,
"y": 8,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 9,
"y": 6,
"elevation": 3,
Expand Down
8 changes: 4 additions & 4 deletions data/maps/AbandonedShip_HiddenFloorRooms/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 41,
"y": 4,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 10,
"elevation": 3,
Expand All @@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 11,
"elevation": 3,
Expand All @@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 31,
"y": 11,
"elevation": 3,
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AbandonedShip_Room_B1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 4,
"elevation": 3,
Expand Down
10 changes: 5 additions & 5 deletions data/maps/AbandonedShip_Rooms2_1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 7,
"y": 13,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 6,
"y": 13,
"elevation": 3,
Expand All @@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 4,
"elevation": 3,
Expand All @@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 3,
"y": 2,
"elevation": 3,
Expand All @@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 7,
"y": 2,
"elevation": 3,
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AbandonedShip_Rooms2_B1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 3,
"y": 4,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 13,
"y": 3,
"elevation": 3,
Expand Down
8 changes: 4 additions & 4 deletions data/maps/AbandonedShip_Rooms_1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 12,
"y": 5,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 5,
"elevation": 3,
Expand All @@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 10,
"y": 11,
"elevation": 3,
Expand All @@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 10,
"y": 16,
"elevation": 3,
Expand Down
4 changes: 2 additions & 2 deletions data/maps/AbandonedShip_Rooms_B1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 25,
"y": 6,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 7,
"elevation": 3,
Expand Down
2 changes: 1 addition & 1 deletion data/maps/AncientTomb/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_REGISTEEL",
"graphics_id": "OBJ_EVENT_GFX_REGISTEEL",
"x": 8,
"y": 7,
"elevation": 3,
Expand Down
6 changes: 3 additions & 3 deletions data/maps/AquaHideout_1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 13,
"y": 11,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 14,
"y": 11,
"elevation": 3,
Expand All @@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 20,
"y": 4,
"elevation": 3,
Expand Down
18 changes: 9 additions & 9 deletions data/maps/AquaHideout_B1F/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 28,
"y": 16,
"elevation": 3,
Expand All @@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 6,
"elevation": 3,
Expand All @@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 29,
"y": 12,
"elevation": 3,
Expand All @@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 20,
"y": 18,
"elevation": 3,
Expand All @@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 9,
"elevation": 3,
Expand All @@ -80,7 +80,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 9,
"elevation": 3,
Expand All @@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 10,
"elevation": 3,
Expand All @@ -106,7 +106,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 10,
"elevation": 3,
Expand All @@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 28,
"y": 21,
"elevation": 3,
Expand Down
Loading

0 comments on commit 82cb741

Please sign in to comment.