diff options
1105 files changed, 14962 insertions, 14963 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 9db57daf1..cef18bc8d 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -765,7 +765,7 @@ .2byte \y .endm - @ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. + @ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. .macro copyobjectxytoperm index:req .byte 0x64 .2byte \index diff --git a/common_syms/faraway_island.txt b/common_syms/faraway_island.txt index 395c9a82f..e02ca2ec2 100755 --- a/common_syms/faraway_island.txt +++ b/common_syms/faraway_island.txt @@ -1,3 +1,3 @@ sPlayerToMewDeltaX sPlayerToMewDeltaY -sMewDirectionCandidates
\ No newline at end of file +sMewDirectionCandidates diff --git a/common_syms/field_control_avatar.txt b/common_syms/field_control_avatar.txt index 0f336a407..268f60c64 100644 --- a/common_syms/field_control_avatar.txt +++ b/common_syms/field_control_avatar.txt @@ -1 +1 @@ -gSelectedEventObject +gSelectedObjectEvent diff --git a/data/event_scripts.s b/data/event_scripts.s index 605cf23ac..ec070bbf4 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -19,7 +19,7 @@ #include "constants/decorations.h" #include "constants/easy_chat.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/field_poison.h" #include "constants/field_specials.h" @@ -841,11 +841,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 diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index ffa394fa1..26ffbd3ae 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4412,4 +4412,4 @@ "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin" } ] -}
\ No newline at end of file +} diff --git a/data/map_events.s b/data/map_events.s index ceaa72837..0f977acfb 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,5 @@ -#include "constants/bg_event_constants.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_bg.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 804fd0afc..52615f6f3 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -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, @@ -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, diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index b75fcf3ac..305d14fe3 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -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, @@ -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, @@ -129,4 +129,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 04868ad92..ff45d9830 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -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, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 9, "y": 6, "elevation": 3, @@ -110,4 +110,4 @@ "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index b12ff4057..8e8529716 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -53,4 +53,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 81e19fd1f..87d802c59 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -93,4 +93,4 @@ "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index f937eb649..00e128fb4 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -215,4 +215,4 @@ "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index b8e2a71da..912f954f7 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -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, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 6f39d4827..4c35de804 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 672d2c54e..6dbcc98e4 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -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, @@ -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, @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 28feaf940..06fb770fe 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -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, @@ -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, @@ -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, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 10, "y": 16, "elevation": 3, @@ -113,4 +113,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 0af0a05ac..bd07334b3 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -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, @@ -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, @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index da1b5eb4c..cc8a1cddc 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index 104325b16..5327e3aa1 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index 848eb95c1..0c28b77b8 100644 --- a/data/maps/AlteringCave/map.json +++ b/data/maps/AlteringCave/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 9229f7581..62c2f7a3e 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -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, @@ -78,4 +78,4 @@ "script": "AncientTomb_EventScript_CaveEntranceSide" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 25fe48a9e..1f34d5d50 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -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, @@ -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, @@ -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, @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index f31180f8b..bd47bd552 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -311,4 +311,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index 1ae0fcecd..e9d99d90b 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -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": 23, "y": 19, "elevation": 3, @@ -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": 23, "y": 10, "elevation": 3, @@ -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": 3, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 19, "y": 20, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 7, "y": 5, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 5, "elevation": 3, @@ -186,4 +186,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json index 22b645413..ac21b7f2d 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json index 5bee65158..26dde7f5b 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json index 03cafd7dc..26ed361ae 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index dc7792d8a..855721fda 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index 2fec826cd..f2147b789 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 38, "elevation": 3, @@ -79,4 +79,4 @@ "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json index 18df18491..065ff9ebb 100644 --- a/data/maps/BattleColosseum2P/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, @@ -65,4 +65,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum4P/map.json index d17851aaf..0f6cc8fbe 100644 --- a/data/maps/BattleColosseum4P/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -83,4 +83,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 6299e7b11..b6c43b167 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 5, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 15, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 6, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 4, "elevation": 3, @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 6669446a5..d7c24a3c1 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -26,11 +26,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE return BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2 @@ -482,7 +482,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16 hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM removeobject 7 call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible setvar VAR_TEMP_1, 1 end diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 02f3cd019..311fb807f 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 9, "y": 12, "elevation": 0, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index 465d013fc..f75f53893 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9 delay 16 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer waitmovement 0 msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor waitmovement 0 setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index 3bec0b5fb..3ab0d21f3 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 14, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 14, "y": 12, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 10, "elevation": 3, @@ -108,4 +108,4 @@ "script": "BattleFrontier_BattleArenaLobby_EventScript_RulesBoard" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index d6c3a3ca5..dcf50b963 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_OnWarp: @ 8255C41 BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55 @@ -207,12 +207,12 @@ BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge:: @ 8256003 BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor waitmovement 0 opendoor 2, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor waitmovement 0 closedoor 2, 2 waitdooranim @@ -256,12 +256,12 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: @ 825604C BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050 applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor waitmovement 0 opendoor 11, 2 waitdooranim applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor waitmovement 0 closedoor 11, 2 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index e3a6c915b..5690e9eb9 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 5, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 7, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 11, "y": 2, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 16, "y": 2, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 2, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 16, "y": 1, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 1, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 0, "y": 4, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 1, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 13, "y": 2, "elevation": 0, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 2, "elevation": 0, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 9, "elevation": 4, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 14, "y": 2, "elevation": 0, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 6, "elevation": 0, @@ -213,4 +213,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index ff11ac75a..dcc4f52c0 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -23,11 +23,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC return BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 @@ -487,7 +487,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C502 call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 3 goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF @@ -528,76 +528,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F return BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530 - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH return BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594 - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1 + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, 1 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 - createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH return BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 6e7f2c3f5..987ea14df 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 23, "y": 5, "elevation": 0, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc index 92be8bc3e..3208efe4b 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc @@ -13,12 +13,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E compare VAR_RESULT, FRONTIER_LVL_OPEN goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 waitmovement 0 opendoor 13, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1BE - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1AE waitmovement 0 closedoor 13, 3 waitdooranim @@ -26,12 +26,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E BattleFrontier_BattleDomeCorridor_EventScript_24B161:: @ 824B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1D6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1C1 waitmovement 0 opendoor 37, 3 waitdooranim applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1E6 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_24B1D2 waitmovement 0 closedoor 37, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index 89eeb60e4..4298ac00e 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 10, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 1, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 14, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 18, "y": 14, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 14, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 17, "y": 10, "elevation": 0, @@ -144,4 +144,4 @@ "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 8d594695c..54342b7d3 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_2497FB: @ 82497FB BattleFrontier_BattleDomeLobby_EventScript_249805:: @ 8249805 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleDomeLobby_MapScript2_24980F: @ 824980F @@ -247,7 +247,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CDD compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CE5 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D2D @@ -258,7 +258,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CED compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249CF5 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249D39 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 293a9cc22..35eea5787 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 56d8e2e64..b8614fa3f 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B204: @ 824B204 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B20E:: @ 824B20E setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 @@ -21,7 +21,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 frontier_set FRONTIER_DATA_6, 1 setvar VAR_TEMP_0, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B652 waitmovement 0 lockall @@ -154,11 +154,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B657 waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_24B659 waitmovement 0 closedoor 5, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index 5f45fa7ac..2bfd0fe45 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 8, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 12, "y": 4, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 12, "y": 6, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 12, "y": 8, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 11, "elevation": 0, @@ -122,4 +122,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index f1b3e3b91..1cab88090 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -28,7 +28,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_TEMP_1, 1 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @@ -37,11 +37,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24 end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 @@ -53,7 +53,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7 @@ -63,7 +63,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 compare VAR_TEMP_F, 0 goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B waitmovement 0 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4 factory_setopponentgfx diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index 8ed837413..46926168a 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 4, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 14, "y": 11, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 11, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 6, "y": 10, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 7, "elevation": 0, @@ -136,4 +136,4 @@ "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index fec051025..41fa0a272 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_MapScript2_2583F3: @ 82583F3 BattleFrontier_BattleFactoryLobby_EventScript_2583FD:: @ 82583FD setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleFactoryLobby_MapScript2_258407: @ 8258407 @@ -179,7 +179,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_2587AC waitmovement 0 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 setvar VAR_TEMP_0, 0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index fd20b7180..900e54d77 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 12, "elevation": 0, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 98589b97b..ca458671c 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF turnobject 1, DIR_SOUTH BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA:: @ 8259AEA - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF @@ -27,7 +27,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 compare VAR_0x8006, 2 goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 @@ -422,12 +422,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C:: @ 825A17C applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6 return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index cfa4cf97f..ca356ecb7 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 1, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_DUSCLOPS", + "graphics_id": "OBJ_EVENT_GFX_DUSCLOPS", "x": 13, "y": 1, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 13, "y": 1, "elevation": 3, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 00017c089..d339b5134 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -18,13 +18,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 @@ -309,7 +309,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE3E:: @ 824FE3E hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM call BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833 setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 removeobject 2 applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index 9d635efc7..ac4319ee8 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 8, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 3, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KIRLIA", + "graphics_id": "OBJ_EVENT_GFX_KIRLIA", "x": 12, "y": 6, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 15, "y": 5, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 4, "y": 9, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 13, "y": 9, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 3, "y": 10, "elevation": 0, @@ -138,4 +138,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 5d834532d..29cf782fd 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceCorridor_MapScript2_24F4A9: @ 824F4A9 BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 delay 16 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5B8 waitmovement 0 lockall palace_getcomment @@ -28,12 +28,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 compare VAR_RESULT, FRONTIER_LVL_OPEN goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 waitmovement 0 opendoor 6, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 6, 3 waitdooranim @@ -41,12 +41,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 BattleFrontier_BattlePalaceCorridor_EventScript_24F553:: @ 824F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5CB - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D2 waitmovement 0 opendoor 10, 3 waitdooranim applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5DA - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_24F5D9 waitmovement 0 closedoor 10, 3 waitdooranim diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index c1d79ee50..3e03a0257 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 8, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 24, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 18, "y": 10, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 10, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 19, "y": 6, "elevation": 0, @@ -143,4 +143,4 @@ "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 5c4714d80..670e99d28 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_MapScript2_24D789: @ 824D789 BattleFrontier_BattlePalaceLobby_EventScript_24D793:: @ 824D793 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePalaceLobby_MapScript2_24D79D: @ 824D79D @@ -252,7 +252,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC2F @@ -260,7 +260,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_24DC3B diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index 98b061e9f..e2fd0e106 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 6, "y": 6, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 06f0e0516..2e43a5c56 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -12,14 +12,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 frontier_set FRONTIER_DATA_BATTLE_NUM, 1 pike_cleartrainerids pike_nohealing TRUE - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT closemessage releaseall - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80E waitmovement 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99 call BattleFrontier_BattlePike_EventScript_CloseCurtain @@ -33,7 +33,7 @@ BattleFrontier_BattlePikeCorridor_MapScript2_25C7F7: @ 825C7F7 BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 5854c6bf7..74a4a3f2d 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 5, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 10, "y": 9, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 0, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 9, "elevation": 3, @@ -109,4 +109,4 @@ "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 69b8d3b13..d0345865a 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_MapScript2_25B6F3: @ 825B6F3 BattleFrontier_BattlePikeLobby_EventScript_25B6FD:: @ 825B6FD setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 @@ -203,7 +203,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80 BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 applymovement 1, BattleFrontier_BattlePikeLobby_Movement_25BAA7 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_25BAA6 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json index 2b3daf8b7..3b44e85fe 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 2, "y": 4, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc index 2eaaa20b4..2863ea072 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc @@ -31,7 +31,7 @@ BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2 diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json index 6eef87962..11cbd866e 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 3, "y": 4, "elevation": 3, @@ -108,4 +108,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index 5419eb081..2c64eae9b 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -103,7 +103,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D2FB:: @ 825D2FB msgbox BattleFrontier_BattlePikeRoomNormal_Text_25E311, MSGBOX_DEFAULT closemessage special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0 + applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7E2 waitmovement 0 playse SE_CURTAIN @@ -190,7 +190,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D460:: @ 825D460 BattleFrontier_BattlePikeRoomNormal_EventScript_25D49D:: @ 825D49D applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7EA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC waitmovement 0 pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 @@ -247,13 +247,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7C8 applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CA waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BB waitmovement 0 pike_gettrainerintro 0 msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD waitmovement 0 pike_gettrainerintro 1 msgbox gStringVar4, MSGBOX_DEFAULT @@ -268,13 +268,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D53E:: @ 825D53E end BattleFrontier_BattlePikeRoomNormal_EventScript_25D5DC:: @ 825D5DC - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BD waitmovement 0 applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_25D7CC waitmovement 0 applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_25D7D4 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7BF waitmovement 0 end @@ -392,7 +392,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_25D774:: @ 825D774 BattleFrontier_BattlePikeRoomNormal_EventScript_25D77B:: @ 825D77B closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_25D7DC waitmovement 0 setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json index 3a8362b7f..078ccd1df 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json @@ -81,4 +81,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc index 356e88366..f59661f64 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc @@ -26,7 +26,7 @@ BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E466: @ 825E466 BattleFrontier_BattlePikeRoomWildMons_EventScript_25E470:: @ 825E470 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRoomWildMons_MapScript1_25E47A: @ 825E47A diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index aa512a0a7..ca84f402b 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 4, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 8, "y": 5, "elevation": 3, @@ -126,4 +126,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index a0bf811a5..de5e17a3a 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D BattleFrontier_BattlePikeThreePathRoom_EventScript_25C887:: @ 825C887 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeThreePathRoom_EventScript_CheckChallengeStatus:: @ 825C891 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index 3f4739b26..acb21c880 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 0, "y": 0, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 1, "y": 0, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 2, "y": 0, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 3, "y": 0, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 4, "y": 0, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 0, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 0, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 0, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 0, "y": 1, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 1, "y": 1, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 3, "y": 1, "elevation": 0, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 4, "y": 1, "elevation": 0, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 1, "elevation": 0, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 1, "elevation": 0, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 1, "elevation": 0, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 2, "y": 1, "elevation": 0, @@ -226,4 +226,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 4f99b9488..ef1bb903a 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 12, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 14, "y": 13, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 2, "y": 15, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 16, "elevation": 4, @@ -95,4 +95,4 @@ "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index e7db4a459..3519bfc36 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -9,7 +9,7 @@ BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 BattleFrontier_BattlePyramidLobby_EventScript_25072B: @ 825072B setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePyramidLobby_MapScript2_250735: @ 8250735 @@ -371,7 +371,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT pyramid_get PYRAMID_DATA_WIN_STREAK @@ -391,7 +391,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DD8 waitmovement 0 return diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index d73dc1692..92276035f 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 11, "elevation": 6, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BRANDON", + "graphics_id": "OBJ_EVENT_GFX_BRANDON", "x": 17, "y": 7, "elevation": 0, @@ -54,4 +54,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 2e6b8f3a2..faf0ba288 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH compare VAR_TEMP_C, 0 goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 @@ -80,7 +80,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_255403 waitmovement 0 applymovement 1, BattleFrontier_BattlePyramidTop_Movement_255400 waitmovement 0 @@ -118,7 +118,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 compare VAR_RESULT, FALSE goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_2552D0 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C + applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage @@ -159,7 +159,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 compare VAR_RESULT, FALSE goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_255388 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C + applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index c8efe3399..b58ed2b8c 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 8, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 9c4012604..c778627de 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -18,14 +18,14 @@ BattleFrontier_BattleTowerBattleRoom_MapScript2_241B62: @ 8241B62 BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_TEMP_0, 1 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242179 waitmovement 0 frontier_get FRONTIER_DATA_BATTLE_NUM compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 setvar VAR_TEMP_2, 1 frontier_set FRONTIER_DATA_6, 1 @@ -63,7 +63,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA @@ -127,7 +127,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241DAA:: @ 8241DAA BattleFrontier_BattleTowerBattleRoom_EventScript_241DDC:: @ 8241DDC closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 @@ -242,7 +242,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F79:: @ 8241F79 BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF call BattleFrontier_EventScript_SetBrainObjectGfx closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_242180 waitmovement 0 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_242192 waitmovement 0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json index 698edcc65..905102cd3 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 1, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 4, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "graphics_id": "OBJ_EVENT_GFX_VAR_E", "x": 5, "y": 8, "elevation": 3, @@ -96,4 +96,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index c0c6fa900..5bb0831af 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F checkplayergender compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL return BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F33: @ 8248F33 .2byte 0 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F3D:: @ 8248F3D - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 end BattleFrontier_BattleTowerBattleRoom2_MapScript2_248F43: @ 8248F43 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index 5081edd82..329e5a2e4 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 2, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc index a72961562..3da4302a2 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 compare VAR_0x8006, 1 goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B39 waitmovement 0 goto BattleFrontier_BattleTowerCorridor_EventScript_241B27 BattleFrontier_BattleTowerCorridor_EventScript_241B16:: @ 8241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B37 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_241B36 waitmovement 0 BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json index de898bef4..637d468fd 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 1, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 14, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "graphics_id": "OBJ_EVENT_GFX_VAR_E", "x": 14, "y": 1, "elevation": 0, @@ -70,4 +70,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc index 305013b90..4ae755b37 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc @@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 checkplayergender compare VAR_RESULT, FEMALE goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL return BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B - setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL return BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 @@ -33,7 +33,7 @@ BattleFrontier_BattleTowerCorridor2_MapScript2_248D95: @ 8248D95 .2byte 0 BattleFrontier_BattleTowerCorridor2_EventScript_248D9F:: @ 8248D9F - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 special OffsetCameraForBattle diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index f4cbd3590..f9baf201f 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 43dbc0791..e66004ba9 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_MapScript2_2419E6: @ 82419E6 BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 setvar VAR_TEMP_0, 1 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A86 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A8A waitmovement 0 special BufferBattleTowerElevatorFloors waitse @@ -18,7 +18,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 waitstate delay 48 applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_241A92 waitmovement 0 call BattleFrontier_BattleTowerElevator_EventScript_241A28 end @@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 BattleFrontier_BattleTowerElevator_EventScript_241AA0:: @ 8241AA0 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index 32aa11636..9160d37e7 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 23, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 17, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 9, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 1, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_APPRENTICE" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 14, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 18, "y": 5, "elevation": 3, @@ -198,4 +198,4 @@ "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index e7842de51..389b88cdd 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -31,7 +31,7 @@ BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9 BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD @@ -649,12 +649,12 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B call BattleFrontier_BattleTowerLobby_EventScript_23F1E8 call BattleFrontier_BattleTowerLobby_EventScript_23F22D applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F195 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F195 waitmovement 0 opendoor VAR_0x8004, 1 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_23F199 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_23F19C waitmovement 0 closedoor VAR_0x8004, 1 waitdooranim diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index f3b080732..a82fc2d54 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 11, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 17, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 6, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 8, "y": 13, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 10, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 13, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 15, "y": 13, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 4, "y": 12, "elevation": 3, @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 4a3d9cb96..6f90a3d9a 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -24,14 +24,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1 - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1 + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1 setvar VAR_TEMP_1, 1 setvar VAR_TEMP_3, 1 setobjectxyperm 1, 10, 2 @@ -42,7 +42,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E14: @ 8243E14 .2byte 0 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E1E:: @ 8243E1E - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattleTowerMultiBattleRoom_MapScript2_243E23: @ 8243E23 @@ -58,12 +58,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E35:: @ 8243E35 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 lockall - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75 waitmovement 0 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty @@ -114,19 +114,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EE4:: @ 8243EE4 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EF6: @ 8243EF6 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E waitmovement 0 return BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22 waitmovement 0 return diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index 055b6e56e..00be52caf 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 0, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 6, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 9, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 5, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 5, "elevation": 0, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 4, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 12, "y": 10, "elevation": 0, @@ -157,4 +157,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index d63190776..16153573b 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 0, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 7, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 575f2898e..75c01f4b4 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 3, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 4, "y": 6, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 5, "elevation": 0, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 843fc6e10..e0a6755fd 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 4, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 5, "y": 5, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 0, "y": 6, "elevation": 0, @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 0c86ccf3c..c43d69f06 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 0, "y": 5, "elevation": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index 6d9eab35f..97cf8df43 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 4, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 11, "y": 7, "elevation": 0, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 5888ea7c0..0ba285fbd 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 2, "y": 4, "elevation": 0, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 5ebc789ba..4b265f59a 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 0, "y": 7, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 2, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 6, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 8, "y": 3, "elevation": 0, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 519f008fc..aa974f1d1 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 4, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 7, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 4, "elevation": 0, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 9f0a56ba0..f5bf1ef18 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 3, "elevation": 0, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index f4adf6c36..c561316b3 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 5, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 4, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index cccf8fb8a..5f1517188 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 20, "y": 17, "elevation": 0, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 42, "y": 15, "elevation": 0, @@ -47,7 +47,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 53, "y": 6, "elevation": 0, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 54, "y": 16, "elevation": 0, @@ -73,7 +73,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 37, "y": 32, "elevation": 0, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 41, "y": 56, "elevation": 3, @@ -99,7 +99,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 46, "elevation": 0, @@ -112,7 +112,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 34, "y": 41, "elevation": 0, @@ -125,7 +125,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 45, "y": 47, "elevation": 3, @@ -138,7 +138,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 59, "y": 35, "elevation": 0, @@ -151,7 +151,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 18, "y": 40, "elevation": 0, @@ -164,7 +164,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 17, "y": 40, "elevation": 0, @@ -177,7 +177,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 40, "y": 56, "elevation": 3, @@ -190,7 +190,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SUDOWOODO", + "graphics_id": "OBJ_EVENT_GFX_SUDOWOODO", "x": 54, "y": 62, "elevation": 3, @@ -203,7 +203,7 @@ "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 42, "y": 34, "elevation": 3, @@ -216,7 +216,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 51, "y": 53, "elevation": 3, @@ -229,7 +229,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 62, "y": 18, "elevation": 0, @@ -242,7 +242,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 21, "elevation": 0, @@ -255,7 +255,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 10, "y": 21, "elevation": 0, @@ -268,7 +268,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 30, "elevation": 0, @@ -281,7 +281,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 33, "y": 14, "elevation": 0, @@ -294,7 +294,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 54, "y": 31, "elevation": 0, @@ -307,7 +307,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 54, "y": 32, "elevation": 0, @@ -320,7 +320,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 58, "y": 55, "elevation": 3, @@ -333,7 +333,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 48, "y": 41, "elevation": 0, @@ -346,7 +346,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 14, "elevation": 0, @@ -526,4 +526,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 42b76323a..ba7ea615a 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 26, "y": 38, "elevation": 0, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 20, "y": 70, "elevation": 0, @@ -47,7 +47,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 68, "elevation": 0, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 26, "y": 20, "elevation": 0, @@ -73,7 +73,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 27, "y": 30, "elevation": 0, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 33, "y": 41, "elevation": 0, @@ -99,7 +99,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 28, "y": 43, "elevation": 0, @@ -112,7 +112,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 20, "elevation": 0, @@ -125,7 +125,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 13, "y": 44, "elevation": 0, @@ -138,7 +138,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 44, "elevation": 0, @@ -151,7 +151,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 23, "y": 47, "elevation": 0, @@ -164,7 +164,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 38, "y": 27, "elevation": 0, @@ -177,7 +177,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 45, "y": 18, "elevation": 0, @@ -190,7 +190,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 9, "y": 47, "elevation": 0, @@ -203,7 +203,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 35, "y": 5, "elevation": 0, @@ -216,7 +216,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 11, "y": 66, "elevation": 0, @@ -229,7 +229,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 31, "y": 31, "elevation": 0, @@ -242,7 +242,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 42, "y": 48, "elevation": 0, @@ -255,7 +255,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 38, "y": 22, "elevation": 0, @@ -268,7 +268,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 9, "elevation": 0, @@ -281,7 +281,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 12, "y": 10, "elevation": 0, @@ -294,7 +294,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 11, "y": 10, "elevation": 0, @@ -307,7 +307,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 5, "elevation": 0, @@ -320,7 +320,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 26, "elevation": 0, @@ -455,4 +455,4 @@ "script": "Common_EventScript_ShowPokemartSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 743bab8b0..7e90fc9df 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 2, "y": 3, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 1, "y": 3, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index fa93cde5f..d36bcce73 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index f26e03e41..c2205cd51 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 24, "y": 13, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 4, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 44, "y": 11, "elevation": 3, @@ -169,4 +169,4 @@ "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ff891ad5b..ab82eec3e 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 11, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 8, "y": 11, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 8, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 0, "y": 4, "elevation": 0, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index cb01034ad..94fadd69a 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -21,7 +21,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3 waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter waitmovement 0 goto BattleFrontier_ReceptionGate_EventScript_ScottScene end @@ -40,18 +40,18 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229 closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp applymovement 2, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 playse SE_PIN applymovement 1, Common_Movement_ExclamationMark applymovement 2, Common_Movement_ExclamationMark - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_GreeterFaceScott applymovement 2, BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerFaceScott applymovement 4, BattleFrontier_ReceptionGate_Movement_ScottEnter waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index 13cb13dd4..c1314f0ce 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 2, "y": 3, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index d4cbfd71d..e96b67b57 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 2, "y": 3, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 5, "y": 3, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 2, "y": 6, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 6, "y": 6, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 1, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 4, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 4, "elevation": 4, @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index 5d8f32f25..b7ead588f 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 1, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 5, "y": 6, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 6, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 5, "y": 1, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 5, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 0, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 2, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index c69bd0b15..f4bdf3a6c 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 1, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 1, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 6, "y": 4, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 4, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 2, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 7, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index 18319c680..5c33ba43a 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 2, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 7, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 1, "y": 4, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 4, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 6, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 0, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index b00e17367..c2568930e 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 6, "y": 4, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 3, "y": 7, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 3, "y": 1, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 6, "y": 0, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index e06449a12..885754bf4 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 5, "y": 2, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 5, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 5, "y": 5, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 7, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 0, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index a8514304f..47366507e 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 0, "y": 6, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 4, "y": 0, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 0, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 4, "y": 4, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 4, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 1, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 7, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index 0f6f51539..12fbcb2ed 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 1, "y": 2, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 1, "y": 5, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 2, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 6, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 0, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index c12ac3a26..6d21aea94 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 0, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 4, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 0, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 5, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 0, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 0, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 32fe28258..0bf2b034a 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 0, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 3, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 5, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 5, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 6, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 1, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index 99edaca3b..dd52e9889 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 3, "y": 2, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 3, "y": 6, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 6, "y": 4, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 6, "y": 7, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 2, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 2, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index e7142a166..0095f1a6f 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 7, "y": 5, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 0, "y": 5, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 0, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 3, "y": 3, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 2, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 7, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index 3945ca4f5..7a5df9386 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 1, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 6, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 1, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 6, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 1, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 0, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 3, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 4f90bfe6b..b78f0d3a7 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 1, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 1, "y": 1, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 5, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 5, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 7f1900dbc..0dd07fdf5 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 5, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 1, "elevation": 4, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 4, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 0, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 2, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index bb0d02316..9f8532eb5 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -16,7 +16,7 @@ "shared_scripts_map": "BattlePyramidSquare01", "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 6, "elevation": 4, @@ -29,7 +29,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 1, "y": 0, "elevation": 0, @@ -42,7 +42,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 7, "elevation": 4, @@ -55,7 +55,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 0, "elevation": 4, @@ -68,7 +68,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 4, @@ -81,7 +81,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 7, "elevation": 4, @@ -94,7 +94,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 4, @@ -110,4 +110,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 50bd57f0b..7ebcca911 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DEOXYS_TRIANGLE", + "graphics_id": "OBJ_EVENT_GFX_DEOXYS_TRIANGLE", "x": 15, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" }, { - "graphics_id": "EVENT_OBJ_GFX_DEOXYS", + "graphics_id": "OBJ_EVENT_GFX_DEOXYS", "x": 15, "y": 3, "elevation": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index b51940a7c..8cf47bfdb 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_OnReturnToField: @ 8267F25 BirthIsland_Exterior_OnTransition: @ 8267F29 setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0 setvar VAR_DEOXYS_ROCK_LEVEL, 0 call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index ea124d9ef..f6dec3c92 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 7, "elevation": 1, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 989b1cf30..91f2b7ccd 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index ba32f6cfc..3338a548b 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 9, "y": 13, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 07c7af816..2dea41998 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json index e131e4f0c..effba642d 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index b0b496d88..f979db343 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index 99afc0925..d4f5f63f1 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index 1402a9afa..61cf464e1 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 7, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 8, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 2, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 4, "y": 2, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 5, "y": 2, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 10, "y": 2, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 12, "y": 5, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 2, "y": 5, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_CONTEST_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 7, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 6, "elevation": 3, @@ -213,4 +213,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc index e1ef9b708..33e074e8a 100644 --- a/data/maps/ContestHall/scripts.inc +++ b/data/maps/ContestHall/scripts.inc @@ -75,11 +75,11 @@ ContestHall_EventScript_Contest:: @ 823B829 ContestHall_EventScript_SetContestObjects:: @ 823B834 special LoadLinkContestPlayerPalettes - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN call ContestHall_EventScript_CreateAudience end -@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist) +@ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist) @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842 call ContestHall_EventScript_GetRandomAudienceGfxId @@ -174,131 +174,131 @@ ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8 end ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B - setvar VAR_TEMP_1, EVENT_OBJ_GFX_NINJA_BOY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_NINJA_BOY return ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_TWIN + setvar VAR_TEMP_1, OBJ_EVENT_GFX_TWIN return ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_1 return ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_1 return ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_2 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_2 return ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_BOY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_BOY return ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LITTLE_GIRL + setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_GIRL return ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BOY_3 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_3 return ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B - setvar VAR_TEMP_1, EVENT_OBJ_GFX_GIRL_3 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_3 return ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_RICH_BOY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_RICH_BOY return ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_FAT_MAN + setvar VAR_TEMP_1, OBJ_EVENT_GFX_FAT_MAN return ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD - setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_F + setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_F return ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_1 return ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_2 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_2 return ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF - setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_M return ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_EXPERT_F + setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_F return ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB - setvar VAR_TEMP_1, EVENT_OBJ_GFX_POKEFAN_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_M return ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_4 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_4 return ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_COOK + setvar VAR_TEMP_1, OBJ_EVENT_GFX_COOK return ContestHall_EventScript_RandomAudienceLass:: @ 823BADD - setvar VAR_TEMP_1, EVENT_OBJ_GFX_LASS + setvar VAR_TEMP_1, OBJ_EVENT_GFX_LASS return ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_OLD_WOMAN + setvar VAR_TEMP_1, OBJ_EVENT_GFX_OLD_WOMAN return ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_CAMPER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_CAMPER return ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF - setvar VAR_TEMP_1, EVENT_OBJ_GFX_PICNICKER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_PICNICKER return ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_MAN_3 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_3 return ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB - setvar VAR_TEMP_1, EVENT_OBJ_GFX_WOMAN_5 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_5 return ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_YOUNGSTER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_YOUNGSTER return ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BUG_CATCHER + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BUG_CATCHER return ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D - setvar VAR_TEMP_1, EVENT_OBJ_GFX_PSYCHIC_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_PSYCHIC_M return ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCHOOL_KID_M + setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCHOOL_KID_M return ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BLACK_BELT + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BLACK_BELT return ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F - setvar VAR_TEMP_1, EVENT_OBJ_GFX_BEAUTY + setvar VAR_TEMP_1, OBJ_EVENT_GFX_BEAUTY return ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25 - setvar VAR_TEMP_1, EVENT_OBJ_GFX_SCIENTIST_1 + setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCIENTIST_1 return ContestHall_EventScript_CreateAudience:: @ 823BB2B @@ -314,97 +314,97 @@ ContestHall_EventScript_CreateAudience:: @ 823BB2B return ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78 - createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH return ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_LASS, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH return ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_GENTLEMAN, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_2, 20, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_WOMAN_5, 20, 7, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 8, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 3, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 5, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH return ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SAILOR, 25, 3, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 4, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_GENTLEMAN, 27, 5, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 9, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 10, 9, 3, DIR_NORTH + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH return ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86 - createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST - createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST - createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH - createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 3, 2, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_MANIAC, 4, 1, 3, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_5, 6, 1, 5, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_WOMAN_4, 7, 1, 6, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_GENTLEMAN, 9, 1, 8, 3, DIR_EAST + createvobject OBJ_EVENT_GFX_NINJA_BOY, 10, 12, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_2, 11, 12, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_WOMAN_3, 12, 12, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_BEAUTY, 13, 12, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_FISHERMAN, 14, 13, 3, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MAN_4, 17, 13, 6, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 18, 13, 7, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, DIR_WEST + createvobject OBJ_EVENT_GFX_POKEFAN_M, 20, 3, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_CAMPER, 21, 6, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_MAN_3, 22, 7, 2, 3, DIR_SOUTH + createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH return ContestHall_EventScript_SetExitWarp:: @ 823BE44 @@ -451,10 +451,10 @@ LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6 return LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json index daad0f962..a521bb6af 100644 --- a/data/maps/ContestHallBeauty/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json index d1c2e985c..4e9678ec6 100644 --- a/data/maps/ContestHallCool/map.json +++ b/data/maps/ContestHallCool/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json index d6b16dc4e..0bde21948 100644 --- a/data/maps/ContestHallCute/map.json +++ b/data/maps/ContestHallCute/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json index 12d3cccd8..4f5e6f407 100644 --- a/data/maps/ContestHallSmart/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json index 070211173..1142738da 100644 --- a/data/maps/ContestHallTough/map.json +++ b/data/maps/ContestHallTough/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 441157d86..4b8042e24 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "graphics_id": "OBJ_EVENT_GFX_REGIROCK", "x": 8, "y": 7, "elevation": 3, @@ -78,4 +78,4 @@ "script": "DesertRuins_EventScript_CaveEntranceSide" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index a3a80d41e..f23e3e311 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 132, "y": 10, "elevation": 0, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index bfa5a2e8b..240bc37fe 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 12, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 9, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 12, "y": 14, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 8, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 6, "elevation": 3, @@ -171,4 +171,4 @@ "script": "DewfordTown_EventScript_HallSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 137b394b1..3228fb4b6 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -117,29 +117,29 @@ DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656 DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 0 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_SailToPetalburg - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToPetalburg + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToPetalburg waitmovement 0 - showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg waitmovement 0 - showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN setvar VAR_BOARD_BRINEY_BOAT_STATE, 2 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate @@ -149,20 +149,20 @@ DewfordTown_EventScript_SailToPetalburg:: @ 81E9660 DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_DEWFORD_TOWN, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN, 1 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_BrineyBoardBoat waitmovement 0 removeobject 2 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_PlayerBoardBoat waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic applymovement 4, DewfordTown_Movement_SailToSlateport - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_SailToSlateport + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_SailToSlateport waitmovement 0 call Common_EventScript_StopBrineysBoatMusic - showobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 - applymovement EVENT_OBJ_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport + showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 + applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_ExitBoatSlateport waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 @@ -178,7 +178,7 @@ DewfordTown_EventScript_SailToSlateport:: @ 81E96E7 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 copyobjectxytoperm 2 release diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 35ba61064..869072bcb 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "graphics_id": "OBJ_EVENT_GFX_BRAWLY", "x": 4, "y": 3, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 18, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 25, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 5, "y": 24, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 8, "elevation": 1, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 9, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 12, "elevation": 1, @@ -170,4 +170,4 @@ "script": "DewfordTown_Gym_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 087981fde..f01815023 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 4, "y": 6, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 4, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 3, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 5, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 7, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 15, "y": 3, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -167,4 +167,4 @@ "script": "DewfordTown_Hall_EventScript_Painting" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 971dd2321..6a7051ec9 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B compare VAR_FACING, DIR_EAST goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793 return DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0 compare VAR_FACING, DIR_WEST goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index beb6d5275..a77835ecf 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 4, "y": 2, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index ac1abca36..0d589c357 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 67e0e5721..4ea6e6248 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 10, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 5, "elevation": 0, @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 6ebca2ae0..e72885ecb 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 0fd6e9eca..2758236ec 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -193,4 +193,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 4819c3b89..fbfc6a902 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 12, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 22acc0361..0f90ee2ac 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14 @@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14 EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace waitmovement 0 setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_Wallace @@ -105,7 +105,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT call ProfBirch_EventScript_RatePokedex @@ -119,12 +119,12 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart applymovement 3, Common_Movement_WalkInPlaceFastestUp applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT checkplayergender @@ -134,7 +134,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4 EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 5ff910790..62bd432e0 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "graphics_id": "OBJ_EVENT_GFX_DRAKE", "x": 6, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 139154fa9..d3b26f6d9 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -10,7 +10,7 @@ EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC .2byte 0 EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 8d220202e..44f2010da 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "graphics_id": "OBJ_EVENT_GFX_GLACIA", "x": 6, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 6836b886d..4ca98e921 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431 diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json index 1ebb9c925..862ccf4bb 100644 --- a/data/maps/EverGrandeCity_Hall1/map.json +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc index cd9bd27c1..cf68eb8c7 100644 --- a/data/maps/EverGrandeCity_Hall1/scripts.inc +++ b/data/maps/EverGrandeCity_Hall1/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall1_OnWarp: @ 822956F .2byte 0 EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json index 0631c14f0..06403ed9c 100644 --- a/data/maps/EverGrandeCity_Hall2/map.json +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc index 4591aa111..d8702657f 100644 --- a/data/maps/EverGrandeCity_Hall2/scripts.inc +++ b/data/maps/EverGrandeCity_Hall2/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall2_OnWarp: @ 8229584 .2byte 0 EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json index f181843bf..4c4ebfca5 100644 --- a/data/maps/EverGrandeCity_Hall3/map.json +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc index 7bd895fd0..65dc3c44c 100644 --- a/data/maps/EverGrandeCity_Hall3/scripts.inc +++ b/data/maps/EverGrandeCity_Hall3/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall3_OnWarp: @ 8229599 .2byte 0 EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json index b2c095e77..297170f8f 100644 --- a/data/maps/EverGrandeCity_Hall4/map.json +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc index 54d7adfc3..e75d12483 100644 --- a/data/maps/EverGrandeCity_Hall4/scripts.inc +++ b/data/maps/EverGrandeCity_Hall4/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall4_OnWarp: @ 82295AE .2byte 0 EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json index 04597cf65..4d67b6b3e 100644 --- a/data/maps/EverGrandeCity_Hall5/map.json +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc index 1ba85b999..b8eaed7b9 100644 --- a/data/maps/EverGrandeCity_Hall5/scripts.inc +++ b/data/maps/EverGrandeCity_Hall5/scripts.inc @@ -7,6 +7,6 @@ EverGrandeCity_Hall5_OnWarp: @ 82295C3 .2byte 0 EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index d0588f76a..393a7b96b 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 6, "y": 16, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 3fe146f99..e7acaa868 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_OnWarp: @ 8229837 .2byte 0 EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_HallOfFame_OnFrame: @ 8229846 @@ -18,24 +18,24 @@ EverGrandeCity_HallOfFame_OnFrame: @ 8229846 EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850 lockall applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 dofieldeffect FLDEFF_HALL_OF_FAME_RECORD diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 73ee3357d..72981147c 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "graphics_id": "OBJ_EVENT_GFX_PHOEBE", "x": 6, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 4843359c0..994900798 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 23bbe085f..83d8f7a94 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 10, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 9, "y": 4, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index b99590829..cb5df65b2 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 8efb63b9a..a258ebd38 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 16, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 2, "elevation": 3, @@ -106,4 +106,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 814025895..72c069243 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -77,12 +77,12 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636 end EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 8229698 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight waitmovement 0 return EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A3 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft + applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft waitmovement 0 return diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index a016be34b..ad042dd65 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 0aa57a944..e1d878f75 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "graphics_id": "OBJ_EVENT_GFX_SIDNEY", "x": 6, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 74cd384fb..20a7e0419 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -29,7 +29,7 @@ EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E .2byte 0 EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index b0475451a..191b23200 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 11, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 11, "y": 9, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 15, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 12, "elevation": 3, @@ -182,4 +182,4 @@ "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index da4c9fd4f..be922e946 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index ba8b3536f..f7410a31c 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -17,13 +17,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF return FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD @@ -231,7 +231,7 @@ FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 .2byte 0 FallarborTown_BattleTentBattleRoom_EventScript_200BBA:: @ 8200BBA - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 1, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM removeobject 3 setvar VAR_TEMP_1, 1 diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 60168264f..fd315091d 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 6, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index 327033829..82c9c97a1 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 lockall setvar VAR_TEMP_0, 1 applymovement 1, FallarborTown_BattleTentCorridor_Movement_2006FB - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_2006FB waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, FallarborTown_BattleTentCorridor_Movement_200701 - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentCorridor_Movement_200700 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 4c565ff8c..2339a3732 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 12, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 0, "y": 7, "elevation": 3, @@ -107,4 +107,4 @@ "script": "FallarborTown_BattleTentLobby_EventScript_20024F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index fddadae15..8021b2622 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ FallarborTown_BattleTentLobby_MapScript2_1FFE71: @ 81FFE71 FallarborTown_BattleTentLobby_EventScript_1FFE7B:: @ 81FFE7B setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end FallarborTown_BattleTentLobby_MapScript2_1FFE85: @ 81FFE85 @@ -199,12 +199,12 @@ FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF applymovement 1, FallarborTown_BattleTentLobby_Movement_2001FE - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200205 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, FallarborTown_BattleTentLobby_Movement_200202 - applymovement EVENT_OBJ_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 + applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_200209 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index a31c1c5bf..77187255a 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index f58c0d9e2..bf72fa1d9 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 9, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 2, "elevation": 3, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index c444c1e38..12b0f13ef 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 4, "y": 4, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 0b55de01a..00ab6142b 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 2, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 2, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 60bca57a9..668a7cb2d 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index fe81fd10a..9ce127385 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 39, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 41, "elevation": 1, @@ -96,4 +96,4 @@ "script": "FarawayIsland_Entrance_EventScript_Sign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 4998380e1..fce5bf34e 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MEW", + "graphics_id": "OBJ_EVENT_GFX_MEW", "x": 13, "y": 17, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 70d1a2cfd..4760caebc 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_FIERY_PATH_TM06" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 15, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 12, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 23, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 24, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 32, "elevation": 3, @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index ce1dcee3e..991f0930f 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 31, "y": 3, "elevation": 4, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 32, "y": 16, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 32, "y": 10, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 14, "elevation": 4, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 8, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 9, "y": 16, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 8, "elevation": 3, @@ -233,4 +233,4 @@ "script": "Common_EventScript_ShowPokemartSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index ac0ca1f89..3511822fd 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 2, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index 7b17c58c0..6fc0ff6a9 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WINONA", + "graphics_id": "OBJ_EVENT_GFX_WINONA", "x": 15, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 5, "y": 17, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 9, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 15, "y": 21, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 23, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 10, "elevation": 3, @@ -154,4 +154,4 @@ "script": "FortreeCity_Gym_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index f984e2be5..44bbb2d3d 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 7, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index c4988e863..21fb09b52 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 2, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index ce70f4605..71b8eef43 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 0, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 5, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 01d1a99e8..7eda47251 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 1, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 3, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index a53b4e35c..8b6b64bbc 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 6, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index a8bca3743..4c3f311b1 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 8, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 6, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 38f133cc0..045f4f82b 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 3, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 42aca8164..12db0e367 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 1822dd0c9..e5eec44c6 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 7, "elevation": 3, @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 5a4548164..83469027d 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 21, "elevation": 3, @@ -81,4 +81,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 72e403046..6aca4b1e0 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -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, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 14, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 16, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 12, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 22, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 6, "y": 22, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 21, "elevation": 3, @@ -188,4 +188,4 @@ "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 87264cd54..c471a8f55 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 7, "y": 8, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 0456f5eaf..9b3cbfcdb 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -42,13 +42,13 @@ GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D return GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18 - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit waitmovement 0 return GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A - applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit + applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth waitmovement 0 return diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 256c7c1a5..25c361ee6 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 0, "elevation": 8, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 3, "elevation": 8, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 2, "y": 3, "elevation": 8, @@ -148,4 +148,4 @@ "script": "InsideOfTruck_EventScript_MovingBox" } ] -}
\ No newline at end of file +} diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index dbecdf4ed..861b7d04a 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGICE", + "graphics_id": "OBJ_EVENT_GFX_REGICE", "x": 8, "y": 7, "elevation": 3, @@ -78,4 +78,4 @@ "script": "IslandCave_EventScript_CaveEntranceSide" } ] -}
\ No newline at end of file +} diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index b60bcf263..ff3b05780 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 10, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 16, "y": 35, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 24, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 9, "y": 21, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 16, "y": 19, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 14, "y": 25, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 18, "y": 25, "elevation": 3, @@ -243,4 +243,4 @@ "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 1212f3354..428809e76 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 7, "elevation": 3, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 1, "elevation": 3, @@ -47,7 +47,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 5, "y": 8, "elevation": 3, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 10, "y": 13, "elevation": 3, @@ -73,7 +73,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, @@ -86,7 +86,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -99,7 +99,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 6, "y": 16, "elevation": 3, @@ -112,7 +112,7 @@ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 12, "y": 15, "elevation": 0, @@ -125,7 +125,7 @@ "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 4, "y": 7, "elevation": 3, @@ -259,4 +259,4 @@ "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index dc45f94d4..0939bfe40 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -134,7 +134,7 @@ LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C waitmovement 0 applymovement 8, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -149,7 +149,7 @@ LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC return LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7 - applymovement EVENT_OBJ_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit + applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit applymovement 7, LavaridgeTown_Movement_RivalExit1 waitmovement 0 return diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 7c7033a83..07cb25fa5 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "graphics_id": "OBJ_EVENT_GFX_FLANNERY", "x": 13, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 2, "y": 15, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 5, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 12, "y": 16, "elevation": 3, @@ -296,4 +296,4 @@ "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index e8ba3e958..86e245ea6 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 18, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 13, "y": 17, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 16, "elevation": 3, @@ -239,4 +239,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 1e7048b3f..bf0abf521 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 3, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 77ebb268e..d40f639fd 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 2, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 6, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 8, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index d55b562db..929220a5b 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 5, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 4df734a49..c8cd0d985 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 6, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 3, "elevation": 3, @@ -99,4 +99,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 2ee196f9b..53493ecf5 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 4f7c3ab0f..5713bcce4 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 32, "y": 20, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 15, "y": 18, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 28, "y": 28, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 21, "y": 15, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 16, "y": 9, "elevation": 5, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 35, "y": 27, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 35, "y": 37, "elevation": 5, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 34, "y": 37, "elevation": 5, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 57, "y": 17, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 73, "y": 15, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 61, "y": 36, "elevation": 5, @@ -169,7 +169,7 @@ "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 43, "y": 18, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 46, "y": 12, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 45, "y": 12, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 38, "y": 9, "elevation": 5, @@ -221,7 +221,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 50, "y": 7, "elevation": 5, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 27, "y": 7, "elevation": 5, @@ -247,7 +247,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 16, "y": 23, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 41, "y": 25, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 40, "y": 25, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 34, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 16, "y": 35, "elevation": 3, @@ -519,4 +519,4 @@ "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 456c7eec8..8f2060acb 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 30, "y": 30, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 11, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 40, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 22, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 15, "y": 22, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 25, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 25, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 25, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 16, "y": 25, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 24, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 24, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 24, "y": 10, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 27, "y": 10, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 22, "y": 13, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 24, "y": 13, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 26, "y": 13, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 28, "y": 13, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 20, "y": 10, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 30, "y": 11, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 8, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 20, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 36, "y": 22, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 39, "y": 22, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 34, "y": 25, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 36, "y": 25, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 38, "y": 25, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 40, "y": 25, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 32, "y": 23, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 37, "y": 20, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 42, "y": 24, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 26, "elevation": 3, @@ -512,4 +512,4 @@ "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 744ed4174..c26e002a3 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -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, @@ -469,4 +469,4 @@ "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index b6874d99f..9aa9e6790 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -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 @@ -945,7 +945,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 @@ -953,7 +953,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 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index c447bb41d..46c75669a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 3, "elevation": 3, @@ -63,4 +63,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 3f97cc597..49008b035 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -44,11 +44,11 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211 waitmovement 0 applymovement 1, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index 17c93e5a1..217d7164b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 10, "y": 3, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 7, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 1, "y": 7, "elevation": 3, @@ -117,4 +117,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index abc4e18dd..6d9c85a8b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 44f54006c..d2577184f 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN", "x": 6, "y": 1, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 5, "elevation": 3, @@ -95,4 +95,4 @@ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 0fc05dd5a..4787b811d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 14, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 6, "elevation": 3, @@ -134,4 +134,4 @@ "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index fd30dc516..ac1dda145 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 8, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 0, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 6, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index cf25e1798..55f543df6 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 0, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 13, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 8, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index a95cf6c3e..4575903a1 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 6, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 98d15787e..fd352ea6d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 1, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 17, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 5, "elevation": 3, @@ -131,4 +131,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 1b97c298d..a64da745a 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 8, "y": 10, "elevation": 3, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index cf273bcb8..31b33761e 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -364,7 +364,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 compare VAR_FACING, DIR_EAST call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return @@ -428,18 +428,18 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC compare VAR_FACING, DIR_EAST call_if_eq LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 2 call Common_EventScript_FerryDepart return LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 821E610 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast waitmovement 0 return LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 821E61B - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth waitmovement 0 return @@ -520,14 +520,14 @@ LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696 LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: @ 821E6A1 applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth waitmovement 0 return LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast:: @ 821E6BA applymovement 5, LilycoveCity_Harbor_Movement_BrineyBoardFerry - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast applymovement 4, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast waitmovement 0 return diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 4f3fbcc28..678ec2ec5 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index c92a50499..78690ae81 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 4, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index e8010956d..9149d6595 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 1, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 2, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 2, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 95fc79d35..94f97588a 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 83028fbeb..339f2c9c5 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 2, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 3, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 19, "y": 3, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 6, "y": 2, "elevation": 3, @@ -299,4 +299,4 @@ "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index a9c6f1266..998cd2897 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -47,7 +47,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -55,7 +55,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate @@ -63,7 +63,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84 lockall - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast waitmovement 0 warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index 54d6fbc63..20330b12f 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 10, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 19, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 7, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 14, "y": 6, "elevation": 3, @@ -175,4 +175,4 @@ "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 4279d3064..6d0c12c9c 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -63,17 +63,17 @@ LilycoveCity_LilycoveMuseum_2F_OnFrame: @ 82197FE LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808 lockall applymovement 1, Common_Movement_FacePlayer - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN applymovement 1, Common_Movement_FacePlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft + applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 30c5a413f..d2a1d1320 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 4, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 4f87f50b0..413c1ffd6 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 1, "y": 3, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 3, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index cd1324cbe..e1c94bef2 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index f918c86ec..961d34831 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 7, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_FANCLUB_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_FANCLUB_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 10, "y": 10, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 5, "elevation": 3, @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 039fb6413..b76f96b30 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -17,12 +17,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 821C79A applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer waitmovement 0 diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 44cd20815..afa6c739c 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index 56249cb50..236ded915 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -21,7 +21,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 16, "y": 10, "elevation": 3, @@ -34,7 +34,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 13, "elevation": 3, @@ -47,7 +47,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 14, "y": 17, "elevation": 3, @@ -60,7 +60,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 5, "y": 8, "elevation": 3, @@ -73,7 +73,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 2, "y": 10, "elevation": 4, @@ -86,7 +86,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 11, "y": 10, "elevation": 4, @@ -99,7 +99,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 10, "elevation": 3, @@ -112,7 +112,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 14, "y": 10, "elevation": 3, diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index cb2589ed2..1726c8132 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -143,7 +143,7 @@ LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9 LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 delay 15 playse SE_DANSA - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim @@ -158,16 +158,16 @@ LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17 msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_MomApproachDoor - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerApproachDoor waitmovement 0 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_MomEnterHouse - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerEnterHouse waitmovement 0 setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE setvar VAR_LITTLEROOT_INTRO_STATE, 3 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN @@ -307,7 +307,7 @@ LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_TwinPushPlayerFromRoute - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PushPlayerBackFromRoute waitmovement 0 msgbox LittlerootTown_Text_DangerousIfYouDontHavePokemon, MSGBOX_DEFAULT closemessage @@ -389,7 +389,7 @@ LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F lockall applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT @@ -560,70 +560,70 @@ LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0 return LittlerootTown_EventScript_MomApproachPlayer0:: @ 81E8333 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayer0 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayer1:: @ 81E8348 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayer1 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 81E835D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale2 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 81E8372 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale3 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 81E8387 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale4 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 81E839C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerMale5 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 81E83B1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale2 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 81E83C6 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale3 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 81E83DB - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale4 waitmovement 0 return LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 81E83F0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 applymovement 4, LittlerootTown_Movement_MomApproachPlayerFemale5 waitmovement 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 8b0c762f9..f0e881ec1 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 2, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX", "x": 1, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY", "x": 4, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 2, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_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": 1, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 8, "elevation": 3, @@ -168,4 +168,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index ee8d67cd9..09b4ce152 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -63,7 +63,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 lockall msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs waitmovement 0 warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 @@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E waitmovement 0 applymovement 4, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach waitmovement 0 special GetRivalSonDaughterString @@ -183,7 +183,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2 end LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: @ 81F7981 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -229,19 +229,19 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9 step_end LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0:: @ 81F79C1 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1:: @ 81F79D3 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2:: @ 81F79E5 - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2 + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2 waitmovement 0 return diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 01af64e7d..34ab79982 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 1, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 4, @@ -106,7 +106,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 0, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 1, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 2, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 3, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 4, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 5, "elevation": 0, @@ -184,7 +184,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 7, "y": 1, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 4, "elevation": 0, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_SWABLU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_SWABLU_DOLL", "x": 5, "y": 5, "elevation": 3, @@ -267,4 +267,4 @@ "script": "PlayersHouse_2F_EventScript_GameCube" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 101e2bbad..4f673a7be 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -93,11 +93,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth waitmovement 0 return @@ -105,11 +105,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth waitmovement 0 return @@ -117,11 +117,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest waitmovement 0 return @@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index 118e3e819..16b1eac73 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -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, @@ -168,4 +168,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index f016031df..2a4b653d3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -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 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index 33cdfb7c1..7366f9241 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 1, "y": 1, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 6, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 2, "y": 6, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 3, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 4, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 5, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 7, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 7, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 2, "y": 7, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 3, "y": 7, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 4, "y": 7, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 5, "y": 7, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 1, "y": 1, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL", "x": 3, "y": 4, "elevation": 4, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 4, "elevation": 0, @@ -267,4 +267,4 @@ "script": "LittlerootTown_MaysHouse_2F_EventScript_PC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 5bfbfbbcd..d40740835 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -93,11 +93,11 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth waitmovement 0 return @@ -105,11 +105,11 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth waitmovement 0 return @@ -117,7 +117,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage @@ -128,11 +128,11 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast applymovement 1, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast waitmovement 0 return diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 7aadfe03a..0454c170a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 9, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 8, "elevation": 3, @@ -232,4 +232,4 @@ "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b27cb1f8a..75c963095 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -63,11 +63,11 @@ LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH addobject 2 addobject 3 turnobject 3, DIR_NORTH @@ -153,7 +153,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48 LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex end @@ -185,7 +185,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 playse SE_TK_KASYA delay 20 applymovement 3, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 checkplayergender compare VAR_RESULT, MALE @@ -198,7 +198,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex waitmovement 0 applymovement 3, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT playfanfare MUS_FANFA4 @@ -261,7 +261,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58 LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62 lockall - applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter + applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter waitmovement 0 msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 @@ -546,7 +546,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8 closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 checkplayergender compare VAR_RESULT, MALE diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index ce7474c6f..98436b4da 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 4, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 20, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 30, "y": 20, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 22, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 22, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 23, "elevation": 3, @@ -125,4 +125,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index a059ed3d9..c30fcf317 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 18, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 8, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 21, "y": 11, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 5d70de489..164da412f 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 29, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 25, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 8, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 7, "y": 13, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 6, "elevation": 3, @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json index 186fa9dd8..af9dbd731 100644 --- a/data/maps/MagmaHideout_2F_3R/map.json +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index edf3e6671..600e194ad 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 2, "y": 7, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 21, "y": 21, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 16, "elevation": 0, @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 70dd1bdf8..c5ed02b66 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 16, "y": 3, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 9, "elevation": 0, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 6ec900c31..49d176ade 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 0, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index b01200f08..93d78e243 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_1", "x": 16, "y": 17, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 31, "y": 22, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 30, "y": 13, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 26, "y": 13, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 22, "y": 4, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 16, "y": 21, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_2", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_2", "x": 16, "y": 17, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 7, "elevation": 0, @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 08b59e1f0..5a5e9ebf9 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -15,7 +15,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560 playfanfare MUS_ME_TAMA playse SE_TAMA special DoOrbEffect - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @ sleeping Groudon @@ -47,7 +47,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560 waitmovement 0 msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 6, Common_Movement_FacePlayer diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index e95e72734..aaf7e6f81 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_1", "x": 9, "y": 22, "elevation": 1, @@ -49,4 +49,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index c0823c480..6eaeb4b51 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -25,7 +25,7 @@ MarineCave_End_EventScript_ShowKyogre:: @ 823B012 MarineCave_End_EventScript_Kyogre:: @ 823B01B lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, MarineCave_End_Movement_KyogreApproach waitmovement 0 diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json index 545fe1c9b..4ae306651 100644 --- a/data/maps/MarineCave_Entrance/map.json +++ b/data/maps/MarineCave_Entrance/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 1708008bd..713c0553a 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -36,7 +36,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 29, "y": 16, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 24, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 11, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 18, "y": 6, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 17, "y": 14, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 8, "y": 6, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 9, "y": 6, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 29, "y": 9, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 19, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 7, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 12, "y": 14, "elevation": 3, @@ -297,4 +297,4 @@ "script": "MauvilleCity_EventScript_GameCornerSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 3410664a1..745cd13b7 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -114,19 +114,19 @@ MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD end MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1 applymovement 6, MauvilleCity_Movement_WallyExitNorth1 applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth1 waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth applymovement 7, MauvilleCity_Movement_WallysUncleApproachPlayerNorth waitmovement 0 msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth2 applymovement 7, MauvilleCity_Movement_WallysUncleExitNorth2 applymovement 6, MauvilleCity_Movement_WallyExitNorth2 waitmovement 0 @@ -134,7 +134,7 @@ MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0 end MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1 applymovement 6, MauvilleCity_Movement_WallyExitEast1 applymovement 7, MauvilleCity_Movement_WallysUncleExitEast1 waitmovement 0 @@ -145,7 +145,7 @@ MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D waitmovement 0 msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 applymovement 7, MauvilleCity_Movement_WallysUncleExitEast2 applymovement 6, MauvilleCity_Movement_WallyExitEast2 waitmovement 0 @@ -164,7 +164,7 @@ MauvilleCity_EventScript_DefeatedWally:: @ 81DF593 call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth compare VAR_FACING, DIR_EAST call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT closemessage @@ -191,13 +191,13 @@ MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601 return MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth applymovement 11, MauvilleCity_Movement_ScottExitNorth waitmovement 0 return MauvilleCity_EventScript_ScottExitEast:: @ 81DF628 - applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast + applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast applymovement 11, MauvilleCity_Movement_ScottExitEast waitmovement 0 return diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 488ab5a4e..5f31275d0 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 6, "elevation": 3, @@ -76,4 +76,4 @@ "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index efebc685a..416ed44b5 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 19, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 20, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 13, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 1, "y": 7, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 9, "y": 8, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 6, "elevation": 3, @@ -382,4 +382,4 @@ "script": "Roulette_EventScript_Table2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index ecc9f13c2..56372cd73 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 5, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 1, "y": 16, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 10, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 13, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 20, "elevation": 0, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 7, "y": 10, "elevation": 3, @@ -178,4 +178,4 @@ "script": "MauvilleCity_Gym_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 9df540885..96fdc1896 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 4, "y": 4, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index acdb4f504..1cac7e6e0 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 72e323bfe..d0f64ef00 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 5, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 6540334be..a017b14b2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 8, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 8, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index f37f362e2..ee13ffcfd 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 end MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8210E74 - special ScrSpecial_SetMauvilleOldManEventObjGfx + special ScrSpecial_SetMauvilleOldManObjEventGfx end @ VAR_0x800B is the Nurse's object event id diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index 000f0cf64..7ea0ab81b 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 46e031857..955933868 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 20, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 14, "y": 21, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 6, "y": 20, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 20, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 21, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 23, "elevation": 3, @@ -210,4 +210,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index ad3eb3eb8..c86d50d4d 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,7 +16,7 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F lockall playbgm MUS_MGM0, 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown waitmovement 0 delay 30 applymovement 5, Common_Movement_WalkInPlaceDown @@ -37,7 +37,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -54,7 +54,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay + applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit waitmovement 0 diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 1b27e859e..49843aa4a 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 13, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 7, "y": 12, "elevation": 3, @@ -95,4 +95,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index c234bd8b8..a58929a28 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -60,4 +60,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 8fd3eb4a2..e874f1452 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index c5ad26805..703d8d281 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 19, "y": 3, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json index 886e0bf88..3ec89b5ae 100644 --- a/data/maps/MirageTower_1F/map.json +++ b/data/maps/MirageTower_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json index d8953d3da..d49f2418a 100644 --- a/data/maps/MirageTower_2F/map.json +++ b/data/maps/MirageTower_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index c24e2a006..3ed25e6c4 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 71e080a23..057495497 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 5, "y": 4, "elevation": 4, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 7, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 6, "y": 7, "elevation": 3, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index e3b1af96b..7456a454a 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 38, "y": 12, "elevation": 5, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 50, "y": 34, "elevation": 5, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 32, "y": 12, "elevation": 5, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 26, "y": 21, "elevation": 5, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 45, "y": 18, "elevation": 7, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 62, "y": 35, "elevation": 5, @@ -109,7 +109,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 55, "y": 5, "elevation": 7, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 56, "y": 21, "elevation": 7, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 23, "y": 13, "elevation": 5, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 23, "elevation": 5, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 24, "elevation": 5, @@ -174,7 +174,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 25, "elevation": 5, @@ -187,7 +187,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 44, "y": 26, "elevation": 5, @@ -200,7 +200,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 45, "y": 25, "elevation": 5, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 19, "y": 25, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 61, "y": 29, "elevation": 5, @@ -239,7 +239,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 31, "y": 29, "elevation": 3, diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index ce53af427..b0013f72a 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -265,13 +265,13 @@ MossdeepCity_EventScript_Scott:: @ 81E4C85 end MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit applymovement 16, MossdeepCity_Movement_ScottExitNorth waitmovement 0 return MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2 - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit applymovement 16, MossdeepCity_Movement_ScottExitEast waitmovement 0 return diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index 3e64c45fd..dbc1180e1 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 2, "elevation": 0, diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index c86bf2b6e..c1c046c38 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 33bd1d434..3e57e496b 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -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, @@ -684,4 +684,4 @@ "script": "MossdeepCity_Gym_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index ec5e2bb70..1e2bdee3a 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -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 diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 6b57ca6ef..01a896163 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 967fc0a55..37007f0eb 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 4, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 4, "y": 5, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index b2d7cb404..233f543cc 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 4, "y": 4, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 7166674a3..028be796f 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 6, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 8be148fad..25cc618ee 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 5, "y": 3, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index c8018bc36..b198aeeb4 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 3, "y": 5, "elevation": 3, @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index aa8691ac8..b6cf6280b 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 7, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 22f008ed1..b67d21f0e 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 10, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 14, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 12, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 11, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 10, "y": 2, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 13, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 2, "y": 5, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_MAGMA_NOTE" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 1, "y": 4, "elevation": 3, @@ -183,4 +183,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 61729d003..d0aae6927 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 6, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 5, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 1, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 13, "y": 3, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 14, "y": 2, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 0, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 1, "y": 9, "elevation": 3, @@ -143,4 +143,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 403377161..c2793df16 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -32,16 +32,16 @@ MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5 MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit + applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit waitmovement 0 warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 255, 13, 1 waitstate @@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09 trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index c061999ef..56734b17e 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 9, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 6, "y": 4, "elevation": 3, @@ -105,4 +105,4 @@ "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index d18415a5f..9a6b3b8f5 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 24, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 13, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 12, "y": 11, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 32, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 28, "y": 12, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 19, "y": 39, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 29, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 31, "y": 12, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 19, "y": 39, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 22, "y": 39, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 19, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 18, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 23, "y": 17, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 20, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 22, "y": 19, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 23, "y": 21, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 21, "y": 19, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 12, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 29, "y": 12, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 5, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 31, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 9, "y": 16, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 20, "y": 39, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 21, "y": 39, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 16, "y": 18, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 7, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 7, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 27, "y": 17, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 13, "y": 16, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 7, "y": 7, "elevation": 3, @@ -454,4 +454,4 @@ "script": "MtChimney_EventScript_RouteSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index a70d7e3ae..cafadf17c 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -60,7 +60,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast compare VAR_FACING, DIR_NORTH call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT closemessage diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 49d102878..1894d41e5 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 32064ad04..8c4294126 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -19,7 +19,7 @@ MtChimney_CableCarStation_OnFrame: @ 822AC1D MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27 lockall - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar + applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar applymovement 1, MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 @@ -42,7 +42,7 @@ MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C msgbox MtChimney_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar - applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar + applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 2e03ae728..52f07f630 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 21, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 17, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 13, "y": 10, "elevation": 3, @@ -100,4 +100,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index e6882c311..124719bbb 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 9, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 12, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 2, "y": 9, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 3, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 6, "y": 9, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 6, "y": 6, "elevation": 3, @@ -158,4 +158,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 058c4db0a..67fdeddc1 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 1, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 11, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 4, "elevation": 3, @@ -113,4 +113,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 5c3d72ef8..7db90d71b 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -87,4 +87,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 1f814bda8..f1cfedcb0 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -80,4 +80,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index c2de09055..c67582a8c 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 6, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 9, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 10, "y": 3, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 2fbcd5673..ff4c5b8fa 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 40, "elevation": 3, @@ -129,4 +129,4 @@ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index ef4533802..87de8a4a8 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 22, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 23, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 23, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 15, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 25, "y": 18, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 25, "y": 11, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 23, "y": 6, "elevation": 3, @@ -216,4 +216,4 @@ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 577b87076..18ebc4ff7 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -32,7 +32,7 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030 MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C playbgm MUS_AQA_0, 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -87,7 +87,7 @@ MtPyre_Summit_EventScript_ArchieFacePlayer2:: @ 82320EC MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: @ 82320F7 applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -99,7 +99,7 @@ MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: @ 823210C MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: @ 8232117 applymovement 3, MtPyre_Summit_Movement_OldLadyApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -208,7 +208,7 @@ MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: @ 8232204 end MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 60 compare VAR_0x8008, 0 @@ -248,49 +248,49 @@ MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210 end MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: @ 82322C4 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0 applymovement 2, MtPyre_Summit_Movement_MaxieExit applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: @ 82322DD - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1 applymovement 2, MtPyre_Summit_Movement_MaxieExit applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: @ 82322F6 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2 applymovement 2, MtPyre_Summit_Movement_MaxieExit applymovement 8, MtPyre_Summit_Movement_ArchieExit waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer0:: @ 823230F - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0 applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer0 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer1:: @ 8232328 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer1 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachPlayer2:: @ 8232341 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie applymovement 2, MtPyre_Summit_Movement_ArchieWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachPlayer2 waitmovement 0 return MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie0 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight @@ -298,7 +298,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A return MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie1 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight @@ -306,7 +306,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376 return MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392 - applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie + applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement 8, MtPyre_Summit_Movement_MaxieApproachArchie2 waitmovement 0 applymovement 2, Common_Movement_WalkInPlaceFastestRight diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 6b5cd0089..f2354522f 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 1ae004107..2d4a89bdb 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LUGIA", + "graphics_id": "OBJ_EVENT_GFX_LUGIA", "x": 11, "y": 13, "elevation": 0, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json index 50f60b52e..ef8effb57 100644 --- a/data/maps/NavelRock_Down01/map.json +++ b/data/maps/NavelRock_Down01/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json index fb2d15145..5b9715dc8 100644 --- a/data/maps/NavelRock_Down02/map.json +++ b/data/maps/NavelRock_Down02/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json index a82e03610..9d8140955 100644 --- a/data/maps/NavelRock_Down03/map.json +++ b/data/maps/NavelRock_Down03/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json index 58e81b709..b3ff4f678 100644 --- a/data/maps/NavelRock_Down04/map.json +++ b/data/maps/NavelRock_Down04/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json index a1fcef804..d477fcf82 100644 --- a/data/maps/NavelRock_Down05/map.json +++ b/data/maps/NavelRock_Down05/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json index 204a2a2cf..91356a495 100644 --- a/data/maps/NavelRock_Down06/map.json +++ b/data/maps/NavelRock_Down06/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json index f48063d8a..4fc93ba1b 100644 --- a/data/maps/NavelRock_Down07/map.json +++ b/data/maps/NavelRock_Down07/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json index d5f7ea8fe..2572c991a 100644 --- a/data/maps/NavelRock_Down08/map.json +++ b/data/maps/NavelRock_Down08/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json index 348739b31..23d33233c 100644 --- a/data/maps/NavelRock_Down09/map.json +++ b/data/maps/NavelRock_Down09/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json index 3aa128fa0..88d0f679a 100644 --- a/data/maps/NavelRock_Down10/map.json +++ b/data/maps/NavelRock_Down10/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json index 0ed44f0fc..2de0d5771 100644 --- a/data/maps/NavelRock_Down11/map.json +++ b/data/maps/NavelRock_Down11/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json index 983df45df..50c075fe9 100644 --- a/data/maps/NavelRock_Entrance/map.json +++ b/data/maps/NavelRock_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index b98f08d4e..c65aa2062 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 728b8a7aa..08404c872 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index e91dfa8d1..a30f1c386 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 5, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 7, "elevation": 1, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index c906c4ceb..f0e1bb8f8 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HOOH", + "graphics_id": "OBJ_EVENT_GFX_HOOH", "x": 12, "y": 4, "elevation": 0, @@ -58,4 +58,4 @@ "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH" } ] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index fcd043d3d..4cb110d81 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -39,7 +39,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F setvar VAR_0x8005, 35 @ delay special LoopWingFlapSE applymovement 1, NavelRock_Top_Movement_HoOhAppear - applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp + applymovement OBJ_EVENT_ID_CAMERA, NavelRock_Top_Movement_CameraPanUp waitmovement 0 delay 50 setweather WEATHER_NONE @@ -52,7 +52,7 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F setvar VAR_0x8004, 3 @ num loops setvar VAR_0x8005, 35 @ delay special LoopWingFlapSE - applymovement EVENT_OBJ_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown + applymovement OBJ_EVENT_ID_CAMERA, NavelRock_Top_Movement_CameraPanDown applymovement 1, NavelRock_Top_Movement_HoOhApproach waitmovement 0 special RemoveCameraObject diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json index 24d1b5a32..2ad457e36 100644 --- a/data/maps/NavelRock_Up1/map.json +++ b/data/maps/NavelRock_Up1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json index 2d16e798c..a3f108da1 100644 --- a/data/maps/NavelRock_Up2/map.json +++ b/data/maps/NavelRock_Up2/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json index 2e984b379..6f8b62608 100644 --- a/data/maps/NavelRock_Up3/map.json +++ b/data/maps/NavelRock_Up3/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json index e448e6a9a..8d3a5b0d2 100644 --- a/data/maps/NavelRock_Up4/map.json +++ b/data/maps/NavelRock_Up4/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 593e23a62..c12d086c1 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -42,4 +42,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index e9369b7ea..6d7d731de 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -23,7 +23,7 @@ NewMauville_Entrance_OnTransition: @ 82372FB NewMauville_Entrance_EventScript_Door:: @ 82372FF lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 8909fcbaa..296ee07db 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 25, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 22, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 18, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 10, "elevation": 3, @@ -286,4 +286,4 @@ "script": "NewMauville_Inside_EventScript_Generator" } ] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 1644c76d6..226ae0c72 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 11, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 13, "y": 7, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 9, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 88f73d39b..5084b31a4 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -50,20 +50,20 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47 applymovement 2, OldaleTown_Movement_EmployeeSouth - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerSouth + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerSouth waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart end OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E applymovement 2, OldaleTown_Movement_EmployeeNorth - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerNorth + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerNorth waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart end OldaleTown_EventScript_GoToMartEast:: @ 81E8F75 - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerEast + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerEast applymovement 2, OldaleTown_Movement_EmployeeEast waitmovement 0 goto OldaleTown_EventScript_ExplainPokemonMart @@ -201,7 +201,7 @@ OldaleTown_EventScript_FootprintsMan:: @ 81E901F OldaleTown_EventScript_BlockedPath:: @ 81E903F lockall - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_PlayerStepBack + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerStepBack applymovement 3, OldaleTown_Movement_BackUp waitmovement 0 msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT @@ -228,7 +228,7 @@ OldaleTown_EventScript_RivalTrigger1:: @ 81E9086 lockall applymovement 4, OldaleTown_Movement_RivalApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage @@ -238,7 +238,7 @@ OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6 lockall applymovement 4, OldaleTown_Movement_RivalApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage @@ -248,7 +248,7 @@ OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6 lockall applymovement 4, OldaleTown_Movement_RivalApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage @@ -294,7 +294,7 @@ OldaleTown_EventScript_DoExitMovement1:: @ 81E9148 return OldaleTown_EventScript_DoExitMovement2:: @ 81E915E - applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_Movement_WatchRivalExit + applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_WatchRivalExit applymovement 4, OldaleTown_Movement_RivalExit waitmovement 0 return diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 03155a623..6d9be59bd 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 4, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 754f98c49..1fe1f898e 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index a27fad497..c3444f580 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 2f92a004c..5322efa63 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 7, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index c3e41775d..2fd9bdcd8 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index ff64a5967..4a50baf23 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 23, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 11, "y": 14, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 9, "y": 16, "elevation": 3, @@ -136,4 +136,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8f7357246..91c0cd406 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 8c9cd91af..597776ec9 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 1, "y": 7, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 11bd0761b..76e6a3fcc 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 2, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index f196f6a8a..577f7bc5e 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index c828d7a29..85d5bc2b7 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index dd5dfcb9c..faa76da50 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 10, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 12, "y": 8, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 25d8abd04..19e5e0930 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 721234bd5..cad421008 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 16, "y": 18, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 15, "y": 10, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 20, "y": 10, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 15, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 2, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 28, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 15, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 13, "y": 12, "elevation": 3, diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 5d3bbf1ef..16977581c 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -38,7 +38,7 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_WallyTutorialWally - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WallyTutorialPlayer waitmovement 0 msgbox Route102_Text_WatchMeCatchPokemon, MSGBOX_DEFAULT special StartWallyTutorialBattle @@ -63,17 +63,17 @@ PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390 lockall setflag FLAG_HIDE_MAP_NAME_POPUP applymovement 5, PetalburgCity_Movement_WalkToWallyHouseUncle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer waitmovement 0 setvar VAR_0x8004, 7 setvar VAR_0x8005, 5 opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 5, PetalburgCity_Movement_WalkInsideHouseUncle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer waitmovement 0 setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_MAP_NAME_POPUP @@ -291,7 +291,7 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3 msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT applymovement 8, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT closemessage @@ -304,7 +304,7 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F applymovement 8, PetalburgCity_Movement_BoyApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -316,38 +316,38 @@ PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594 PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F applymovement 8, PetalburgCity_Movement_BoyApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4 applymovement 8, PetalburgCity_Movement_BoyApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9 applymovement 8, PetalburgCity_Movement_BoyWalkToGym0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0 waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB applymovement 8, PetalburgCity_Movement_BoyWalkToGym1 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1 waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED applymovement 8, PetalburgCity_Movement_BoyWalkToGym2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2 waitmovement 0 return PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF applymovement 8, PetalburgCity_Movement_BoyWalkToGym3 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3 waitmovement 0 return @@ -549,7 +549,7 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9 waitmovement 0 applymovement 9, PetalburgCity_Movement_ScottApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT @@ -578,25 +578,25 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9 end PetalburgCity_EventScript_ScottExit0:: @ 81DC78E - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0 applymovement 9, PetalburgCity_Movement_ScottExit0 waitmovement 0 return PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1 applymovement 9, PetalburgCity_Movement_ScottExit1 waitmovement 0 return PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2 applymovement 9, PetalburgCity_Movement_ScottExit2 waitmovement 0 return PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4 - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3 applymovement 9, PetalburgCity_Movement_ScottExit3 waitmovement 0 return diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 30cb6e209..4791eab6b 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 4, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 94, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 81, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 42, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 55, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 68, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 16, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 29, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 109, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 4, "y": 111, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 1, "y": 7, "elevation": 3, @@ -541,4 +541,4 @@ "script": "PetalburgCity_Gym_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index d9f299db2..90971f531 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -79,7 +79,7 @@ PetalburgCity_Gym_OnWarp: @ 820498B .2byte 0 PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 8204995 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PetalburgCity_Gym_OnFrame: @ 820499A @@ -91,14 +91,14 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4 msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym waitmovement 0 playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 @@ -238,13 +238,13 @@ PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43 applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth waitmovement 0 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_WallyArrive waitmovement 0 return @@ -252,25 +252,25 @@ PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78 applymovement 1, Common_Movement_WalkInPlaceFastestDown applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91 applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3 applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5 applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast waitmovement 0 return @@ -281,19 +281,19 @@ PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7 PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2 applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4 applymovement 1, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6 applymovement 1, Common_Movement_WalkInPlaceFastestLeft - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -523,7 +523,7 @@ PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2 PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -531,7 +531,7 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -539,7 +539,7 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009 PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -547,19 +547,19 @@ PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025 PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041 applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth applymovement 1, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitEast - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast waitmovement 0 return PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitWest - applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest + applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest waitmovement 0 return diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ce3dc3b16..d163af603 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 9354b4926..175ee2a85 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 5, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 82519cb5c..f2b464c1f 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 6, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index d673ecf4d..abf6a7b52 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 4, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 067d6f237..fbd072681 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 49af9f43d..765dae779 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 5, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 786fb26e7..578c04ee3 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_OnWarp: @ 8204234 .2byte 0 PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E - turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST + turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST turnobject 1, DIR_WEST end diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index d43017f99..e01920825 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 26, "y": 17, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 26, "y": 20, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 20, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 15, "y": 19, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 32, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 14, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 30, "y": 34, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 26, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 33, "y": 5, "elevation": 3, @@ -298,4 +298,4 @@ "script": "PetalburgWoods_EventScript_Sign2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 4c53891fd..0d968f45c 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7 applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 call PetalburgWoods_EventScript_DevonResearcherPostBattle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave applymovement 4, PetalburgWoods_Movement_DevonResearcherExitLeft waitmovement 0 goto PetalburgWoods_EventScript_RemoveDevonResearcher @@ -41,7 +41,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 call PetalburgWoods_EventScript_DevonResearcherIntro applymovement 4, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage @@ -59,14 +59,14 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079 applymovement 4, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight waitmovement 0 msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe applymovement 3, PetalburgWoods_Movement_AquaBackOff waitmovement 0 call PetalburgWoods_EventScript_DevonResearcherPostBattle - applymovement EVENT_OBJ_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave + applymovement OBJ_EVENT_ID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave applymovement 4, PetalburgWoods_Movement_DevonResearcherExitRight waitmovement 0 goto PetalburgWoods_EventScript_RemoveDevonResearcher @@ -85,7 +85,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138 applymovement 3, PetalburgWoods_Movement_AquaRunAway waitmovement 0 removeobject 3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index e2d5f3a52..96dadce00 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 10, "y": 5, "elevation": 3, @@ -97,4 +97,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 71dbf96cc..3fb137830 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 16, "y": 8, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 13, "elevation": 0, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", "x": 7, "y": 14, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1", "x": 10, "y": 13, "elevation": 0, @@ -78,7 +78,7 @@ "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 5, "y": 11, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_HIDE_ROUTE_101_BIRCH" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 13, "elevation": 3, @@ -198,4 +198,4 @@ "script": "Route101_EventScript_RouteSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index dca3dc47d..3e84dfa85 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -23,7 +23,7 @@ Route101_EventScript_StartBirchRescue:: @ 81EBCDE closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_EnterScene + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_EnterScene applymovement 2, Route101_Movement_BirchRunAway1 applymovement 4, Route101_Movement_PoochyenaChase1 waitmovement 0 @@ -45,7 +45,7 @@ Route101_EventScript_PreventExitSouth:: @ 81EBD4E lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitSouth + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitSouth waitmovement 0 releaseall end @@ -54,7 +54,7 @@ Route101_EventScript_PreventExitWest:: @ 81EBD64 lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitWest + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitWest waitmovement 0 releaseall end @@ -63,7 +63,7 @@ Route101_EventScript_PreventExitNorth:: @ 81EBD7A lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route101_Movement_PreventExitNorth + applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_PreventExitNorth waitmovement 0 releaseall end @@ -222,8 +222,8 @@ Route101_EventScript_BirchsBag:: @ 81EBE16 setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 - setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 special ChooseStarter waitstate diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index f8930a21d..017368f20 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 18, "y": 11, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 14, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 15, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 37, "y": 4, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 15, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "FLAG_ITEM_ROUTE_102_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 2, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 2, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 4, "elevation": 3, @@ -163,4 +163,4 @@ "script": "Route102_EventScript_RouteSignOldale" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 0a870a06e..16ae2069e 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 49, "y": 12, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 3, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_ROUTE_103_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 71, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 65, "y": 12, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 64, "y": 12, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 50, "y": 8, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 58, "y": 5, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 59, "y": 5, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 60, "y": 5, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 20, "y": 10, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 7, "y": 3, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "FLAG_HIDE_ROUTE_103_BIRCH" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 56, "y": 13, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 50, "y": 5, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 67, "y": 7, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 72, "y": 8, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 67, "y": 5, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 67, "y": 9, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 36, "y": 6, "elevation": 1, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 36, "y": 13, "elevation": 1, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 7, "elevation": 0, @@ -306,4 +306,4 @@ "script": "Route103_EventScript_RouteSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index c614dae1c..7c578c5b7 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -110,7 +110,7 @@ Route103_EventScript_RivalExit:: @ 81EC50A end Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth + applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth applymovement 2, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 playse SE_DANSA @@ -120,7 +120,7 @@ Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D end Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561 - applymovement EVENT_OBJ_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest + applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest applymovement 2, Route103_Movement_RivalExit1 waitmovement 0 playse SE_DANSA diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index f31c512f7..7020232de 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 60, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 25, "y": 49, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 31, "y": 24, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 27, "y": 63, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 30, "y": 50, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 28, "y": 74, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 54, "elevation": 1, @@ -122,7 +122,7 @@ "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 51, "elevation": 4, @@ -135,7 +135,7 @@ "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 29, "y": 8, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 6, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 6, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 6, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 41, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 41, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 41, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 37, "y": 8, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 22, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 23, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 24, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 25, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 15, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "FLAG_ITEM_ROUTE_104_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 19, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 27, "y": 15, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 28, "y": 15, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 21, "y": 25, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 44, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 67, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 22, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 22, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 8, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "FLAG_ITEM_ROUTE_104_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 26, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 15, "y": 59, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 17, "y": 50, "elevation": 0, diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 46dd80119..3294a2992 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -51,12 +51,12 @@ Route104_EventScript_RivalTrigger:: @ 81ECCB3 setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 10 addobject 34 clearflag FLAG_HIDE_ROUTE_104_RIVAL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBackUp + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBackUp waitmovement 0 applymovement 34, Route104_Movement_RivalExitBrineysCottage waitmovement 0 @@ -108,7 +108,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival applymovement 34, Route104_Movement_RivalWalkSlowLeft msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT closemessage @@ -197,7 +197,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerFaceRival applymovement 34, Route104_Movement_RivalWalkSlowLeft msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT closemessage @@ -358,13 +358,13 @@ Route104_EventScript_Girl2:: @ 81ED090 Route104_EventScript_SailToDewford:: @ 81ED099 setobjectpriority 8, MAP_ROUTE104, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104, 0 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_BrineyBoardBoat waitmovement 0 removeobject 8 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBoardBoat + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerBoardBoat waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_PlayBrineysBoatMusic goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls @@ -372,13 +372,13 @@ Route104_EventScript_SailToDewford:: @ 81ED099 Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9 applymovement 7, Route104_Movement_SailToDewford - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewford + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford waitmovement 0 goto Route104_EventScript_ArriveInDewford Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF applymovement 7, Route104_Movement_SailToDewfordBeforeDadCalls - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls waitmovement 0 pokenavcall Route104_Text_DadPokenavCall waitmessage @@ -389,7 +389,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF closemessage delay 30 setflag FLAG_ENABLE_NORMAN_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls applymovement 7, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104 waitmovement 7, MAP_ROUTE104 waitmovement 0 @@ -397,11 +397,11 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF Route104_EventScript_ArriveInDewford:: @ 81ED139 delay 50 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerExitBoat + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerExitBoat waitmovement 0 call Common_EventScript_StopBrineysBoatMusic - showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerMoveForBriney + showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerMoveForBriney waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 @@ -415,7 +415,7 @@ Route104_EventScript_ArriveInDewford:: @ 81ED139 setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT hideobjectat 7, MAP_ROUTE104 copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN copyobjectxytoperm 2 setvar VAR_BOARD_BRINEY_BOAT_STATE, 0 diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index dc6c0ab4d..0963336e5 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index dcda9afeb..e3b954dd7 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 0, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 11, "y": 6, "elevation": 4, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 168cee142..2e77358b6 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index f50dced01..e450403ab 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index bb6aadd54..ab51fcb46 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 19, "y": 60, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 27, "y": 36, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 45, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 19, "y": 9, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 73, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_ITEM_ROUTE_105_IRON" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 48, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 4, "y": 54, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 4, "y": 58, "elevation": 3, @@ -163,4 +163,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 273f59aa5..bc036ac00 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 5, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 29, "y": 10, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 51, "y": 14, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 65, "y": 14, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 14, "elevation": 3, @@ -135,4 +135,4 @@ "script": "Route106_EventScript_TrainerTipsSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index b0bb63a14..9f18d74a8 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 41, "y": 10, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 23, "y": 11, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 16, "y": 7, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 50, "y": 11, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 4, "elevation": 1, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 32, "y": 4, "elevation": 1, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 50, "y": 5, "elevation": 1, @@ -120,4 +120,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index ecdb81f6f..66e231a4c 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 13, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 12, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 13, "y": 13, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 7, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 41, "y": 5, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 43, "y": 5, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 4, "elevation": 3, @@ -137,4 +137,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 4ba9baf9f..12faafa21 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 21, "y": 26, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 21, "y": 24, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 12, "y": 36, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 25, "y": 39, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 15, "y": 17, "elevation": 4, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 13, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 19, "y": 10, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 22, "y": 7, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 6, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 46, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_109_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 29, "y": 32, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 31, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 21, "y": 56, "elevation": 0, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 24, "y": 18, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 25, "y": 18, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 30, "y": 32, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 8, "y": 41, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 41, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 33, "y": 6, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 32, "y": 6, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 17, "y": 13, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 27, "y": 7, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 6, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "FLAG_ITEM_ROUTE_109_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 17, "y": 56, "elevation": 3, @@ -414,4 +414,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index e7080ac50..6de9d3c55 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -4,7 +4,7 @@ Route109_MapScripts:: @ 81EE75F Route109_EventScript_StartDepartForDewford:: @ 81EE760 call EventScript_BackupMrBrineyLocation setobjectpriority 2, MAP_ROUTE109, 0 - setobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109, 0 + setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_BrineyEnterBoat waitmovement 0 removeobject 2 @@ -15,33 +15,33 @@ Route109_EventScript_StartDepartForDewford:: @ 81EE760 end Route109_EventScript_EnterBoatSouth:: @ 81EE7A5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth waitmovement 0 goto Route109_EventScript_DoSailToDewford end Route109_EventScript_EnterBoatEast:: @ 81EE7B5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast waitmovement 0 goto Route109_EventScript_DoSailToDewford end Route109_EventScript_EnterBoatWest:: @ 81EE7C5 - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest waitmovement 0 goto Route109_EventScript_DoSailToDewford end Route109_EventScript_DoSailToDewford:: @ 81EE7D5 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 call Common_EventScript_PlayBrineysBoatMusic applymovement 1, Route109_Movement_SailToDewford - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_SailToDewford + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_SailToDewford waitmovement 0 delay 50 call Common_EventScript_StopBrineysBoatMusic - showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route109_Movement_PlayerExitBoat + showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN + applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerExitBoat waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN @@ -56,7 +56,7 @@ Route109_EventScript_DoSailToDewford:: @ 81EE7D5 msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT closemessage copyvar VAR_BRINEY_LOCATION, VAR_0x8008 - resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE109 + resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN copyobjectxytoperm 2 release diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index ebd5583c6..1816463aa 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 14, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 5, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 660f24ccc..48cf4946e 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 17, "y": 90, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 29, "y": 79, "elevation": 4, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 14, "y": 69, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 9, "y": 57, "elevation": 4, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 10, "y": 11, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 27, "y": 24, "elevation": 4, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 15, "y": 7, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 16, "y": 73, "elevation": 4, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 31, "elevation": 4, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 30, "y": 31, "elevation": 4, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 16, "y": 55, "elevation": 4, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 3, "y": 39, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 15, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 34, "y": 40, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 10, "y": 19, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 11, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 11, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 11, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 69, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 47, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 27, "y": 92, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 7, "y": 83, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 83, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 9, "y": 83, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 83, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 82, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 21, "y": 78, "elevation": 4, @@ -382,7 +382,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 34, "y": 54, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 34, "y": 54, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 69, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 10, "y": 76, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 76, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 10, "y": 39, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 36, "y": 40, "elevation": 3, @@ -473,7 +473,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 38, "elevation": 3, @@ -486,7 +486,7 @@ "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 79, "elevation": 3, diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index f0aea1aec..a0b616ddc 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, @@ -79,4 +79,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index ba5dfd9f0..17ecd2be3 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -21,7 +21,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84 Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index 6077876f7..8a10822bd 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, @@ -79,4 +79,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 4f839d72b..1799f0f5f 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -39,7 +39,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike:: @ 826EBF6 Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index a488e9661..75ef7519a 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 84233313b..859a3f143 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -65,4 +65,4 @@ "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 91d70160f..c4645a46a 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -241,11 +241,11 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041 applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise waitmovement 0 playse SE_W153 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom waitmovement 0 delay 4 turnobject 1, DIR_EAST diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 58ba81aea..9c2ed8771 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 2, "elevation": 3, @@ -99,4 +99,4 @@ "script": "Route110_TrickHouseEntrance_EventScript_Door" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 0de4153cc..8557a19da 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -142,7 +142,7 @@ Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 8269C15 addobject 1 showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, DIR_EAST - turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST + turnobject OBJ_EVENT_ID_PLAYER, DIR_WEST end Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26 @@ -245,9 +245,9 @@ Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E playse SE_PIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48 waitmovement 0 compare VAR_TRICK_HOUSE_LEVEL, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk @@ -513,9 +513,9 @@ Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126 setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 special DrawWholeMapView delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom + applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom waitmovement 0 switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1 diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index f656b0a48..b4401fb64 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 20, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 2, "y": 15, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 16, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 13, "y": 18, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 14, "y": 14, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 8, "y": 10, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 12, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 4, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 13, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 6, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 4, "y": 8, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 12, "elevation": 3, @@ -244,4 +244,4 @@ "script": "Route110_TrickHousePuzzle1_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 71b3f8916..12564c224 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 10, "y": 17, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 11, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 17, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 13, "elevation": 3, @@ -151,4 +151,4 @@ "script": "Route110_TrickHousePuzzle2_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 612edc6bf..eda856ebf 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 19, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 4, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 10, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 1, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 21, "elevation": 3, @@ -177,4 +177,4 @@ "script": "Route110_TrickHousePuzzle3_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 26a58166f..c9184d01c 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 2, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 14, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 14, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 16, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 6, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 7, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 2, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, @@ -231,4 +231,4 @@ "script": "Route110_TrickHousePuzzle4_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 30f4cfe47..143c42b9c 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 17, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 0, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 14, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 14, "y": 19, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 4, "elevation": 3, @@ -313,4 +313,4 @@ "script": "Route110_TrickHousePuzzle5_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 797bb9f60..ce8877c4a 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 11, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 4, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 21, "elevation": 3, @@ -101,4 +101,4 @@ "script": "Route110_TrickHousePuzzle6_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 1e31e2f74..1c7d37c31 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 9, "y": 20, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 2, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 8, "y": 17, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 12, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 9, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 13, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 12, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 4, "y": 17, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "graphics_id": "OBJ_EVENT_GFX_TRICK_HOUSE_STATUE", "x": 4, "y": 6, "elevation": 0, @@ -273,4 +273,4 @@ "script": "Route110_TrickHousePuzzle7_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 9e4be0cfc..587007721 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 1, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 17, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 3, @@ -101,4 +101,4 @@ "script": "Route110_TrickHousePuzzle8_EventScript_Scroll" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5770ab0c0..3e3cbd2c0 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 13, "y": 114, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 13, "y": 113, "elevation": 0, @@ -57,7 +57,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 113, "elevation": 0, @@ -70,7 +70,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 13, "y": 113, "elevation": 0, @@ -83,7 +83,7 @@ "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 51, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 5, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 5, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 8, "y": 91, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 37, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 69, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 21, "y": 47, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 32, "y": 66, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 101, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 100, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 23, "y": 8, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 104, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "FLAG_ITEM_ROUTE_111_TM_37" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 5, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 54, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "FLAG_ITEM_ROUTE_111_STARDUST" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 114, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "FLAG_ITEM_ROUTE_111_HP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 22, "y": 21, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 82, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 71, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 32, "y": 29, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 11, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 27, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 20, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 20, "y": 114, "elevation": 3, @@ -473,7 +473,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 26, "y": 132, "elevation": 3, @@ -486,7 +486,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 20, "y": 132, "elevation": 3, @@ -499,7 +499,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 121, "elevation": 3, @@ -512,7 +512,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 119, "elevation": 3, @@ -525,7 +525,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 29, "y": 77, "elevation": 3, @@ -538,7 +538,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 77, "elevation": 3, @@ -551,7 +551,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 37, "y": 77, "elevation": 3, @@ -564,7 +564,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 118, "elevation": 3, @@ -577,7 +577,7 @@ "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 14, "y": 56, "elevation": 3, @@ -590,7 +590,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 20, "y": 53, "elevation": 3, @@ -603,7 +603,7 @@ "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 19, "y": 53, "elevation": 3, @@ -616,7 +616,7 @@ "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 101, "elevation": 3, @@ -1112,4 +1112,4 @@ "script": "Route111_EventScript_TrainerHillSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index b80ef6b84..2db95f0ce 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -61,11 +61,11 @@ Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2 return Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6 @@ -108,7 +108,7 @@ Route111_OnWarp: @ 81F0E46 .2byte 0 Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN end Route111_OnFrame: @ 81F0E56 @@ -124,10 +124,10 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 addobject 45 special StartPlayerDescendMirageTower waitstate - showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN + showobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH delay 16 special StartMirageTowerDisintegration waitstate @@ -225,22 +225,22 @@ Route111_EventScript_PreventRouteAccess:: @ 81F0F45 end Route111_EventScript_PushUpFromRoute:: @ 81F0F7C - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushUpFromRoute waitmovement 0 return Route111_EventScript_PushDownFromRoute:: @ 81F0F87 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushDownFromRoute waitmovement 0 return Route111_EventScript_PushLeftFromRoute:: @ 81F0F92 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushLeftFromRoute waitmovement 0 return Route111_EventScript_PushRightFromRoute:: @ 81F0F9D - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushRightFromRoute waitmovement 0 return @@ -296,7 +296,7 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7 waitmovement 0 removeobject 1 call Route111_EventScript_CloseWinstrateDoor - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor addobject 2 @@ -314,7 +314,7 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7 waitmovement 0 removeobject 2 call Route111_EventScript_CloseWinstrateDoor - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor addobject 3 @@ -332,7 +332,7 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7 waitmovement 0 removeobject 3 call Route111_EventScript_CloseWinstrateDoor - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate + applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 call Route111_EventScript_OpenWinstrateDoor addobject 4 diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 71afc39f8..dc305fbaa 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 6, "y": 3, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 640de23cb..fccf0eed4 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 4, "y": 4, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index e52468f32..b711e1b78 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 26, "y": 30, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 24, "y": 34, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 49, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 46, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 40, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 27, "y": 30, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 27, "y": 6, "elevation": 0, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 28, "y": 6, "elevation": 0, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 6, "elevation": 0, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 6, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 50, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 43, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_ITEM_ROUTE_112_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 31, "y": 7, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 31, "y": 11, "elevation": 3, @@ -284,4 +284,4 @@ "script": "Route112_EventScript_RouteSignLavaridge" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 5ed7fc4a7..50dd8ba41 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 0b0ad3dc9..63b33f264 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -20,7 +20,7 @@ Route112_CableCarStation_OnFrame: @ 822AAE9 Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3 lockall - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar + applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar applymovement 1, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar waitmovement 0 setvar VAR_CABLE_CAR_STATION_STATE, 0 @@ -43,7 +43,7 @@ Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38 msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_LeadPlayerToCableCar - applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar + applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar waitmovement 0 setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 12a7f63d9..cddfe125c 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 66, "y": 12, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 36, "y": 10, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 62, "y": 8, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 21, "y": 11, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 51, "y": 11, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 7, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 79, "y": 5, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 29, "y": 6, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 71, "y": 2, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 45, "y": 6, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 46, "y": 6, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 75, "y": 3, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 71, "y": 4, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 7, "y": 6, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -462,4 +462,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 0f57ce2b8..bd7bb4828 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 5, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 76a9083f4..4e79def6d 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 43, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 44, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 65, "elevation": 7, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 72, "elevation": 5, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 22, "y": 50, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 35, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 20, "y": 56, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 45, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 37, "elevation": 4, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 43, "elevation": 4, @@ -169,7 +169,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 19, "y": 11, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 19, "y": 12, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 27, "y": 42, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 25, "y": 6, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 19, "y": 26, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 30, "y": 58, "elevation": 5, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 53, "elevation": 5, @@ -260,7 +260,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 30, "y": 54, "elevation": 5, @@ -273,7 +273,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 22, "y": 69, "elevation": 7, @@ -286,7 +286,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 64, "elevation": 5, @@ -299,7 +299,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 24, "y": 44, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 23, "y": 44, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 20, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 26, "y": 72, "elevation": 5, @@ -351,7 +351,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 19, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 16, "elevation": 3, @@ -506,4 +506,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 7a629f44a..df373a686 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 3, "y": 2, "elevation": 3, @@ -86,4 +86,4 @@ "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index da3241ed1..6993dc911 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 3, "elevation": 3, @@ -72,4 +72,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 3bea9a501..7483b453f 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -24,7 +24,7 @@ Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53 Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66 lockall applymovement 1, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox Route114_FossilManiacsTunnel_Text_NotSafeThatWay, MSGBOX_DEFAULT setvar VAR_FOSSIL_MANIAC_STATE, 2 diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index 6709d055e..e51ec9c45 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 4, "elevation": 3, @@ -71,4 +71,4 @@ "script": "Route114_LanettesHouse_EventScript_PC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index c9f1d8833..48d8f2b22 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 68, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 15, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 27, "y": 53, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 13, "y": 5, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 5, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 50, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 19, "y": 15, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 24, "y": 62, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 60, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 18, "y": 7, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "FLAG_ITEM_ROUTE_115_TM_01" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 29, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "FLAG_ITEM_ROUTE_115_IRON" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 64, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 65, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 50, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 56, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 10, "y": 15, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 11, "y": 12, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 7, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 7, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 28, "y": 62, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 67, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_ITEM_ROUTE_115_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 14, "elevation": 3, @@ -452,4 +452,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 366fe1ed5..1888cc9f6 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 2, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 2, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 7, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 21, "y": 6, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 13, "y": 17, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 6, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "FLAG_ITEM_ROUTE_116_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 17, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "FLAG_ITEM_ROUTE_116_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 20, "y": 2, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 21, "y": 2, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 46, "y": 9, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 28, "y": 11, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 17, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 24, "y": 9, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 80, "y": 8, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_ITEM_ROUTE_116_HP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 26, "y": 6, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 22, "y": 16, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 28, "y": 8, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 46, "y": 11, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 12, "elevation": 4, @@ -286,7 +286,7 @@ "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 38, "y": 9, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 74, "y": 13, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 33, "y": 5, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 34, "y": 7, "elevation": 0, @@ -351,7 +351,7 @@ "flag": "FLAG_ITEM_ROUTE_116_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 30, "y": 5, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 36, "y": 13, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 42, "y": 13, "elevation": 3, @@ -524,4 +524,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 8dbdeb69d..2043c7c02 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -152,7 +152,7 @@ Route116_EventScript_Briney:: @ 81F2D84 Route116_EventScript_BrineyTrigger:: @ 81F2D95 lockall applymovement 11, Common_Movement_WalkInPlaceFastestRight - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index 470ccadfe..fc24704dc 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 3, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 2, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 4bb513cdf..390e7e9e5 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 13, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 25, "y": 5, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 47, "y": 4, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 33, "y": 3, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 39, "y": 4, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 42, "y": 2, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 49, "y": 2, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 38, "y": 16, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 10, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 33, "y": 11, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 41, "y": 13, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 42, "y": 13, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 43, "y": 13, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 2, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 1, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_ITEM_ROUTE_117_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 26, "y": 13, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 12, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 43, "y": 6, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 42, "y": 6, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 48, "y": 10, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 15, "y": 4, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 21, "y": 4, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 16, "y": 4, "elevation": 3, @@ -382,4 +382,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 9cb052633..7fb5ce207 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index d64adbb86..790348a62 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 5, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 5, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 37, "y": 5, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 64, "y": 10, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 12, "y": 10, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 38, "y": 8, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 8, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 12, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 14, "y": 14, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 56, "y": 7, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 39, "y": 15, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 17, "y": 11, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 44, "y": 7, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "FLAG_HIDE_ROUTE_118_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 69, "y": 7, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 7, "elevation": 3, @@ -418,4 +418,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index cccbe0085..6eb657a11 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -69,7 +69,7 @@ Route118_EventScript_RouteSign119:: @ 81F3E85 Route118_EventScript_StevenTrigger0:: @ 81F3E8E lockall setvar VAR_0x8008, 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_StevenApproachLedge0 waitmovement 0 @@ -79,7 +79,7 @@ Route118_EventScript_StevenTrigger0:: @ 81F3E8E Route118_EventScript_StevenTrigger1:: @ 81F3EAE lockall setvar VAR_0x8008, 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 goto Route118_EventScript_StevenTrigger end @@ -87,7 +87,7 @@ Route118_EventScript_StevenTrigger1:: @ 81F3EAE Route118_EventScript_StevenTrigger2:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 19, Route118_Movement_StevenApproachLedge2 waitmovement 0 @@ -113,19 +113,19 @@ Route118_EventScript_StevenTrigger:: @ 81F3EE4 end Route118_EventScript_StevenExit0:: @ 81F3F28 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit applymovement 19, Route118_Movement_StevenExit0 waitmovement 0 return Route118_EventScript_StevenExit1:: @ 81F3F3A - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit applymovement 19, Route118_Movement_StevenExit1 waitmovement 0 return Route118_EventScript_StevenExit2:: @ 81F3F4C - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit applymovement 19, Route118_Movement_StevenExit2 waitmovement 0 return diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 2d1be0635..34fb6e700 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 5, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 5, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 26, "y": 5, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 123, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 26, "y": 123, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 125, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 74, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 116, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 83, "elevation": 4, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 34, "y": 122, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 17, "y": 128, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 28, "y": 14, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 19, "y": 49, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 50, "elevation": 4, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 8, "y": 63, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 25, "y": 32, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_HIDE_ROUTE_119_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 121, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 96, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ZINC" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 76, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 18, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 117, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 33, "elevation": 4, @@ -325,7 +325,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 34, "elevation": 4, @@ -338,7 +338,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 17, "y": 33, "elevation": 4, @@ -351,7 +351,7 @@ "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 31, "y": 109, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 8, "y": 23, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 23, "elevation": 3, @@ -390,7 +390,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 90, "elevation": 3, @@ -403,7 +403,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 90, "elevation": 3, @@ -416,7 +416,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 133, "elevation": 3, @@ -429,7 +429,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 56, "elevation": 3, @@ -442,7 +442,7 @@ "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 35, "y": 93, "elevation": 4, @@ -455,7 +455,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 29, "y": 6, "elevation": 3, @@ -468,7 +468,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 31, "y": 6, "elevation": 3, @@ -481,7 +481,7 @@ "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 15, "elevation": 3, @@ -494,7 +494,7 @@ "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 104, "elevation": 3, @@ -507,7 +507,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 68, "elevation": 3, @@ -520,7 +520,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 52, "elevation": 3, @@ -533,7 +533,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 32, "y": 15, "elevation": 3, @@ -546,7 +546,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 5, "elevation": 4, @@ -559,7 +559,7 @@ "flag": "FLAG_ITEM_ROUTE_119_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 42, "elevation": 3, @@ -572,7 +572,7 @@ "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 28, "y": 25, "elevation": 3, @@ -917,4 +917,4 @@ "script": "Route119_EventScript_TrainerTipsDecoration" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 36647e931..84486b0a0 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -51,7 +51,7 @@ Route119_EventScript_RivalEncounter:: @ 81F4488 call_if_eq Route119_EventScript_RivalEnter1 compare VAR_TEMP_1, 2 call_if_eq Route119_EventScript_RivalEnter2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 @@ -207,13 +207,13 @@ Route119_EventScript_RivalEnter2:: @ 81F46D1 return Route119_EventScript_RivalExit1:: @ 81F46DC - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1 + applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1 applymovement 25, Route119_Movement_RivalExit1 waitmovement 0 return Route119_EventScript_RivalExit2:: @ 81F46EE - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2 + applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2 applymovement 25, Route119_Movement_RivalExit2 waitmovement 0 return diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index f07156653..b50c98d17 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 1, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 0, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 8, "y": 5, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 5, "y": 3, "elevation": 3, @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 626d008fc..570d803d2 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -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": 15, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 10, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 2, "y": 11, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 14, "y": 11, "elevation": 3, @@ -138,4 +138,4 @@ "script": "Route119_WeatherInstitute_1F_EventScript_Bed" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index c8048db6f..fce896243 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -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": 15, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 10, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 4, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 0, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 7, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 16, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 19, "y": 6, "elevation": 3, @@ -130,4 +130,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 0433877a5..03ec9b6f0 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -50,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 closemessage addobject 7 @ Aqua grunt applymovement 7, Route119_WeatherInstitute_2F_Movement_GruntApproachShelly - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay + applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage @@ -72,7 +72,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 removeobject 3 removeobject 8 removeobject 7 - applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition + applymovement OBJ_EVENT_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 01c267a94..35fc402cf 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 4, "y": 79, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 79, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 79, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 79, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 24, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 24, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 24, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 92, "elevation": 5, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 10, "y": 92, "elevation": 5, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 92, "elevation": 5, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 22, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 32, "y": 14, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 27, "y": 51, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 36, "y": 45, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 19, "y": 80, "elevation": 5, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 55, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "FLAG_ITEM_ROUTE_120_NUGGET" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 32, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 89, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 92, "elevation": 5, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 31, "y": 37, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 60, "elevation": 3, @@ -351,7 +351,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 6, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 34, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 13, "elevation": 3, @@ -390,7 +390,7 @@ "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 82, "elevation": 5, @@ -403,7 +403,7 @@ "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 12, "y": 16, "elevation": 4, @@ -416,7 +416,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 13, "y": 15, "elevation": 4, @@ -429,7 +429,7 @@ "flag": "FLAG_HIDE_ROUTE_120_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 20, "y": 1, "elevation": 3, @@ -442,7 +442,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 1, "elevation": 3, @@ -455,7 +455,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 10, "y": 72, "elevation": 3, @@ -468,7 +468,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 19, "y": 28, "elevation": 3, @@ -481,7 +481,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_2", "x": 12, "y": 16, "elevation": 3, @@ -494,7 +494,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 11, "elevation": 3, @@ -507,7 +507,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 27, "y": 2, "elevation": 3, @@ -520,7 +520,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 77, "elevation": 3, @@ -533,7 +533,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 7, "y": 51, "elevation": 3, @@ -546,7 +546,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 19, "y": 48, "elevation": 3, @@ -559,7 +559,7 @@ "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 19, "y": 32, "elevation": 3, @@ -572,7 +572,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 14, "y": 34, "elevation": 3, @@ -585,7 +585,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 24, "y": 33, "elevation": 3, @@ -855,4 +855,4 @@ "secret_base_id": "SECRET_BASE_SHRUB1_4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a965ff060..c5c00892a 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -234,7 +234,7 @@ Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C Route120_EventScript_StevenGiveDeconScope:: @ 81F572C applymovement 31, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE @@ -258,12 +258,12 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C end Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE - applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_ApproachKecleonWest + applymovement OBJ_EVENT_ID_PLAYER, Route120_Movement_ApproachKecleonWest waitmovement 0 return diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 9d91c47d1..b9febf9e4 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 29, "y": 14, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 2, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 2, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 16, "y": 2, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 2, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 64, "y": 14, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 65, "y": 14, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 66, "y": 14, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 67, "y": 14, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 9, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 9, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 8, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 7, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 31, "y": 7, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 5, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 65, "y": 4, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 63, "y": 5, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 55, "y": 8, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 11, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 22, "y": 5, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 10, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "FLAG_ITEM_ROUTE_121_CARBOS" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 26, "y": 12, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 6, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 59, "y": 8, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 59, "y": 13, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 65, "y": 9, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 72, "y": 9, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 60, "y": 10, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "FLAG_ITEM_ROUTE_121_REVIVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 38, "y": 13, "elevation": 3, @@ -533,4 +533,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 6cf7b5791..2365dae6c 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 17, "y": 9, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 2, "elevation": 3, @@ -105,4 +105,4 @@ "script": "Route121_SafariZoneEntrance_EventScript_TrainerTipSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 6da6396be..b1b1ad3e9 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -8,7 +8,7 @@ Route121_SafariZoneEntrance_OnFrame: @ 822BBC1 Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB lockall - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone waitmovement 0 setvar VAR_SAFARI_ZONE_STATE, 0 releaseall @@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO @@ -75,7 +75,7 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48 msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone waitmovement 0 special EnterSafariMode setvar VAR_SAFARI_ZONE_STATE, 2 @@ -111,7 +111,7 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8 Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06 closemessage hidemoneybox - applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter + applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter waitmovement 0 releaseall end diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 9dee984d9..e9d2984a2 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index fc4af6b3c..d0ae2b242 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 3, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 3, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 3, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 3, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 81, "y": 1, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 82, "y": 1, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 83, "y": 1, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 70, "y": 12, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 58, "y": 7, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 5, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 5, "elevation": 3, @@ -169,7 +169,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 5, "elevation": 3, @@ -182,7 +182,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -195,7 +195,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 3, "elevation": 3, @@ -208,7 +208,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 3, "elevation": 3, @@ -221,7 +221,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -234,7 +234,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -247,7 +247,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 101, "y": 13, "elevation": 3, @@ -260,7 +260,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 129, "y": 14, "elevation": 3, @@ -273,7 +273,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 92, "y": 9, "elevation": 3, @@ -286,7 +286,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 8, "elevation": 3, @@ -299,7 +299,7 @@ "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 108, "y": 13, "elevation": 3, @@ -312,7 +312,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 109, "y": 13, "elevation": 3, @@ -325,7 +325,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 110, "y": 13, "elevation": 3, @@ -338,7 +338,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 111, "y": 13, "elevation": 3, @@ -351,7 +351,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 18, "y": 9, "elevation": 3, @@ -364,7 +364,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 38, "y": 13, "elevation": 3, @@ -377,7 +377,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 37, "y": 13, "elevation": 3, @@ -390,7 +390,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 138, "y": 12, "elevation": 3, @@ -403,7 +403,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 49, "y": 16, "elevation": 3, @@ -416,7 +416,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 87, "y": 12, "elevation": 3, @@ -429,7 +429,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 18, "elevation": 3, @@ -442,7 +442,7 @@ "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 75, "y": 9, "elevation": 3, @@ -455,7 +455,7 @@ "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 138, "y": 14, "elevation": 3, @@ -468,7 +468,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 138, "y": 16, "elevation": 3, @@ -481,7 +481,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 87, "y": 17, "elevation": 3, @@ -494,7 +494,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 66, "y": 16, "elevation": 3, @@ -507,7 +507,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 66, "y": 19, "elevation": 3, @@ -520,7 +520,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 49, "y": 19, "elevation": 3, @@ -533,7 +533,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 43, "y": 15, "elevation": 3, @@ -546,7 +546,7 @@ "flag": "FLAG_ITEM_ROUTE_123_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 16, "elevation": 3, @@ -559,7 +559,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 14, "y": 12, "elevation": 3, @@ -572,7 +572,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 57, "y": 16, "elevation": 3, @@ -837,4 +837,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index b7f2523af..58e2d33b2 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 01bc84377..abefc1639 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -41,7 +41,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 34, "y": 25, "elevation": 1, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 61, "y": 74, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 49, "y": 45, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 7, "y": 23, "elevation": 1, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 58, "y": 58, "elevation": 1, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 12, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 53, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 11, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 44, "elevation": 1, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 17, "y": 44, "elevation": 1, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 29, "elevation": 1, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 69, "y": 74, "elevation": 1, @@ -217,4 +217,4 @@ "script": "Route124_EventScript_HuntersHouseSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index c8ec142f2..6e2288b33 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 4, "elevation": 0, @@ -55,4 +55,4 @@ "script": "Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 402c42932..9ef86eb8e 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 31, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 45, "y": 9, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 38, "y": 24, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 30, "y": 28, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 21, "y": 30, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 17, "y": 19, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 18, "y": 19, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 43, "y": 19, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 48, "y": 19, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 46, "y": 17, "elevation": 3, @@ -201,4 +201,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index db01091ac..ddb00439e 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 51, "y": 65, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 56, "y": 22, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 63, "y": 43, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 48, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 15, "y": 66, "elevation": 1, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 66, "elevation": 1, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 64, "y": 5, "elevation": 1, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 56, "y": 5, "elevation": 1, @@ -151,4 +151,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 626982ca2..1afc922cc 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -36,7 +36,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 45, "y": 42, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 68, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 6, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_ITEM_ROUTE_127_ZINC" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 39, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE_127_CARBOS" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 42, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 64, "y": 19, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 54, "y": 14, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 15, "y": 23, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 63, "y": 63, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 12, "y": 23, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 20, "elevation": 3, @@ -218,4 +218,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index a7de8ed19..b5f84e9a8 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -36,7 +36,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 35, "y": 33, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 78, "y": 24, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 40, "y": 22, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_ROUTE_128_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 37, "y": 22, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 38, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_ROUTE_128_MAXIE" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 63, "y": 28, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 47, "y": 9, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 24, "y": 8, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 101, "y": 29, "elevation": 1, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 101, "y": 22, "elevation": 1, @@ -194,4 +194,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 2ea7a5d06..68baf63ff 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -30,12 +30,12 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57 closemessage applymovement 5, Route128_Movement_MaxieApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_ArchieRunLeft - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement 5, Route128_Movement_MaxieWalkLeft waitmovement 0 msgbox Route128_Text_MaxieThisDefiesBelief, MSGBOX_DEFAULT @@ -53,12 +53,12 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57 addobject 3 applymovement 3, Route128_Movement_StevenApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_StevenWalkUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT applymovement 3, Common_Movement_WalkInPlaceFastestDown diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 6b19cc320..ac47e1918 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 28, "y": 16, "elevation": 1, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 10, "y": 14, "elevation": 1, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 13, "y": 22, "elevation": 1, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 35, "y": 9, "elevation": 1, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 13, "y": 27, "elevation": 1, @@ -99,4 +99,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index c0b92a1a5..7a29521a3 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 70, "y": 21, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 7, "y": 21, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 52, "y": 9, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 30, "elevation": 1, @@ -81,4 +81,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index af73808b6..e70aee2bc 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 41, "y": 32, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 19, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 10, "y": 22, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 31, "y": 25, "elevation": 1, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 16, "elevation": 1, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 8, "y": 16, "elevation": 1, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 20, "elevation": 1, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 52, "y": 27, "elevation": 1, @@ -141,4 +141,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 947f8d9cf..c42ff83a3 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 40, "y": 13, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 10, "y": 6, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 9, "y": 15, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 49, "y": 28, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 33, "y": 26, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 33, "y": 31, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 21, "y": 30, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 21, "y": 25, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 27, "elevation": 3, @@ -159,4 +159,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index fe492458a..a2b4ed493 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 68, "y": 27, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 13, "y": 3, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 28, "elevation": 1, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 12, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 14, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 37, "y": 15, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 56, "y": 11, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 56, "y": 15, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 48, "y": 28, "elevation": 3, @@ -159,4 +159,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index fb4da1f92..58537a53c 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 49, "y": 9, "elevation": 1, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 58, "y": 7, "elevation": 1, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 41, "y": 23, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 24, "y": 23, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 49, "y": 16, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 43, "y": 23, "elevation": 1, @@ -104,7 +104,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 24, "y": 30, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 50, "y": 16, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 63, "y": 14, "elevation": 3, @@ -143,7 +143,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 50, "y": 17, "elevation": 3, @@ -156,7 +156,7 @@ "flag": "FLAG_ITEM_ROUTE_134_CARBOS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 27, "elevation": 3, @@ -172,4 +172,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index 9c0d41709..a4dfa5b2d 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 22, "y": 34, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 13, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 25, "y": 37, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 21, "y": 46, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 45, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 26, "y": 23, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 24, "y": 51, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 25, "y": 51, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 30, "y": 10, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 13, "y": 21, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 13, "y": 34, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 51, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 19, "y": 27, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 16, "y": 50, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_RIVAL" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 11, "y": 15, "elevation": 0, @@ -226,7 +226,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 31, "y": 36, "elevation": 3, diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 04c7ea505..58c87bc05 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -34,7 +34,7 @@ RustboroCity_OnFrame: @ 81E070B RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 lockall setvar VAR_ROUTE104_STATE, 1 - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown waitmovement 0 playse SE_KAIDAN delay 10 @@ -46,7 +46,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715 waitmovement 0 applymovement 15, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 applymovement 15, RustboroCity_Movement_ScientistWalkInPlaceDown waitmovement 0 @@ -353,7 +353,7 @@ RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79 applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerFar waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -523,7 +523,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -535,7 +535,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceRight waitmovement 0 return @@ -547,7 +547,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -561,7 +561,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3 waitmovement 0 applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -631,7 +631,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -643,7 +643,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceLeft waitmovement 0 return @@ -655,7 +655,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34 waitmovement 0 applymovement 9, Common_Movement_Delay48 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -669,7 +669,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60 waitmovement 0 applymovement 9, RustboroCity_Movement_EmployeeApproachPlayerDown waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 return @@ -718,7 +718,7 @@ RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -734,7 +734,7 @@ RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -750,7 +750,7 @@ RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer2 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -766,7 +766,7 @@ RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -782,7 +782,7 @@ RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer4 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -798,7 +798,7 @@ RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer5 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -814,7 +814,7 @@ RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer6 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter @@ -830,7 +830,7 @@ RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3 waitmovement 0 applymovement 14, RustboroCity_Movement_RivalApproachPlayer7 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 goto RustboroCity_EventScript_RivalEncounter diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index a4bc47476..dc7f1df54 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 2, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 9223872b9..e790910fb 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 2, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 15, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 3, "elevation": 3, @@ -96,4 +96,4 @@ "script": "RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index b7dbdb3d5..46079c612 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 5, "elevation": 3, @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 8e0f6d2ae..aacaaaa9c 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 15, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 143ff4543..c85310fc6 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_OnWarp: @ 8212455 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F - turnobject EVENT_OBJ_ID_PLAYER, DIR_EAST + turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST end RustboroCity_DevonCorp_3F_OnFrame: @ 8212464 @@ -39,13 +39,13 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_PleaseGoAhead, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk - applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk + applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT giveitem_std ITEM_LETTER diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index a35fe32cf..d2a90e13c 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 12, "y": 4, "elevation": 3, @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index b937d323a..1f0798121 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 9, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY_DOLL", + "graphics_id": "OBJ_EVENT_GFX_SKITTY_DOLL", "x": 9, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TREECKO_DOLL", + "graphics_id": "OBJ_EVENT_GFX_TREECKO_DOLL", "x": 10, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TORCHIC_DOLL", + "graphics_id": "OBJ_EVENT_GFX_TORCHIC_DOLL", "x": 10, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MUDKIP_DOLL", + "graphics_id": "OBJ_EVENT_GFX_MUDKIP_DOLL", "x": 8, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU_DOLL", "x": 9, "y": 7, "elevation": 3, @@ -130,4 +130,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 6ca0fbd1b..b52cf5e15 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 11, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 4, "elevation": 3, @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 9667ebf92..356e12148 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 11, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 7, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index a9c1e40cd..58a875377 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_DEVON_EMPLOYEE", "x": 7, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 2, "elevation": 3, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 99ae9ebd8..ae6d66051 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "graphics_id": "OBJ_EVENT_GFX_ROXANNE", "x": 5, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 5, "y": 13, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 18, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 1, "y": 6, "elevation": 3, @@ -115,4 +115,4 @@ "script": "RustboroCity_Gym_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5d3000846..230ba1ec2 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 6, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 2, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 6dcd38ab4..8aef39d6c 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 5, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 66fa98833..80203105b 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 4, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index d56aa3095..a6d9af528 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 8, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 8, "y": 2, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index db28ddcf3..8b2aa2568 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 3, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 812cb7c02..3ce00d2e5 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index a60add1ee..7f383a7db 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 8, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "graphics_id": "OBJ_EVENT_GFX_GAMEBOY_KID", "x": 9, "y": 6, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 3, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 3, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 3, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 0, "y": 10, "elevation": 0, @@ -165,4 +165,4 @@ "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 159588113..a2f56a8b2 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 1, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 5, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 14, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 14, "y": 4, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 4, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 13, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 25, "y": 4, "elevation": 3, @@ -216,4 +216,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 9219ba3e4..30ff08c36 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -85,13 +85,13 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE end RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1 applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1 waitmovement 0 return RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -99,7 +99,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F return RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 applymovement 10, Common_Movement_WalkInPlaceFastestDown @@ -109,7 +109,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7 applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return @@ -134,7 +134,7 @@ RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4 return RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit applymovement 10, RusturfTunnel_Movement_WandaExit applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit waitmovement 0 @@ -319,7 +319,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt applymovement 6, RusturfTunnel_Movement_GruntEscape waitmovement 0 removeobject 6 @@ -327,7 +327,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 addobject 5 applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT @@ -340,7 +340,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2 waitbuttonpress waitmoncry closemessage - applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit + applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit applymovement 5, RusturfTunnel_Movement_BrineyExit applymovement 7, RusturfTunnel_Movement_PeekoExit waitmovement 0 diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 3cf4b2cd0..9cad6a32e 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 9, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 7, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 9, "y": 10, "elevation": 3, @@ -244,4 +244,4 @@ "script": "SSTidalCorridor_EventScript_Cabin4Sign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 6b88b7ae1..731b31f1f 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -201,11 +201,11 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott applymovement 5, SSTidalCorridor_Movement_ScottExit waitmovement 0 diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 45610454a..12268a861 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 7, "y": 4, "elevation": 3, @@ -61,4 +61,4 @@ "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index b2da534c3..3f7ac0f56 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 4, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 34, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 21, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 4, "y": 14, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 22, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 5, "elevation": 3, @@ -224,4 +224,4 @@ "script": "SSTidalRooms_EventScript_Bed" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 90ecec8c2..6ba1538d0 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 22, "y": 9, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 29, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 10, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 13, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 28, "y": 14, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 23, "y": 6, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 7, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 27, "y": 7, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -151,4 +151,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index d362f8de3..7df896e9e 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 8, "y": 20, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 30, "y": 22, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 35, "elevation": 0, @@ -78,7 +78,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 8, "y": 13, "elevation": 3, @@ -91,7 +91,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 9, "y": 7, "elevation": 3, @@ -104,7 +104,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 8, "y": 10, "elevation": 3, @@ -117,7 +117,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 8, "elevation": 3, @@ -130,7 +130,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 17, "elevation": 3, @@ -163,4 +163,4 @@ "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 7805c872e..de5d7cbe1 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 8, "elevation": 5, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 7, "elevation": 3, @@ -55,4 +55,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index fd9ae9dcb..50f860eca 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 8, "y": 4, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 5, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index b23420ba4..3ff301da6 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 32, "y": 34, "elevation": 4, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 26, "y": 28, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 16, "y": 6, "elevation": 5, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 15, "y": 31, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 16, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 36, "y": 17, "elevation": 3, @@ -120,4 +120,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index ed3703449..7918a9b96 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -9,7 +9,7 @@ SafariZone_South_OnFrame: @ 823D284 SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E lockall - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerEnter + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerEnter waitmovement 0 applymovement 1, SafariZone_South_Movement_ExitAttendantBlockDoor waitmovement 0 @@ -76,7 +76,7 @@ SafariZone_South_EventScript_ExitEarly:: @ 823D31A SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F applymovement 1, SafariZone_South_Movement_MoveExitAttendantNorth waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth waitmovement 0 goto SafariZone_South_EventScript_Exit end @@ -84,7 +84,7 @@ SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359 applymovement 1, SafariZone_South_Movement_MoveExitAttendantEast waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast + applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast waitmovement 0 goto SafariZone_South_EventScript_Exit end diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index f17a9acd3..9cbc9544f 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 7, "y": 7, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 20, "y": 30, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL", "x": 8, "y": 26, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 15, "elevation": 3, @@ -78,7 +78,7 @@ "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 12, "y": 16, "elevation": 3, @@ -111,4 +111,4 @@ "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 261f7f49d..3fc289025 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 22, "y": 9, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 37, "elevation": 3, @@ -72,4 +72,4 @@ "script": "SafariZone_Southwest_EventScript_RestHouseSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 5abcf9adf..c59022fd2 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index c7336476c..532145a66 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -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": 10, "y": 2, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 68cbba71d..674834269 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 8, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 15, "y": 10, "elevation": 3, @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index f402b50d0..d2bd710c9 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 8, "y": 7, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 9, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 8, "elevation": 3, @@ -151,4 +151,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 428070faf..60584d452 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 10, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 7, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 9, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 5, "y": 5, "elevation": 3, @@ -157,4 +157,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index c04e22e39..310d5d0aa 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -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": 5, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 5, "y": 12, "elevation": 3, @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index b9c85c9bf..b8aae3ad5 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 11, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 8, "elevation": 3, @@ -118,4 +118,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index 69c5330ea..0fbb31e71 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 65c103aaf..b7b8cf217 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index c1d3b6cc2..737b2d438 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 6, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 4, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 4, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 4, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 4, "elevation": 3, @@ -189,4 +189,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index e9ce6c9a0..210ef6e0d 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_1", "x": 17, "y": 38, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 9, "y": 42, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 9, "y": 42, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_M", "x": 8, "y": 41, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_MAGMA_MEMBER_F", "x": 8, "y": 42, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" }, { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_2", "x": 17, "y": 38, "elevation": 3, @@ -127,4 +127,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 43c503682..4786c7f1c 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,15 +7,15 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 setvar VAR_0x8005, 3 @ Maxie setvar VAR_0x8006, 4 @ Magma grunt 1 setvar VAR_0x8007, 5 @ Magma grunt 2 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 waitmovement 0 playbgm MUS_AQA_0, 0 msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer waitmovement 0 @@ -45,7 +45,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 playse SE_TAMA special DoOrbEffect applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 removeobject 7 @ sleeping Kyogre @@ -79,7 +79,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 setvar VAR_0x8007, 5 msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SeafloorCavern_Room9_Text_ArchieAMessageFromOutside, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index 4549a1bbd..4b78bdae0 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -98,4 +98,4 @@ "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index 54a10ee70..d8e8f45b6 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -258,4 +258,4 @@ "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8ac45a147..c9acb1165 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 4, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 1e8cf98fd..5f68519cb 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index d057ade30..6139d2ccf 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 4cdb8de60..56bf17c4f 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 13, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 39d7d3d92..787a0727c 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index d268e604a..9901de136 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 11, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index f1a4f656c..0d0fead22 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 80199de73..182adcb29 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index b485575b3..943495040 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 4, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index fb2dd3da3..fd1fc6d6c 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index ac1b8c103..5ec00b438 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 12, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index b3f5998f2..eebddf75d 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index b43accd3c..b476f4b9c 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 86590e0c3..fd7235b00 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 13, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index ac14a8e45..b3d0a72e6 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index c8b86decb..cd50b84ce 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 7, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 93f119a92..f37b0c5e9 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 96a4fc7f7..14fc7658e 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 89fd3cf49..24951d864 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 2, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index da6c9e727..1c35f9249 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 10, "y": 9, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index e8ebdd91a..10f137141 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 9eb60caab..7653c0443 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 1, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 567255385..d0e2dd658 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 5, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 26a3873fc..868a638a1 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -16,7 +16,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 8, "elevation": 3, @@ -29,7 +29,7 @@ "flag": "FLAG_DECORATION_0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -42,7 +42,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -55,7 +55,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -68,7 +68,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -81,7 +81,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -94,7 +94,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -107,7 +107,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -120,7 +120,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -133,7 +133,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -146,7 +146,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -159,7 +159,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -172,7 +172,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -185,7 +185,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -198,7 +198,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 046fe4966..5da56ae2a 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index ff2231d67..43bafd0bf 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 984537594..0d434e298 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 18, "y": 15, "elevation": 3, @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index d2f69b51f..9bd02803c 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 21, "elevation": 4, @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 5bc7ef756..7ea708ed9 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 14, "elevation": 5, @@ -137,4 +137,4 @@ "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 6e8cbe8c9..43b88c8cc 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 25, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 4, "elevation": 3, @@ -82,4 +82,4 @@ "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 7280cf140..98093ccda 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -55,4 +55,4 @@ "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index 3d1fbf51a..82dbd2934 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 1e543db40..9eb0a0406 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 56a85256f..09d4c4e43 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index babc00f6c..4cbc4bca4 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 233e86dfe..1ad291768 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 379d6fcfb..a829a62d1 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 4c401ccf9..59f58f9b5 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 13, "y": 7, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 49fdc6b9a..4adac68a7 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_WallaceApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT closemessage @@ -50,7 +50,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 delay 40 msgbox SkyPillar_Outside_Text_EarthquakeNotMomentToWaste, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar + applymovement OBJ_EVENT_ID_PLAYER, SkyPillar_Outside_Movement_PlayerClimbSkyPillar applymovement 1, SkyPillar_Outside_Movement_WallaceClimbSkyPillar waitmovement 0 setvar VAR_0x8004, 1 @ vertical pan diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index eba1eff39..cc8d7e4b2 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2", "x": 14, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" }, { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_1", "x": 14, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index e12919082..ecca9e5f6 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -94,10 +94,10 @@ SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A lockall fadeoutbgm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanUp + applymovement OBJ_EVENT_ID_CAMERA, SkyPillar_Top_Movement_CameraPanUp waitmovement 0 special RemoveCameraObject applymovement 1, SkyPillar_Top_Movement_RayquazaStir @@ -127,7 +127,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A delay 20 fadeinbgm 1 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SkyPillar_Top_Movement_CameraPanDown + applymovement OBJ_EVENT_ID_CAMERA, SkyPillar_Top_Movement_CameraPanDown waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 5 diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 53c482597..51c632196 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -31,7 +31,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 11, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 34, "y": 29, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "graphics_id": "OBJ_EVENT_GFX_RICH_BOY", "x": 5, "y": 13, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 26, "y": 29, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F", "x": 31, "y": 27, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 5, "y": 43, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 37, "elevation": 3, @@ -122,7 +122,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 42, "elevation": 3, @@ -135,7 +135,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 29, "y": 13, "elevation": 3, @@ -148,7 +148,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 28, "y": 14, "elevation": 3, @@ -161,7 +161,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 28, "y": 13, "elevation": 3, @@ -174,7 +174,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 37, "y": 41, "elevation": 3, @@ -187,7 +187,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 28, "y": 46, "elevation": 3, @@ -200,7 +200,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 9, "y": 50, "elevation": 3, @@ -213,7 +213,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 16, "y": 46, "elevation": 3, @@ -226,7 +226,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 24, "elevation": 3, @@ -239,7 +239,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 15, "y": 31, "elevation": 3, @@ -252,7 +252,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 30, "y": 27, "elevation": 3, @@ -265,7 +265,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 29, "y": 27, "elevation": 3, @@ -278,7 +278,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 38, "elevation": 3, @@ -291,7 +291,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 5, "y": 51, "elevation": 3, @@ -304,7 +304,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 34, "y": 51, "elevation": 3, @@ -317,7 +317,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 47, "elevation": 3, @@ -330,7 +330,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 11, "y": 47, "elevation": 3, @@ -343,7 +343,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 5, "y": 47, "elevation": 3, @@ -356,7 +356,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 22, "y": 27, "elevation": 3, @@ -369,7 +369,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 23, "y": 27, "elevation": 3, @@ -382,7 +382,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 24, "y": 27, "elevation": 3, @@ -395,7 +395,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 21, "y": 26, "elevation": 3, @@ -408,7 +408,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 20, "y": 26, "elevation": 3, @@ -421,7 +421,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 26, "y": 27, "elevation": 3, @@ -434,7 +434,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 28, "y": 27, "elevation": 3, @@ -447,7 +447,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 25, "y": 27, "elevation": 3, @@ -460,7 +460,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 11, "y": 37, "elevation": 3, @@ -473,7 +473,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 10, "y": 12, "elevation": 0, @@ -682,4 +682,4 @@ "script": "SlateportCity_EventScript_BerryCrushRankingsSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 9f951e83d..50fd39f8f 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -56,7 +56,7 @@ SlateportCity_OnFrame: @ 81DCD12 SlateportCity_EventScript_ScottScene:: @ 81DCD1C lockall addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott applymovement 35, SlateportCity_Movement_ScottApproachPlayer waitmovement 0 msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT @@ -572,7 +572,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 waitmovement 0 delay 25 applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern applymovement 10, SlateportCity_Movement_GabbyExit applymovement 9, SlateportCity_Movement_TyExit waitmovement 0 @@ -604,7 +604,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8 msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_SternEnterHarbor - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor waitmovement 0 removeobject 11 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN @@ -888,19 +888,19 @@ SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 opendoor 10, 12 waitdooranim addobject 35 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PushPlayerDown applymovement 35, SlateportCity_Movement_ScottExitBattleTent waitmovement 0 closedoor 10, 12 waitdooranim msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent waitmovement 0 removeobject 35 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index e39f04363..b4c0723a2 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 8, "elevation": 3, @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 541dc3aae..e7f846f48 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -17,11 +17,11 @@ SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 return SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A @@ -30,7 +30,7 @@ SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_EventScript_2099A4:: @ 82099A4 setvar VAR_TEMP_1, 1 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM hideobjectat 2, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM end diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index eea0cac80..b5264bd8d 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 493fd3f69..b748d036b 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B turnobject 1, DIR_SOUTH SlateportCity_BattleTentCorridor_EventScript_208E56:: @ 8208E56 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B @@ -27,7 +27,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 goto_if_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_TEMP_0, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 compare VAR_0x8006, 2 goto_if_eq SlateportCity_BattleTentCorridor_EventScript_209044 @@ -45,7 +45,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 opendoor 2, 1 waitdooranim applymovement 1, SlateportCity_BattleTentCorridor_Movement_209068 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentCorridor_Movement_20905E waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 45783e2c9..6fa2b3648 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 1, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 8, "elevation": 3, @@ -107,4 +107,4 @@ "script": "SlateportCity_BattleTentLobby_EventScript_208A99" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 1a9801dd1..91339775b 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ SlateportCity_BattleTentLobby_MapScript2_20873B: @ 820873B SlateportCity_BattleTentLobby_EventScript_208745:: @ 8208745 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end SlateportCity_BattleTentLobby_MapScript2_20874F: @ 820874F @@ -139,12 +139,12 @@ SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 applymovement 1, SlateportCity_BattleTentLobby_Movement_2089F8 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_2089FF waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, SlateportCity_BattleTentLobby_Movement_2089FC - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_208A03 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index c9aaf1d7a..e177aa524 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 12, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 7, "y": 10, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 8, "y": 10, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 7, "y": 9, "elevation": 1, @@ -188,4 +188,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 1abb66b57..3292d05c2 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -42,7 +42,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3 SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF lockall setvar VAR_0x8008, 3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp waitmovement 0 goto SlateportCity_Harbor_EventScript_AquaEscapeScene end @@ -51,7 +51,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5 applymovement 7, Common_Movement_WalkInPlaceFastestDown waitmovement 0 applymovement 6, Common_Movement_WalkInPlaceFastestDown - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT closemessage @@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5 SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89 applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 return SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3 applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -237,7 +237,7 @@ SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9 compare VAR_FACING, DIR_EAST call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast delay 30 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY setvar VAR_0x8004, 5 call Common_EventScript_FerryDepart return @@ -248,12 +248,12 @@ SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D end SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast waitmovement 0 return SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth waitmovement 0 return diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index 9052e19b1..49fbaf776 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 4, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index ca1c23717..cefd90a06 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 5, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index 1e464b9fd..f9f722ea1 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 7, "y": 5, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 87fc0f6ee..5d202f586 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -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, @@ -346,4 +346,4 @@ "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index a6e6541da..3c6298fac 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -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 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 0c45541e4..84dafc211 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 6, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 1, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M", "x": 6, "y": 1, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 12, "y": 7, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 9, "y": 6, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 1, "y": 3, "elevation": 3, @@ -286,4 +286,4 @@ "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 9facd0937..cc0a79e63 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 fadescreen 0 delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_DEVON_GOODS @@ -96,7 +96,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C return SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -106,12 +106,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D return SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3 - applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest + applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest waitmovement 0 return diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 4f8cefda9..61afb6086 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 10, "y": 7, "elevation": 3, @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 74cccebf0..76e9e5119 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 5e0e0616c..80ec71120 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 4, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 1, "y": 5, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 5, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2", "x": 3, "y": 9, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 8, "y": 3, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 10, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 8, "elevation": 0, @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index d5d8fce4e..67cf579a8 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 11, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 78b39989f..d348d6710 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 9, "elevation": 3, @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 946206347..8ba0f2935 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -15,7 +15,7 @@ "connections": [], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 31, "y": 18, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 47, "y": 33, "elevation": 0, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 9, "y": 43, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "graphics_id": "OBJ_EVENT_GFX_NINJA_BOY", "x": 51, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 43, "y": 26, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 20, "y": 36, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 49, "y": 34, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_3", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_3", "x": 28, "y": 44, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" }, { - "graphics_id": "EVENT_OBJ_GFX_KYOGRE_3", + "graphics_id": "OBJ_EVENT_GFX_KYOGRE_3", "x": 34, "y": 44, "elevation": 1, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" }, { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA_2", "x": 31, "y": 41, "elevation": 1, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 44, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 14, "y": 42, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 17, "y": 40, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 19, "y": 37, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "graphics_id": "OBJ_EVENT_GFX_MAXIE", "x": 29, "y": 33, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" }, { - "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "graphics_id": "OBJ_EVENT_GFX_ARCHIE", "x": 31, "y": 33, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 31, "y": 18, "elevation": 3, @@ -393,4 +393,4 @@ "script": "SootopolisCity_EventScript_CitySign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index faec31717..a1e830913 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -179,11 +179,11 @@ SootopolisCity_EventScript_PlayerFaceLegendaries:: @ 81E58E5 end SootopolisCity_EventScript_PlayerFaceLegendaries1:: @ 81E58FC - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH return SootopolisCity_EventScript_PlayerFaceLegendaries2:: @ 81E5901 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_SKY_PILLAR_STATE, 3 return @@ -210,7 +210,7 @@ SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926 SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter waitmovement 0 special RemoveCameraObject delay 60 @@ -269,7 +269,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 special SpawnCameraObject applymovement 10, SootopolisCity_Movement_KyogreIdle applymovement 9, SootopolisCity_Movement_GroudonIdle - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 2 @@ -310,7 +310,7 @@ SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75 SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive waitmovement 0 special RemoveCameraObject delay 60 @@ -369,7 +369,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 special SpawnCameraObject applymovement 10, SootopolisCity_Movement_KyogreIdle applymovement 9, SootopolisCity_Movement_GroudonIdle - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToDive + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanBackToDive waitmovement 0 special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 2 @@ -501,7 +501,7 @@ SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter waitmovement 0 special RemoveCameraObject delay 60 @@ -515,7 +515,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E waitstate playse SE_T_KAMI special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -554,7 +554,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE delay 60 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive waitmovement 0 special RemoveCameraObject delay 60 @@ -567,8 +567,8 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE special Script_DoRayquazaScene waitstate special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries + applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries waitmovement 0 waitse playmoncry SPECIES_RAYQUAZA, 2 @@ -972,18 +972,18 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_StevenWalkToCaveOfOrigin - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin waitmovement 0 delay 120 applymovement 1, SootopolisCity_Movement_ExpertMoveAside waitmovement 0 applymovement 7, SootopolisCity_Movement_StevenArriveCaveEntrance - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance waitmovement 0 msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT closemessage setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin waitmovement 0 warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 waitstate @@ -991,13 +991,13 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: @ 81E6243 applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest waitmovement 0 return SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: @ 81E6255 applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth waitmovement 0 return diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 9726e98aa..348980c33 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_JUAN", + "graphics_id": "OBJ_EVENT_GFX_JUAN", "x": 8, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 24, "elevation": 3, @@ -83,4 +83,4 @@ "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index c45509225..a6b2a4a38 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -70,7 +70,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15 SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 0af53d062..d054900c9 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 17, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 19, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 12, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 9, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 7, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 7, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 13, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 10, "y": 13, "elevation": 3, @@ -156,4 +156,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index bd1488d14..c89d6f0ac 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 2, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index ae30df6c6..ce984afdd 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 3, "y": 3, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index b87274eee..d7e83db4a 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 586c88e90..07ef5e1c1 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 5, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 3, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index fcfce0abb..d3fc71139 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 3, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index bd7e23882..3e9e1d4f8 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 3, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 497b36bba..bc29c4582 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 5, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 1, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index bf19b4e03..1d0c3d2c2 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 2, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, @@ -76,4 +76,4 @@ "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 9d8ef277d..5889a6b38 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 5, "elevation": 3, @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 014a07dde..32b496a49 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN", "x": 6, "y": 4, "elevation": 0, @@ -53,4 +53,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 043d9ad82..6b0e42148 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -31,12 +31,12 @@ SootopolisCity_MysteryEventsHouse_1F_OnFrame: @ 822799D SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: @ 82279B7 lockall - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs waitmovement 0 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer waitmovement 0 copyobjectxytoperm 1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment @@ -133,19 +133,19 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth:: @ 8227AFE applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast:: @ 8227B10 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast waitmovement 0 return SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest:: @ 8227B22 applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest waitmovement 0 return diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index dbb651a44..417491579 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 9699eb5e8..8ba872465 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -13,7 +13,7 @@ SootopolisCity_MysteryEventsHouse_B1F_OnFrame: @ 8227E5E SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227E68 lockall - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement waitmovement 0 special CopyEReaderTrainerGreeting msgbox gStringVar4, MSGBOX_DEFAULT @@ -30,7 +30,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227 call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost closemessage special HealPlayerParty - applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement + applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement waitmovement 0 special LoadPlayerParty setvar VAR_TEMP_1, 1 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index 4a5eec747..8cd7bb421 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 2, "y": 3, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 6c00e8e21..f8a60dee5 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index cf8be2227..7be0fe2d0 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 23, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 25, "elevation": 1, @@ -68,4 +68,4 @@ "script": "SouthernIsland_Exterior_EventScript_Sign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 17ff25fdb..e47cbc8f1 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -31,12 +31,12 @@ SouthernIsland_Exterior_EventScript_AsYouLike:: @ 8242A17 end Ferry_EventScript_DepartIslandSouth:: @ 8242A21 - applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth + applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth waitmovement 0 return Ferry_EventScript_DepartIslandWest:: @ 8242A2C - applymovement EVENT_OBJ_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest + applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest waitmovement 0 return diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index a647076ba..1fe53d807 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 12, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 2, "elevation": 0, @@ -68,4 +68,4 @@ "script": "SouthernIsland_Interior_EventScript_TryLatiEncounter" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 7a2a04771..78f468dbe 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -23,12 +23,12 @@ SouthernIsland_Interior_OnTransition: @ 8242A6E end SouthernIsland_Interior_EventScript_SetUpLatios:: @ 8242A8A - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIOS setvar VAR_TEMP_4, SPECIES_LATIOS return SouthernIsland_Interior_EventScript_SetUpLatias:: @ 8242A95 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIAS setvar VAR_TEMP_4, SPECIES_LATIAS return @@ -41,11 +41,11 @@ SouthernIsland_Interior_EventScript_SetUpPlayerGfx:: @ 8242AA0 end SouthernIsland_Interior_EventScript_SetBrendanGfx:: @ 8242AB8 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_SetMayGfx:: @ 8242ABE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_TryLatiEncounter:: @ 8242AC4 @@ -62,7 +62,7 @@ SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0 setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS setflag FLAG_TEMP_2 special SpawnCameraObject - applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp + applymovement OBJ_EVENT_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp waitmovement 0 delay 50 waitse @@ -71,7 +71,7 @@ SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0 waitmoncry addobject 2 delay 30 - applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown + applymovement OBJ_EVENT_ID_CAMERA, SouthernIsland_Interior_Movement_CameraPanDown applymovement 2, SouthernIsland_Interior_Movement_LatiApproach waitmovement 0 delay 50 diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 56ede87aa..69c6d9991 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "graphics_id": "OBJ_EVENT_GFX_GROUDON_1", "x": 17, "y": 22, "elevation": 1, @@ -49,4 +49,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 5f7f7a7f5..46af23e87 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -25,7 +25,7 @@ TerraCave_End_EventScript_ShowGroudon:: @ 823B0E3 TerraCave_End_EventScript_Groudon:: @ 823B0EC lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 applymovement 1, TerraCave_End_Movement_GroudonApproach waitmovement 0 diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json index 8ca5c69df..f741c7040 100644 --- a/data/maps/TerraCave_Entrance/map.json +++ b/data/maps/TerraCave_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 98e7d46c1..f77f7e8ee 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, @@ -65,4 +65,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 77c8ee094..9dd32783c 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index a10f68baf..4c4dbb5f6 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index dfaa57f59..c3225ef6e 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index 01f20a8f7..fd208e012 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 07cdaa80d..4bad78219 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 6, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index 498f7a3c0..c31056ad3 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -10,7 +10,7 @@ TrainerHill_Elevator_EventScript_Attendant:: @ 826935F end TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof waitmovement 0 releaseall warp MAP_TRAINER_HILL_ROOF, 255, 15, 5 @@ -18,7 +18,7 @@ TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360 end TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant waitmovement 0 applymovement 1, TrainerHill_Elevator_Movement_AttendantFacePlayer waitmovement 0 @@ -29,11 +29,11 @@ TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375 releaseall applymovement 1, TrainerHill_Elevator_Movement_AttendantFaceDown waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator waitmovement 0 call TrainerHill_Elevator_EventScript_MoveElevator delay 25 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator waitmovement 0 warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8 waitstate diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index f581988b6..a7fe36b20 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 11, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 14, "y": 9, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 5, "y": 14, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 14, "y": 15, "elevation": 3, @@ -124,4 +124,4 @@ "script": "TrainerHill_Entrance_EventScript_Records" } ] -}
\ No newline at end of file +} diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 0e8d28c1d..15aecc9d9 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -21,15 +21,15 @@ TrainerHill_Entrance_OnResume: @ 82680D0 trainerhill_clearresult compare VAR_RESULT, 0 @ VAR_RESULT always 0 here goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant - setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6 - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6 + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant end TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF trainerhill_getwon compare VAR_RESULT, TRUE goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant end TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A @@ -60,7 +60,7 @@ TrainerHill_Entrance_OnFrame: @ 826813E TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160 lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator waitmovement 0 setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1 special DrawWholeMapView @@ -80,17 +80,17 @@ TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182 TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5 lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_PlayerExitChallenge TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA closemessage - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter waitmovement 0 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special HealPlayerParty @@ -123,7 +123,7 @@ TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227 TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229 lockall - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT trainerhill_getsaved @@ -171,7 +171,7 @@ TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314 setvar VAR_TEMP_5, 0 msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end @@ -194,7 +194,7 @@ TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C TrainerHill_Entrance_EventScript_Closed:: @ 826836A msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter + applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter waitmovement 0 releaseall end diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 280494788..716f35d9d 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 7, "elevation": 3, @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index d7a111ad7..c56a74b68 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -85,4 +85,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index e8a9778ec..aeebd4df7 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -106,4 +106,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 7e007534c..6d6f35666 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -81,4 +81,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index 2fbc47a17..bbe09e5d9 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -53,4 +53,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json index 01f1b531a..a74808675 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater5/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json index 75be81192..4647edaf8 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater6/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json index cd8dc4fde..3801c2c86 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater7/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index 6b491e98c..b4b15bc98 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index 208dffaae..54e11075b 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index 34bd71325..d03bf9948 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 4, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 4, "elevation": 3, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index e71a7bc5c..624a763c9 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -34,4 +34,4 @@ "script": "Underwater_SealedChamber_EventScript_Braille" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index e8e75e024..b2b6b2804 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 4c7b487fb..ca2283267 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE", + "graphics_id": "OBJ_EVENT_GFX_UNION_ROOM_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index bcad9e1d7..c767b7ebf 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index 4a6708006..837148655 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index da7f875b3..b70b755b3 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index 8d5b033db..d870cb7ea 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index 89c95c51b..1db8019c9 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index 3e2878962..d9c30d003 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index e3fa08b03..b6c5af9f1 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -26,7 +26,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 17, "elevation": 3, @@ -39,7 +39,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TWIN", + "graphics_id": "OBJ_EVENT_GFX_TWIN", "x": 9, "y": 2, "elevation": 3, @@ -52,7 +52,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 11, "elevation": 3, @@ -65,7 +65,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 6, "elevation": 3, @@ -196,4 +196,4 @@ "script": "VerdanturfTown_EventScript_RusturfTunnelSign" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index 2722518eb..4737004ed 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 8, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 1, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 2, "y": 4, "elevation": 0, @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 5ef8100cc..1eb03b95e 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -17,13 +17,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 return VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E @@ -135,7 +135,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20254B:: @ 820254B hideobjectat 1, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 setvar VAR_TEMP_1, 1 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_202573 removeobject 2 end diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 157745914..ea26e7dda 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 2, "y": 6, "elevation": 3, @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index 907ef3fd6..719c99d1d 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -10,12 +10,12 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A lockall setvar VAR_TEMP_0, 1 applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020DE - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020DE waitmovement 0 opendoor 2, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentCorridor_Movement_2020E4 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentCorridor_Movement_2020E3 waitmovement 0 closedoor 2, 1 waitdooranim diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index 2a5660271..ec3dd904d 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 6, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 0, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 9, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "graphics_id": "OBJ_EVENT_GFX_SCOTT", "x": 12, "y": 6, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 8, "elevation": 3, @@ -120,4 +120,4 @@ "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 6add7d182..10ff69e50 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -9,7 +9,7 @@ VerdanturfTown_BattleTentLobby_MapScript2_2016DB: @ 82016DB VerdanturfTown_BattleTentLobby_EventScript_2016E5:: @ 82016E5 setvar VAR_TEMP_1, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end VerdanturfTown_BattleTentLobby_MapScript2_2016EF: @ 82016EF @@ -198,12 +198,12 @@ VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A70 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A70 waitmovement 0 opendoor 6, 1 waitdooranim applymovement 1, VerdanturfTown_BattleTentLobby_Movement_201A74 - applymovement EVENT_OBJ_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 + applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_201A77 waitmovement 0 closedoor 6, 1 waitdooranim diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index fa620e682..092493624 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 3, "y": 4, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index f50e62a4e..554d5012d 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 702a70f3d..58832dbb2 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_F", "x": 8, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 2, "elevation": 3, @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 056e82ed1..aa809fc1e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "graphics_id": "OBJ_EVENT_GFX_EXPERT_M", "x": 12, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY", "x": 10, "y": 6, "elevation": 3, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index 26f0d3aaa..c8c835265 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 0, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 2, "y": 2, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "graphics_id": "OBJ_EVENT_GFX_MYSTERY_GIFT_MAN", "x": 1, "y": 2, "elevation": 0, @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index c09a61274..fd9dd90b2 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 14, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_M", "x": 7, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" }, { - "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "graphics_id": "OBJ_EVENT_GFX_POKEFAN_F", "x": 2, "y": 4, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d76915648..f11a88e8c 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 33, "y": 22, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 15, "elevation": 4, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 27, "y": 34, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 12, "y": 25, "elevation": 4, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 26, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 39, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 9, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 29, "y": 17, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 32, "y": 17, "elevation": 3, @@ -199,4 +199,4 @@ "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 6536be934..eb0d16144 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8 end VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 3241c1364..db92808fd 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 5, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 4, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 10, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 26, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 25, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 6, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 4, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 12, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 25, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 21, "y": 26, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 34, "y": 4, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 37, "y": 12, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 26, "y": 16, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 21, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 34, "y": 3, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 8, "elevation": 4, @@ -249,7 +249,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 3, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 14, "y": 16, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 20, "elevation": 3, @@ -341,4 +341,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index d78339b52..ed87a231c 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -15,7 +15,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 15, "y": 6, "elevation": 3, @@ -28,7 +28,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 43, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 17, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 35, "y": 22, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 8, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 25, "y": 18, "elevation": 4, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 25, "y": 21, "elevation": 4, @@ -155,4 +155,4 @@ "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL" } ] -}
\ No newline at end of file +} diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 521cc5e03..585166dda 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -688,4 +688,4 @@ "BattleFrontier_OutsideWest", "BattleFrontier_OutsideEast" ] -}
\ No newline at end of file +} diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index a0f0f6618..059a4f1ce 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -46,8 +46,8 @@ BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE .2byte 0 BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST pike_getroomtype compare VAR_RESULT, PIKE_ROOM_STATUS goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35 @@ -59,17 +59,17 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 82C3EE8 goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F35:: @ 82C3F35 setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end BattleFrontier_BattlePikeRoomNormal_EventScript_2C3F3F:: @ 82C3F3F setvar VAR_TEMP_4, 1 - turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL end @@ -110,7 +110,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F end BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 255, 4, 7 @@ -118,7 +118,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030 end BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 255, 4, 19 @@ -180,14 +180,14 @@ BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136 return BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144 - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7 return BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C - applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer waitmovement 0 call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 1d0862a65..eecd08273 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -682,7 +682,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 - special SpawnLinkPartnerEventObject + special SpawnLinkPartnerObjectEvent goto BerryBlender_EventScript_LinkPlayersArrived end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6b2da5ccb..354aa045e 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ BerryTreeScript:: @ 82742F9 - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData switch VAR_0x8004 case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil @@ -54,7 +54,7 @@ BerryTree_EventScript_CancelPlanting:: @ 82743AF BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 lockall - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString message BerryTree_Text_BerryGrowthStage1 waitmessage waitbuttonpress @@ -62,7 +62,7 @@ BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage2 waitmessage waitbuttonpress @@ -70,7 +70,7 @@ BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage3 waitmessage waitbuttonpress @@ -79,14 +79,14 @@ BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 BerryTree_EventScript_CheckBerryStage4:: @ 82743E1 call BerryTree_EventScript_GetCareAdverb lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage4 waitmessage waitbuttonpress goto BerryTree_EventScript_WantToWater @ VAR_0x8005 here is the number of times watered -@ Buffered by EventObjectInteractionGetBerryTreeData +@ Buffered by ObjectEventInteractionGetBerryTreeData BerryTree_EventScript_GetCareAdverb:: @ 82743F6 compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_SetAdverbPoor @@ -108,7 +108,7 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock faceplayer - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_PickBerry @@ -116,11 +116,11 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 goto_if_eq BerryTree_EventScript_CancelPickingBerry BerryTree_EventScript_PickBerry:: @ 8274448 - special EventObjectInteractionPickBerryTree + special ObjectEventInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_BerryPocketFull special IncrementDailyPickedBerries - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry playfanfare MUS_ME_KINOMI waitmessage @@ -148,7 +148,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479 BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call BerryTree_EventScript_PlantBerry releaseall end @@ -157,7 +157,7 @@ BerryTree_EventScript_WantToWater:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 goto_if_eq BerryTree_EventScript_DontWater - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_WaterBerry @@ -169,13 +169,13 @@ BerryTree_EventScript_DontWater:: @ 82744BE end BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0 - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall BerryTree_EventScript_WaterBerry:: @ 82744C4 - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_WateredTheBerry waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message BerryTree_Text_PlantIsDelighted @@ -185,10 +185,10 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 end BerryTree_EventScript_PlantBerry:: @ 82744DD - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES special IncrementDailyPlantedBerries - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry waitmessage waitbuttonpress diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f37596961..e4e0f0ffd 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -154,7 +154,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 @@ -175,7 +175,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 @@ -195,7 +195,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_ExitRecordCornerRet @@ -218,7 +218,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84 setvar VAR_CABLE_CLUB_STATE, 0 compare VAR_0x8007, 0 goto_if_eq CableClub_EventScript_PlayerExitLinkRoom - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerFaceAttendantRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceLeft waitmovement 0 @@ -232,24 +232,24 @@ CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE delay 60 message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 applymovement VAR_0x8007, Movement_AttendantFaceDown waitmovement 0 return CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerExitLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return CableClub_EventScript_Tutorial:: @ 8276DE0 lockall - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, CableClub_Movement_PlayerApproachCounter + applymovement OBJ_EVENT_ID_PLAYER, CableClub_Movement_PlayerApproachCounter waitmovement 0 delay 30 msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT @@ -377,13 +377,13 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -397,7 +397,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD @ Unused CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomRight + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return @@ -482,13 +482,13 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -557,13 +557,13 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -959,13 +959,13 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 5, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim special Script_ResetUnionRoomTrade @@ -1290,13 +1290,13 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft waitmovement 0 opendoor 9, 1 waitdooranim - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterLinkRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY closedoor 9, 1 waitdooranim release @@ -1486,9 +1486,9 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 closemessage - applymovement EVENT_OBJ_ID_PLAYER, Movement_PlayerEnterMinigameRoom + applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom waitmovement 0 - hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY + hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY release waitstate end diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 7f0dd5534..b55c932ee 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -9,7 +9,7 @@ CaveHole_FixCrackedGround: @ 82A8331 EventScript_FallDownHole:: @ 82A8337 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible + applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 @@ -20,7 +20,7 @@ EventScript_FallDownHole:: @ 82A8337 EventScript_FallDownHoleMtPyre:: @ 82A8350 lockall delay 20 - applymovement EVENT_OBJ_ID_PLAYER, Movement_SetInvisible + applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 playse SE_RU_HYUU delay 60 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index cabf923b6..586f5af83 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -490,7 +490,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5 @ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience @ The number of hearts to try to display is based on the condition of the presented pokemon and the rank @ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart -@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects +@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual object events @ and are set to 9 if they havent displayed a heart yet, and 1 if they have ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F special GetContestMonCondition diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index e7aada698..3b395de21 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -1,5 +1,5 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay32 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32 waitmovement 0 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0 @@ -18,7 +18,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8 return PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp6 + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6 waitmovement 0 playse SE_TRACK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 456f56f45..98faa4748 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -210,7 +210,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 GabbyAndTy_EventScript_FirstInterview:: @ 828CF56 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, DIR_NORTH call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH @@ -241,7 +241,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1 GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, DIR_NORTH call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 1b706e603..9e9b23c04 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -13,19 +13,19 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704 msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 releaseall end PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return @@ -37,7 +37,7 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765 msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor waitmovement 0 releaseall end @@ -78,7 +78,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF addobject VAR_0x8008 applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage @@ -91,7 +91,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F addobject VAR_0x8008 applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage @@ -152,17 +152,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight waitmovement 0 call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale waitmovement 0 playbgm MUS_INTER_V, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale waitmovement 0 call PlayersHouse_1F_EventScript_WatchGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT @@ -177,17 +177,17 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale waitmovement 0 playbgm MUS_INTER_V, 0 msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale waitmovement 0 call PlayersHouse_1F_EventScript_WatchGymBroadcast - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT @@ -209,7 +209,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B return PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm @@ -549,38 +549,38 @@ PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1 return PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale waitmovement 0 return PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale waitmovement 0 return PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale waitmovement 0 return PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale waitmovement 0 return PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 - applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale + applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale waitmovement 0 applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight waitmovement 0 @@ -589,14 +589,14 @@ PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33 PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48 applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return @@ -613,14 +613,14 @@ PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88 applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 return PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft + applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc index 60bd1a337..a8ead6497 100644 --- a/data/scripts/rival_graphics.inc +++ b/data/scripts/rival_graphics.inc @@ -7,11 +7,11 @@ Common_EventScript_SetupRivalGfxId:: @ 8271ED7 end EventScript_SetupRivalGfxIdFemale:: @ 8271EEF - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return EventScript_SetupRivalGfxIdMale:: @ 8271EF5 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB @@ -23,11 +23,11 @@ Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB end EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE return EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE return @ Unused @@ -40,9 +40,9 @@ Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F end EventScript_SetupRivalGfxIdMale2:: @ 8271F37 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 617b19b42..e92c419dc 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B end SecretBase_EventScript_FirstEntrance:: @ 8275B81 - applymovement EVENT_OBJ_ID_PLAYER, SecretBase_Movement_275BB4 + applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4 waitmovement 0 setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO diff --git a/data/specials.inc b/data/specials.inc index be9761c03..cd2df1ae0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64 def_special sub_80B3254 def_special TryBerryBlenderLinkup def_special GetLinkPartnerNames - def_special SpawnLinkPartnerEventObject + def_special SpawnLinkPartnerObjectEvent def_special SavePlayerParty def_special LoadPlayerParty def_special ChooseHalfPartyForBattle def_special Script_ShowLinkTrainerCard - def_special EventObjectInteractionGetBerryTreeData - def_special EventObjectInteractionGetBerryName - def_special EventObjectInteractionGetBerryCountString + def_special ObjectEventInteractionGetBerryTreeData + def_special ObjectEventInteractionGetBerryName + def_special ObjectEventInteractionGetBerryCountString def_special Bag_ChooseBerry - def_special EventObjectInteractionPlantBerryTree - def_special EventObjectInteractionPickBerryTree - def_special EventObjectInteractionRemoveBerryTree - def_special EventObjectInteractionWaterBerryTree + def_special ObjectEventInteractionPlantBerryTree + def_special ObjectEventInteractionPickBerryTree + def_special ObjectEventInteractionRemoveBerryTree + def_special ObjectEventInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special GetTrainerBattleMode @@ -115,7 +115,7 @@ gSpecials:: @ 81DBA64 def_special ScrSpecial_SetHipsterSpokenFlag def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong - def_special ScrSpecial_SetMauvilleOldManEventObjGfx + def_special ScrSpecial_SetMauvilleOldManObjEventGfx def_special ScrSpecial_GenerateGiddyLine def_special ScrSpecial_GiddyShouldTellAnotherTale def_special ScrSpecial_StorytellerGetFreeStorySlot @@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64 def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToEventObjectLocalIds + def_special GabbyAndTySetScriptVarsToObjectEventLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -339,7 +339,7 @@ gSpecials:: @ 81DBA64 def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special TryInitBattleTowerAwardManEventObject + def_special TryInitBattleTowerAwardManObjectEvent def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag def_special Script_FadeOutMapMusic diff --git a/graphics/event_objects/palettes/field_object_palette_00.pal b/graphics/object_events/palettes/event_object_palette_00.pal index 7bb5bd9ed..7bb5bd9ed 100644 --- a/graphics/event_objects/palettes/field_object_palette_00.pal +++ b/graphics/object_events/palettes/event_object_palette_00.pal diff --git a/graphics/event_objects/palettes/field_object_palette_01.pal b/graphics/object_events/palettes/event_object_palette_01.pal index 558095bda..558095bda 100644 --- a/graphics/event_objects/palettes/field_object_palette_01.pal +++ b/graphics/object_events/palettes/event_object_palette_01.pal diff --git a/graphics/event_objects/palettes/field_object_palette_02.pal b/graphics/object_events/palettes/event_object_palette_02.pal index b84930395..b84930395 100644 --- a/graphics/event_objects/palettes/field_object_palette_02.pal +++ b/graphics/object_events/palettes/event_object_palette_02.pal diff --git a/graphics/event_objects/palettes/field_object_palette_03.pal b/graphics/object_events/palettes/event_object_palette_03.pal index 6c53450ba..6c53450ba 100644 --- a/graphics/event_objects/palettes/field_object_palette_03.pal +++ b/graphics/object_events/palettes/event_object_palette_03.pal diff --git a/graphics/event_objects/palettes/field_object_palette_04.pal b/graphics/object_events/palettes/event_object_palette_04.pal index 82c5ff3a1..82c5ff3a1 100644 --- a/graphics/event_objects/palettes/field_object_palette_04.pal +++ b/graphics/object_events/palettes/event_object_palette_04.pal diff --git a/graphics/event_objects/palettes/field_object_palette_05.pal b/graphics/object_events/palettes/event_object_palette_05.pal index 72ae3cefb..72ae3cefb 100644 --- a/graphics/event_objects/palettes/field_object_palette_05.pal +++ b/graphics/object_events/palettes/event_object_palette_05.pal diff --git a/graphics/event_objects/palettes/field_object_palette_06.pal b/graphics/object_events/palettes/event_object_palette_06.pal index 168a1329d..168a1329d 100644 --- a/graphics/event_objects/palettes/field_object_palette_06.pal +++ b/graphics/object_events/palettes/event_object_palette_06.pal diff --git a/graphics/event_objects/palettes/field_object_palette_07.pal b/graphics/object_events/palettes/event_object_palette_07.pal index 0e604b73c..0e604b73c 100644 --- a/graphics/event_objects/palettes/field_object_palette_07.pal +++ b/graphics/object_events/palettes/event_object_palette_07.pal diff --git a/graphics/event_objects/palettes/field_object_palette_08.pal b/graphics/object_events/palettes/event_object_palette_08.pal index a83ed903f..a83ed903f 100644 --- a/graphics/event_objects/palettes/field_object_palette_08.pal +++ b/graphics/object_events/palettes/event_object_palette_08.pal diff --git a/graphics/event_objects/palettes/field_object_palette_09.pal b/graphics/object_events/palettes/event_object_palette_09.pal index 6a6bf4d12..6a6bf4d12 100644 --- a/graphics/event_objects/palettes/field_object_palette_09.pal +++ b/graphics/object_events/palettes/event_object_palette_09.pal diff --git a/graphics/event_objects/palettes/field_object_palette_10.pal b/graphics/object_events/palettes/event_object_palette_10.pal index 0cebd6c4d..0cebd6c4d 100644 --- a/graphics/event_objects/palettes/field_object_palette_10.pal +++ b/graphics/object_events/palettes/event_object_palette_10.pal diff --git a/graphics/event_objects/palettes/field_object_palette_11.pal b/graphics/object_events/palettes/event_object_palette_11.pal index b28799ed8..b28799ed8 100644 --- a/graphics/event_objects/palettes/field_object_palette_11.pal +++ b/graphics/object_events/palettes/event_object_palette_11.pal diff --git a/graphics/event_objects/palettes/field_object_palette_12.pal b/graphics/object_events/palettes/event_object_palette_12.pal index b36c29ab1..b36c29ab1 100644 --- a/graphics/event_objects/palettes/field_object_palette_12.pal +++ b/graphics/object_events/palettes/event_object_palette_12.pal diff --git a/graphics/event_objects/palettes/field_object_palette_13.pal b/graphics/object_events/palettes/event_object_palette_13.pal index b69e9ac0a..b69e9ac0a 100644 --- a/graphics/event_objects/palettes/field_object_palette_13.pal +++ b/graphics/object_events/palettes/event_object_palette_13.pal diff --git a/graphics/event_objects/palettes/field_object_palette_14.pal b/graphics/object_events/palettes/event_object_palette_14.pal index c53a4d815..c53a4d815 100644 --- a/graphics/event_objects/palettes/field_object_palette_14.pal +++ b/graphics/object_events/palettes/event_object_palette_14.pal diff --git a/graphics/event_objects/palettes/field_object_palette_15.pal b/graphics/object_events/palettes/event_object_palette_15.pal index 0026c6f69..0026c6f69 100644 --- a/graphics/event_objects/palettes/field_object_palette_15.pal +++ b/graphics/object_events/palettes/event_object_palette_15.pal diff --git a/graphics/event_objects/palettes/field_object_palette_16.pal b/graphics/object_events/palettes/event_object_palette_16.pal index ec3c07f20..ec3c07f20 100644 --- a/graphics/event_objects/palettes/field_object_palette_16.pal +++ b/graphics/object_events/palettes/event_object_palette_16.pal diff --git a/graphics/event_objects/palettes/field_object_palette_17.pal b/graphics/object_events/palettes/event_object_palette_17.pal index 2833b2613..2833b2613 100644 --- a/graphics/event_objects/palettes/field_object_palette_17.pal +++ b/graphics/object_events/palettes/event_object_palette_17.pal diff --git a/graphics/event_objects/palettes/field_object_palette_18.pal b/graphics/object_events/palettes/event_object_palette_18.pal index 78b1c89b6..78b1c89b6 100644 --- a/graphics/event_objects/palettes/field_object_palette_18.pal +++ b/graphics/object_events/palettes/event_object_palette_18.pal diff --git a/graphics/event_objects/palettes/field_object_palette_19.pal b/graphics/object_events/palettes/event_object_palette_19.pal index 53de0c383..53de0c383 100644 --- a/graphics/event_objects/palettes/field_object_palette_19.pal +++ b/graphics/object_events/palettes/event_object_palette_19.pal diff --git a/graphics/event_objects/palettes/field_object_palette_20.pal b/graphics/object_events/palettes/event_object_palette_20.pal index 64985f6da..64985f6da 100644 --- a/graphics/event_objects/palettes/field_object_palette_20.pal +++ b/graphics/object_events/palettes/event_object_palette_20.pal diff --git a/graphics/event_objects/palettes/field_object_palette_21.pal b/graphics/object_events/palettes/event_object_palette_21.pal index 5e68e105d..5e68e105d 100644 --- a/graphics/event_objects/palettes/field_object_palette_21.pal +++ b/graphics/object_events/palettes/event_object_palette_21.pal diff --git a/graphics/event_objects/palettes/field_object_palette_22.pal b/graphics/object_events/palettes/event_object_palette_22.pal index 21fa9999d..21fa9999d 100644 --- a/graphics/event_objects/palettes/field_object_palette_22.pal +++ b/graphics/object_events/palettes/event_object_palette_22.pal diff --git a/graphics/event_objects/palettes/field_object_palette_23.pal b/graphics/object_events/palettes/event_object_palette_23.pal index 73b0b1d41..73b0b1d41 100644 --- a/graphics/event_objects/palettes/field_object_palette_23.pal +++ b/graphics/object_events/palettes/event_object_palette_23.pal diff --git a/graphics/event_objects/palettes/field_object_palette_24.pal b/graphics/object_events/palettes/event_object_palette_24.pal index d710b6830..d710b6830 100644 --- a/graphics/event_objects/palettes/field_object_palette_24.pal +++ b/graphics/object_events/palettes/event_object_palette_24.pal diff --git a/graphics/event_objects/palettes/field_object_palette_25.pal b/graphics/object_events/palettes/event_object_palette_25.pal index f48038d41..f48038d41 100644 --- a/graphics/event_objects/palettes/field_object_palette_25.pal +++ b/graphics/object_events/palettes/event_object_palette_25.pal diff --git a/graphics/event_objects/palettes/field_object_palette_26.pal b/graphics/object_events/palettes/event_object_palette_26.pal index fe4c1c112..fe4c1c112 100644 --- a/graphics/event_objects/palettes/field_object_palette_26.pal +++ b/graphics/object_events/palettes/event_object_palette_26.pal diff --git a/graphics/event_objects/palettes/field_object_palette_27.pal b/graphics/object_events/palettes/event_object_palette_27.pal index 5ce2f4728..5ce2f4728 100644 --- a/graphics/event_objects/palettes/field_object_palette_27.pal +++ b/graphics/object_events/palettes/event_object_palette_27.pal diff --git a/graphics/event_objects/palettes/field_object_palette_28.pal b/graphics/object_events/palettes/event_object_palette_28.pal index eb9930c05..eb9930c05 100644 --- a/graphics/event_objects/palettes/field_object_palette_28.pal +++ b/graphics/object_events/palettes/event_object_palette_28.pal diff --git a/graphics/event_objects/palettes/field_object_palette_29.pal b/graphics/object_events/palettes/event_object_palette_29.pal index a69caf9df..a69caf9df 100644 --- a/graphics/event_objects/palettes/field_object_palette_29.pal +++ b/graphics/object_events/palettes/event_object_palette_29.pal diff --git a/graphics/event_objects/palettes/field_object_palette_30.pal b/graphics/object_events/palettes/event_object_palette_30.pal index d90c4cb38..d90c4cb38 100644 --- a/graphics/event_objects/palettes/field_object_palette_30.pal +++ b/graphics/object_events/palettes/event_object_palette_30.pal diff --git a/graphics/event_objects/palettes/field_object_palette_31.pal b/graphics/object_events/palettes/event_object_palette_31.pal index c62e8ce06..c62e8ce06 100644 --- a/graphics/event_objects/palettes/field_object_palette_31.pal +++ b/graphics/object_events/palettes/event_object_palette_31.pal diff --git a/graphics/event_objects/palettes/field_object_palette_32.pal b/graphics/object_events/palettes/event_object_palette_32.pal index e245ba013..e245ba013 100644 --- a/graphics/event_objects/palettes/field_object_palette_32.pal +++ b/graphics/object_events/palettes/event_object_palette_32.pal diff --git a/graphics/event_objects/palettes/field_object_palette_33.pal b/graphics/object_events/palettes/event_object_palette_33.pal index e7717d74e..e7717d74e 100644 --- a/graphics/event_objects/palettes/field_object_palette_33.pal +++ b/graphics/object_events/palettes/event_object_palette_33.pal diff --git a/graphics/event_objects/palettes/field_object_palette_34.pal b/graphics/object_events/palettes/event_object_palette_34.pal index e106ce693..e106ce693 100644 --- a/graphics/event_objects/palettes/field_object_palette_34.pal +++ b/graphics/object_events/palettes/event_object_palette_34.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_00.pal b/graphics/object_events/palettes/field_effect_object_palette_00.pal index bbc9c778b..bbc9c778b 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_00.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_00.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_01.pal b/graphics/object_events/palettes/field_effect_object_palette_01.pal index 044e1c987..044e1c987 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_01.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_01.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_02.pal b/graphics/object_events/palettes/field_effect_object_palette_02.pal index e3a76c035..e3a76c035 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_02.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_02.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_03.pal b/graphics/object_events/palettes/field_effect_object_palette_03.pal index b170eb1f5..b170eb1f5 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_03.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_03.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_04.pal b/graphics/object_events/palettes/field_effect_object_palette_04.pal index 2dddefa5f..2dddefa5f 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_04.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_04.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_05.pal b/graphics/object_events/palettes/field_effect_object_palette_05.pal index 468d7212c..468d7212c 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_05.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_05.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_06.pal b/graphics/object_events/palettes/field_effect_object_palette_06.pal index e4a49a4b9..e4a49a4b9 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_06.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_06.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_07.pal b/graphics/object_events/palettes/field_effect_object_palette_07.pal index 6d9e03c67..6d9e03c67 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_07.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_07.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_08.pal b/graphics/object_events/palettes/field_effect_object_palette_08.pal index 4c41030f6..4c41030f6 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_08.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_08.pal diff --git a/graphics/event_objects/palettes/field_effect_object_palette_10.pal b/graphics/object_events/palettes/field_effect_object_palette_10.pal index 6190709ed..6190709ed 100644 --- a/graphics/event_objects/palettes/field_effect_object_palette_10.pal +++ b/graphics/object_events/palettes/field_effect_object_palette_10.pal diff --git a/graphics/event_objects/palettes/unused_palette.pal b/graphics/object_events/palettes/unused_palette.pal index aeb04ccf8..aeb04ccf8 100644 --- a/graphics/event_objects/palettes/unused_palette.pal +++ b/graphics/object_events/palettes/unused_palette.pal diff --git a/graphics/event_objects/pics/berry_trees/aguav.png b/graphics/object_events/pics/berry_trees/aguav.png Binary files differindex fca4b0dd5..fca4b0dd5 100644 --- a/graphics/event_objects/pics/berry_trees/aguav.png +++ b/graphics/object_events/pics/berry_trees/aguav.png diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/object_events/pics/berry_trees/aspear.png Binary files differindex d0782166e..d0782166e 100644 --- a/graphics/event_objects/pics/berry_trees/aspear.png +++ b/graphics/object_events/pics/berry_trees/aspear.png diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/object_events/pics/berry_trees/cheri.png Binary files differindex ec2db0ae3..ec2db0ae3 100644 --- a/graphics/event_objects/pics/berry_trees/cheri.png +++ b/graphics/object_events/pics/berry_trees/cheri.png diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/object_events/pics/berry_trees/chesto.png Binary files differindex 3087de2b2..3087de2b2 100644 --- a/graphics/event_objects/pics/berry_trees/chesto.png +++ b/graphics/object_events/pics/berry_trees/chesto.png diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/object_events/pics/berry_trees/cornn.png Binary files differindex de3ba7003..de3ba7003 100644 --- a/graphics/event_objects/pics/berry_trees/cornn.png +++ b/graphics/object_events/pics/berry_trees/cornn.png diff --git a/graphics/event_objects/pics/berry_trees/dirt_pile.png b/graphics/object_events/pics/berry_trees/dirt_pile.png Binary files differindex ed2a38b3f..ed2a38b3f 100644 --- a/graphics/event_objects/pics/berry_trees/dirt_pile.png +++ b/graphics/object_events/pics/berry_trees/dirt_pile.png diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/object_events/pics/berry_trees/durin.png Binary files differindex c0caf166f..c0caf166f 100644 --- a/graphics/event_objects/pics/berry_trees/durin.png +++ b/graphics/object_events/pics/berry_trees/durin.png diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/object_events/pics/berry_trees/figy.png Binary files differindex 6ca366296..6ca366296 100644 --- a/graphics/event_objects/pics/berry_trees/figy.png +++ b/graphics/object_events/pics/berry_trees/figy.png diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/object_events/pics/berry_trees/grepa.png Binary files differindex 33788c4a4..33788c4a4 100644 --- a/graphics/event_objects/pics/berry_trees/grepa.png +++ b/graphics/object_events/pics/berry_trees/grepa.png diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/object_events/pics/berry_trees/hondew.png Binary files differindex c07bc17f7..c07bc17f7 100644 --- a/graphics/event_objects/pics/berry_trees/hondew.png +++ b/graphics/object_events/pics/berry_trees/hondew.png diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/object_events/pics/berry_trees/iapapa.png Binary files differindex 98eb27c1d..98eb27c1d 100644 --- a/graphics/event_objects/pics/berry_trees/iapapa.png +++ b/graphics/object_events/pics/berry_trees/iapapa.png diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/object_events/pics/berry_trees/kelpsy.png Binary files differindex 7fdf1d8bd..7fdf1d8bd 100644 --- a/graphics/event_objects/pics/berry_trees/kelpsy.png +++ b/graphics/object_events/pics/berry_trees/kelpsy.png diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/object_events/pics/berry_trees/lansat.png Binary files differindex 3271c1ceb..3271c1ceb 100644 --- a/graphics/event_objects/pics/berry_trees/lansat.png +++ b/graphics/object_events/pics/berry_trees/lansat.png diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/object_events/pics/berry_trees/leppa.png Binary files differindex 601945e43..601945e43 100644 --- a/graphics/event_objects/pics/berry_trees/leppa.png +++ b/graphics/object_events/pics/berry_trees/leppa.png diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/object_events/pics/berry_trees/liechi.png Binary files differindex b65074c80..b65074c80 100644 --- a/graphics/event_objects/pics/berry_trees/liechi.png +++ b/graphics/object_events/pics/berry_trees/liechi.png diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/object_events/pics/berry_trees/lum.png Binary files differindex a2e156ddd..a2e156ddd 100644 --- a/graphics/event_objects/pics/berry_trees/lum.png +++ b/graphics/object_events/pics/berry_trees/lum.png diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/object_events/pics/berry_trees/mago.png Binary files differindex 182a3dea8..182a3dea8 100644 --- a/graphics/event_objects/pics/berry_trees/mago.png +++ b/graphics/object_events/pics/berry_trees/mago.png diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/object_events/pics/berry_trees/nomel.png Binary files differindex fa60688b8..fa60688b8 100644 --- a/graphics/event_objects/pics/berry_trees/nomel.png +++ b/graphics/object_events/pics/berry_trees/nomel.png diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/object_events/pics/berry_trees/oran.png Binary files differindex 484fb7eb2..484fb7eb2 100644 --- a/graphics/event_objects/pics/berry_trees/oran.png +++ b/graphics/object_events/pics/berry_trees/oran.png diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/object_events/pics/berry_trees/pamtre.png Binary files differindex a9f306012..a9f306012 100644 --- a/graphics/event_objects/pics/berry_trees/pamtre.png +++ b/graphics/object_events/pics/berry_trees/pamtre.png diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/object_events/pics/berry_trees/pecha.png Binary files differindex 3bfec5753..3bfec5753 100644 --- a/graphics/event_objects/pics/berry_trees/pecha.png +++ b/graphics/object_events/pics/berry_trees/pecha.png diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/object_events/pics/berry_trees/persim.png Binary files differindex eb5450b8b..eb5450b8b 100644 --- a/graphics/event_objects/pics/berry_trees/persim.png +++ b/graphics/object_events/pics/berry_trees/persim.png diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/object_events/pics/berry_trees/pomeg.png Binary files differindex cd0e5e6c3..cd0e5e6c3 100644 --- a/graphics/event_objects/pics/berry_trees/pomeg.png +++ b/graphics/object_events/pics/berry_trees/pomeg.png diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/object_events/pics/berry_trees/rabuta.png Binary files differindex 59f9baff2..59f9baff2 100644 --- a/graphics/event_objects/pics/berry_trees/rabuta.png +++ b/graphics/object_events/pics/berry_trees/rabuta.png diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/object_events/pics/berry_trees/rawst.png Binary files differindex aad761f5b..aad761f5b 100644 --- a/graphics/event_objects/pics/berry_trees/rawst.png +++ b/graphics/object_events/pics/berry_trees/rawst.png diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/object_events/pics/berry_trees/razz.png Binary files differindex dc2dd1723..dc2dd1723 100644 --- a/graphics/event_objects/pics/berry_trees/razz.png +++ b/graphics/object_events/pics/berry_trees/razz.png diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/object_events/pics/berry_trees/sitrus.png Binary files differindex c5392e3ad..c5392e3ad 100644 --- a/graphics/event_objects/pics/berry_trees/sitrus.png +++ b/graphics/object_events/pics/berry_trees/sitrus.png diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/object_events/pics/berry_trees/spelon.png Binary files differindex 572b4d4f9..572b4d4f9 100644 --- a/graphics/event_objects/pics/berry_trees/spelon.png +++ b/graphics/object_events/pics/berry_trees/spelon.png diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/object_events/pics/berry_trees/sprout.png Binary files differindex e34359627..e34359627 100644 --- a/graphics/event_objects/pics/berry_trees/sprout.png +++ b/graphics/object_events/pics/berry_trees/sprout.png diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/object_events/pics/berry_trees/tamato.png Binary files differindex d12af1922..d12af1922 100644 --- a/graphics/event_objects/pics/berry_trees/tamato.png +++ b/graphics/object_events/pics/berry_trees/tamato.png diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/object_events/pics/berry_trees/wepear.png Binary files differindex 63e5ae53d..63e5ae53d 100644 --- a/graphics/event_objects/pics/berry_trees/wepear.png +++ b/graphics/object_events/pics/berry_trees/wepear.png diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/object_events/pics/berry_trees/wiki.png Binary files differindex 2fa0c0b01..2fa0c0b01 100644 --- a/graphics/event_objects/pics/berry_trees/wiki.png +++ b/graphics/object_events/pics/berry_trees/wiki.png diff --git a/graphics/event_objects/pics/cushions/ball_cushion.png b/graphics/object_events/pics/cushions/ball_cushion.png Binary files differindex 2b45f8fd2..2b45f8fd2 100644 --- a/graphics/event_objects/pics/cushions/ball_cushion.png +++ b/graphics/object_events/pics/cushions/ball_cushion.png diff --git a/graphics/event_objects/pics/cushions/diamond_cushion.png b/graphics/object_events/pics/cushions/diamond_cushion.png Binary files differindex c6c7bc761..c6c7bc761 100644 --- a/graphics/event_objects/pics/cushions/diamond_cushion.png +++ b/graphics/object_events/pics/cushions/diamond_cushion.png diff --git a/graphics/event_objects/pics/cushions/fire_cushion.png b/graphics/object_events/pics/cushions/fire_cushion.png Binary files differindex ee6715037..ee6715037 100644 --- a/graphics/event_objects/pics/cushions/fire_cushion.png +++ b/graphics/object_events/pics/cushions/fire_cushion.png diff --git a/graphics/event_objects/pics/cushions/grass_cushion.png b/graphics/object_events/pics/cushions/grass_cushion.png Binary files differindex 44862882e..44862882e 100644 --- a/graphics/event_objects/pics/cushions/grass_cushion.png +++ b/graphics/object_events/pics/cushions/grass_cushion.png diff --git a/graphics/event_objects/pics/cushions/kiss_cushion.png b/graphics/object_events/pics/cushions/kiss_cushion.png Binary files differindex e24bd9dea..e24bd9dea 100644 --- a/graphics/event_objects/pics/cushions/kiss_cushion.png +++ b/graphics/object_events/pics/cushions/kiss_cushion.png diff --git a/graphics/event_objects/pics/cushions/pika_cushion.png b/graphics/object_events/pics/cushions/pika_cushion.png Binary files differindex 16661bc01..16661bc01 100644 --- a/graphics/event_objects/pics/cushions/pika_cushion.png +++ b/graphics/object_events/pics/cushions/pika_cushion.png diff --git a/graphics/event_objects/pics/cushions/round_cushion.png b/graphics/object_events/pics/cushions/round_cushion.png Binary files differindex 2a2c6d9d9..2a2c6d9d9 100644 --- a/graphics/event_objects/pics/cushions/round_cushion.png +++ b/graphics/object_events/pics/cushions/round_cushion.png diff --git a/graphics/event_objects/pics/cushions/spin_cushion.png b/graphics/object_events/pics/cushions/spin_cushion.png Binary files differindex cfac6c811..cfac6c811 100644 --- a/graphics/event_objects/pics/cushions/spin_cushion.png +++ b/graphics/object_events/pics/cushions/spin_cushion.png diff --git a/graphics/event_objects/pics/cushions/water_cushion.png b/graphics/object_events/pics/cushions/water_cushion.png Binary files differindex 848b0cd35..848b0cd35 100644 --- a/graphics/event_objects/pics/cushions/water_cushion.png +++ b/graphics/object_events/pics/cushions/water_cushion.png diff --git a/graphics/event_objects/pics/cushions/zigzag_cushion.png b/graphics/object_events/pics/cushions/zigzag_cushion.png Binary files differindex 88bb74868..88bb74868 100644 --- a/graphics/event_objects/pics/cushions/zigzag_cushion.png +++ b/graphics/object_events/pics/cushions/zigzag_cushion.png diff --git a/graphics/event_objects/pics/dolls/azurill_doll.png b/graphics/object_events/pics/dolls/azurill_doll.png Binary files differindex 2c2a49639..2c2a49639 100644 --- a/graphics/event_objects/pics/dolls/azurill_doll.png +++ b/graphics/object_events/pics/dolls/azurill_doll.png diff --git a/graphics/event_objects/pics/dolls/baltoy_doll.png b/graphics/object_events/pics/dolls/baltoy_doll.png Binary files differindex c64d26033..c64d26033 100644 --- a/graphics/event_objects/pics/dolls/baltoy_doll.png +++ b/graphics/object_events/pics/dolls/baltoy_doll.png diff --git a/graphics/event_objects/pics/dolls/big_blastoise_doll.png b/graphics/object_events/pics/dolls/big_blastoise_doll.png Binary files differindex 0873117d8..0873117d8 100644 --- a/graphics/event_objects/pics/dolls/big_blastoise_doll.png +++ b/graphics/object_events/pics/dolls/big_blastoise_doll.png diff --git a/graphics/event_objects/pics/dolls/big_charizard_doll.png b/graphics/object_events/pics/dolls/big_charizard_doll.png Binary files differindex 8bf206e5b..8bf206e5b 100644 --- a/graphics/event_objects/pics/dolls/big_charizard_doll.png +++ b/graphics/object_events/pics/dolls/big_charizard_doll.png diff --git a/graphics/event_objects/pics/dolls/big_lapras_doll.png b/graphics/object_events/pics/dolls/big_lapras_doll.png Binary files differindex 9695a0ea5..9695a0ea5 100644 --- a/graphics/event_objects/pics/dolls/big_lapras_doll.png +++ b/graphics/object_events/pics/dolls/big_lapras_doll.png diff --git a/graphics/event_objects/pics/dolls/big_regice_doll.png b/graphics/object_events/pics/dolls/big_regice_doll.png Binary files differindex eff1de492..eff1de492 100644 --- a/graphics/event_objects/pics/dolls/big_regice_doll.png +++ b/graphics/object_events/pics/dolls/big_regice_doll.png diff --git a/graphics/event_objects/pics/dolls/big_regirock_doll.png b/graphics/object_events/pics/dolls/big_regirock_doll.png Binary files differindex 63ed27236..63ed27236 100644 --- a/graphics/event_objects/pics/dolls/big_regirock_doll.png +++ b/graphics/object_events/pics/dolls/big_regirock_doll.png diff --git a/graphics/event_objects/pics/dolls/big_registeel_doll.png b/graphics/object_events/pics/dolls/big_registeel_doll.png Binary files differindex b7ab0821a..b7ab0821a 100644 --- a/graphics/event_objects/pics/dolls/big_registeel_doll.png +++ b/graphics/object_events/pics/dolls/big_registeel_doll.png diff --git a/graphics/event_objects/pics/dolls/big_rhydon_doll.png b/graphics/object_events/pics/dolls/big_rhydon_doll.png Binary files differindex 4e439330a..4e439330a 100644 --- a/graphics/event_objects/pics/dolls/big_rhydon_doll.png +++ b/graphics/object_events/pics/dolls/big_rhydon_doll.png diff --git a/graphics/event_objects/pics/dolls/big_snorlax_doll.png b/graphics/object_events/pics/dolls/big_snorlax_doll.png Binary files differindex dcb1699bf..dcb1699bf 100644 --- a/graphics/event_objects/pics/dolls/big_snorlax_doll.png +++ b/graphics/object_events/pics/dolls/big_snorlax_doll.png diff --git a/graphics/event_objects/pics/dolls/big_venusaur_doll.png b/graphics/object_events/pics/dolls/big_venusaur_doll.png Binary files differindex 1910d1c6e..1910d1c6e 100644 --- a/graphics/event_objects/pics/dolls/big_venusaur_doll.png +++ b/graphics/object_events/pics/dolls/big_venusaur_doll.png diff --git a/graphics/event_objects/pics/dolls/big_wailmer_doll.png b/graphics/object_events/pics/dolls/big_wailmer_doll.png Binary files differindex 13cbbccf3..13cbbccf3 100644 --- a/graphics/event_objects/pics/dolls/big_wailmer_doll.png +++ b/graphics/object_events/pics/dolls/big_wailmer_doll.png diff --git a/graphics/event_objects/pics/dolls/chikorita_doll.png b/graphics/object_events/pics/dolls/chikorita_doll.png Binary files differindex 9942fc9dc..9942fc9dc 100644 --- a/graphics/event_objects/pics/dolls/chikorita_doll.png +++ b/graphics/object_events/pics/dolls/chikorita_doll.png diff --git a/graphics/event_objects/pics/dolls/clefairy_doll.png b/graphics/object_events/pics/dolls/clefairy_doll.png Binary files differindex 3aed333ad..3aed333ad 100644 --- a/graphics/event_objects/pics/dolls/clefairy_doll.png +++ b/graphics/object_events/pics/dolls/clefairy_doll.png diff --git a/graphics/event_objects/pics/dolls/cyndaquil_doll.png b/graphics/object_events/pics/dolls/cyndaquil_doll.png Binary files differindex 2f026816e..2f026816e 100644 --- a/graphics/event_objects/pics/dolls/cyndaquil_doll.png +++ b/graphics/object_events/pics/dolls/cyndaquil_doll.png diff --git a/graphics/event_objects/pics/dolls/ditto_doll.png b/graphics/object_events/pics/dolls/ditto_doll.png Binary files differindex 7b8cb48ae..7b8cb48ae 100644 --- a/graphics/event_objects/pics/dolls/ditto_doll.png +++ b/graphics/object_events/pics/dolls/ditto_doll.png diff --git a/graphics/event_objects/pics/dolls/duskull_doll.png b/graphics/object_events/pics/dolls/duskull_doll.png Binary files differindex 6e69796d7..6e69796d7 100644 --- a/graphics/event_objects/pics/dolls/duskull_doll.png +++ b/graphics/object_events/pics/dolls/duskull_doll.png diff --git a/graphics/event_objects/pics/dolls/gulpin_doll.png b/graphics/object_events/pics/dolls/gulpin_doll.png Binary files differindex 5ffdefb0c..5ffdefb0c 100644 --- a/graphics/event_objects/pics/dolls/gulpin_doll.png +++ b/graphics/object_events/pics/dolls/gulpin_doll.png diff --git a/graphics/event_objects/pics/dolls/jigglypuff_doll.png b/graphics/object_events/pics/dolls/jigglypuff_doll.png Binary files differindex 75dcbe1eb..75dcbe1eb 100644 --- a/graphics/event_objects/pics/dolls/jigglypuff_doll.png +++ b/graphics/object_events/pics/dolls/jigglypuff_doll.png diff --git a/graphics/event_objects/pics/dolls/kecleon_doll.png b/graphics/object_events/pics/dolls/kecleon_doll.png Binary files differindex a70feb67c..a70feb67c 100644 --- a/graphics/event_objects/pics/dolls/kecleon_doll.png +++ b/graphics/object_events/pics/dolls/kecleon_doll.png diff --git a/graphics/event_objects/pics/dolls/lotad_doll.png b/graphics/object_events/pics/dolls/lotad_doll.png Binary files differindex 69065a424..69065a424 100644 --- a/graphics/event_objects/pics/dolls/lotad_doll.png +++ b/graphics/object_events/pics/dolls/lotad_doll.png diff --git a/graphics/event_objects/pics/dolls/marill_doll.png b/graphics/object_events/pics/dolls/marill_doll.png Binary files differindex d90c0cee1..d90c0cee1 100644 --- a/graphics/event_objects/pics/dolls/marill_doll.png +++ b/graphics/object_events/pics/dolls/marill_doll.png diff --git a/graphics/event_objects/pics/dolls/meowth_doll.png b/graphics/object_events/pics/dolls/meowth_doll.png Binary files differindex cb093acfa..cb093acfa 100644 --- a/graphics/event_objects/pics/dolls/meowth_doll.png +++ b/graphics/object_events/pics/dolls/meowth_doll.png diff --git a/graphics/event_objects/pics/dolls/mudkip_doll.png b/graphics/object_events/pics/dolls/mudkip_doll.png Binary files differindex 440fde84b..440fde84b 100644 --- a/graphics/event_objects/pics/dolls/mudkip_doll.png +++ b/graphics/object_events/pics/dolls/mudkip_doll.png diff --git a/graphics/event_objects/pics/dolls/pichu_doll.png b/graphics/object_events/pics/dolls/pichu_doll.png Binary files differindex 69bcc64ae..69bcc64ae 100644 --- a/graphics/event_objects/pics/dolls/pichu_doll.png +++ b/graphics/object_events/pics/dolls/pichu_doll.png diff --git a/graphics/event_objects/pics/dolls/pikachu_doll.png b/graphics/object_events/pics/dolls/pikachu_doll.png Binary files differindex 1c9342ad1..1c9342ad1 100644 --- a/graphics/event_objects/pics/dolls/pikachu_doll.png +++ b/graphics/object_events/pics/dolls/pikachu_doll.png diff --git a/graphics/event_objects/pics/dolls/seedot_doll.png b/graphics/object_events/pics/dolls/seedot_doll.png Binary files differindex 255b4c55d..255b4c55d 100644 --- a/graphics/event_objects/pics/dolls/seedot_doll.png +++ b/graphics/object_events/pics/dolls/seedot_doll.png diff --git a/graphics/event_objects/pics/dolls/skitty_doll.png b/graphics/object_events/pics/dolls/skitty_doll.png Binary files differindex 6e04a9cb1..6e04a9cb1 100644 --- a/graphics/event_objects/pics/dolls/skitty_doll.png +++ b/graphics/object_events/pics/dolls/skitty_doll.png diff --git a/graphics/event_objects/pics/dolls/smoochum_doll.png b/graphics/object_events/pics/dolls/smoochum_doll.png Binary files differindex 7dc1180fd..7dc1180fd 100644 --- a/graphics/event_objects/pics/dolls/smoochum_doll.png +++ b/graphics/object_events/pics/dolls/smoochum_doll.png diff --git a/graphics/event_objects/pics/dolls/swablu_doll.png b/graphics/object_events/pics/dolls/swablu_doll.png Binary files differindex 271576db8..271576db8 100644 --- a/graphics/event_objects/pics/dolls/swablu_doll.png +++ b/graphics/object_events/pics/dolls/swablu_doll.png diff --git a/graphics/event_objects/pics/dolls/togepi_doll.png b/graphics/object_events/pics/dolls/togepi_doll.png Binary files differindex aa527b44b..aa527b44b 100644 --- a/graphics/event_objects/pics/dolls/togepi_doll.png +++ b/graphics/object_events/pics/dolls/togepi_doll.png diff --git a/graphics/event_objects/pics/dolls/torchic_doll.png b/graphics/object_events/pics/dolls/torchic_doll.png Binary files differindex 80969c424..80969c424 100644 --- a/graphics/event_objects/pics/dolls/torchic_doll.png +++ b/graphics/object_events/pics/dolls/torchic_doll.png diff --git a/graphics/event_objects/pics/dolls/totodile_doll.png b/graphics/object_events/pics/dolls/totodile_doll.png Binary files differindex 46324159e..46324159e 100644 --- a/graphics/event_objects/pics/dolls/totodile_doll.png +++ b/graphics/object_events/pics/dolls/totodile_doll.png diff --git a/graphics/event_objects/pics/dolls/treecko_doll.png b/graphics/object_events/pics/dolls/treecko_doll.png Binary files differindex 6487fe805..6487fe805 100644 --- a/graphics/event_objects/pics/dolls/treecko_doll.png +++ b/graphics/object_events/pics/dolls/treecko_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png b/graphics/object_events/pics/dolls/unused_magnemite_doll.png Binary files differindex 2c9ef10c7..2c9ef10c7 100644 --- a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png +++ b/graphics/object_events/pics/dolls/unused_magnemite_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_natu_doll.png b/graphics/object_events/pics/dolls/unused_natu_doll.png Binary files differindex 8087db81d..8087db81d 100644 --- a/graphics/event_objects/pics/dolls/unused_natu_doll.png +++ b/graphics/object_events/pics/dolls/unused_natu_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png b/graphics/object_events/pics/dolls/unused_pikachu_doll.png Binary files differindex 2e5181977..2e5181977 100644 --- a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png +++ b/graphics/object_events/pics/dolls/unused_pikachu_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png b/graphics/object_events/pics/dolls/unused_porygon2_doll.png Binary files differindex f68182762..f68182762 100644 --- a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png +++ b/graphics/object_events/pics/dolls/unused_porygon2_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png b/graphics/object_events/pics/dolls/unused_squirtle_doll.png Binary files differindex 0480227d0..0480227d0 100644 --- a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png +++ b/graphics/object_events/pics/dolls/unused_squirtle_doll.png diff --git a/graphics/event_objects/pics/dolls/unused_wooper_doll.png b/graphics/object_events/pics/dolls/unused_wooper_doll.png Binary files differindex 69d73eada..69d73eada 100644 --- a/graphics/event_objects/pics/dolls/unused_wooper_doll.png +++ b/graphics/object_events/pics/dolls/unused_wooper_doll.png diff --git a/graphics/event_objects/pics/dolls/wynaut_doll.png b/graphics/object_events/pics/dolls/wynaut_doll.png Binary files differindex 543328178..543328178 100644 --- a/graphics/event_objects/pics/dolls/wynaut_doll.png +++ b/graphics/object_events/pics/dolls/wynaut_doll.png diff --git a/graphics/event_objects/pics/effects/arrow.png b/graphics/object_events/pics/effects/arrow.png Binary files differindex 85ebdf514..85ebdf514 100644 --- a/graphics/event_objects/pics/effects/arrow.png +++ b/graphics/object_events/pics/effects/arrow.png diff --git a/graphics/event_objects/pics/effects/ash.png b/graphics/object_events/pics/effects/ash.png Binary files differindex 8890d5ab8..8890d5ab8 100644 --- a/graphics/event_objects/pics/effects/ash.png +++ b/graphics/object_events/pics/effects/ash.png diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png b/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png Binary files differindex 2910c2a49..2910c2a49 100644 --- a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png +++ b/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash.png b/graphics/object_events/pics/effects/bike_hop_big_splash.png Binary files differindex 171d23457..171d23457 100644 --- a/graphics/event_objects/pics/effects/bike_hop_big_splash.png +++ b/graphics/object_events/pics/effects/bike_hop_big_splash.png diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash.png b/graphics/object_events/pics/effects/bike_hop_small_splash.png Binary files differindex e98ded025..e98ded025 100644 --- a/graphics/event_objects/pics/effects/bike_hop_small_splash.png +++ b/graphics/object_events/pics/effects/bike_hop_small_splash.png diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass.png b/graphics/object_events/pics/effects/bike_hop_tall_grass.png Binary files differindex c43da9f28..c43da9f28 100755 --- a/graphics/event_objects/pics/effects/bike_hop_tall_grass.png +++ b/graphics/object_events/pics/effects/bike_hop_tall_grass.png diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks.png b/graphics/object_events/pics/effects/bike_tire_tracks.png Binary files differindex 2d989d28c..2d989d28c 100644 --- a/graphics/event_objects/pics/effects/bike_tire_tracks.png +++ b/graphics/object_events/pics/effects/bike_tire_tracks.png diff --git a/graphics/event_objects/pics/effects/bird.png b/graphics/object_events/pics/effects/bird.png Binary files differindex e9d9798fd..e9d9798fd 100644 --- a/graphics/event_objects/pics/effects/bird.png +++ b/graphics/object_events/pics/effects/bird.png diff --git a/graphics/event_objects/pics/effects/bubbles.png b/graphics/object_events/pics/effects/bubbles.png Binary files differindex b04ceaf09..b04ceaf09 100644 --- a/graphics/event_objects/pics/effects/bubbles.png +++ b/graphics/object_events/pics/effects/bubbles.png diff --git a/graphics/event_objects/pics/effects/cut_grass.png b/graphics/object_events/pics/effects/cut_grass.png Binary files differindex 3c41d28b3..3c41d28b3 100644 --- a/graphics/event_objects/pics/effects/cut_grass.png +++ b/graphics/object_events/pics/effects/cut_grass.png diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints.png b/graphics/object_events/pics/effects/deep_sand_footprints.png Binary files differindex ea7484b23..ea7484b23 100644 --- a/graphics/event_objects/pics/effects/deep_sand_footprints.png +++ b/graphics/object_events/pics/effects/deep_sand_footprints.png diff --git a/graphics/event_objects/pics/effects/ground_impact_dust.png b/graphics/object_events/pics/effects/ground_impact_dust.png Binary files differindex d4562fe57..d4562fe57 100644 --- a/graphics/event_objects/pics/effects/ground_impact_dust.png +++ b/graphics/object_events/pics/effects/ground_impact_dust.png diff --git a/graphics/event_objects/pics/effects/hot_springs_water.png b/graphics/object_events/pics/effects/hot_springs_water.png Binary files differindex 18892239e..18892239e 100644 --- a/graphics/event_objects/pics/effects/hot_springs_water.png +++ b/graphics/object_events/pics/effects/hot_springs_water.png diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash.png b/graphics/object_events/pics/effects/jump_out_of_ash.png Binary files differindex 3247b8169..3247b8169 100644 --- a/graphics/event_objects/pics/effects/jump_out_of_ash.png +++ b/graphics/object_events/pics/effects/jump_out_of_ash.png diff --git a/graphics/event_objects/pics/effects/long_grass.png b/graphics/object_events/pics/effects/long_grass.png Binary files differindex 265e45056..265e45056 100644 --- a/graphics/event_objects/pics/effects/long_grass.png +++ b/graphics/object_events/pics/effects/long_grass.png diff --git a/graphics/event_objects/pics/effects/mountain_disguise.png b/graphics/object_events/pics/effects/mountain_disguise.png Binary files differindex c394855e6..c394855e6 100644 --- a/graphics/event_objects/pics/effects/mountain_disguise.png +++ b/graphics/object_events/pics/effects/mountain_disguise.png diff --git a/graphics/event_objects/pics/effects/ripple.png b/graphics/object_events/pics/effects/ripple.png Binary files differindex 87e6dd617..87e6dd617 100644 --- a/graphics/event_objects/pics/effects/ripple.png +++ b/graphics/object_events/pics/effects/ripple.png diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png b/graphics/object_events/pics/effects/sand_disguise_placeholder.png Binary files differindex 76808a53b..76808a53b 100755 --- a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png +++ b/graphics/object_events/pics/effects/sand_disguise_placeholder.png diff --git a/graphics/event_objects/pics/effects/sand_footprints.png b/graphics/object_events/pics/effects/sand_footprints.png Binary files differindex 71c54f787..71c54f787 100644 --- a/graphics/event_objects/pics/effects/sand_footprints.png +++ b/graphics/object_events/pics/effects/sand_footprints.png diff --git a/graphics/event_objects/pics/effects/shadow_extra_large.png b/graphics/object_events/pics/effects/shadow_extra_large.png Binary files differindex 765a5291a..765a5291a 100644 --- a/graphics/event_objects/pics/effects/shadow_extra_large.png +++ b/graphics/object_events/pics/effects/shadow_extra_large.png diff --git a/graphics/event_objects/pics/effects/shadow_large.png b/graphics/object_events/pics/effects/shadow_large.png Binary files differindex e917823b0..e917823b0 100644 --- a/graphics/event_objects/pics/effects/shadow_large.png +++ b/graphics/object_events/pics/effects/shadow_large.png diff --git a/graphics/event_objects/pics/effects/shadow_medium.png b/graphics/object_events/pics/effects/shadow_medium.png Binary files differindex 83ab6e1f6..83ab6e1f6 100644 --- a/graphics/event_objects/pics/effects/shadow_medium.png +++ b/graphics/object_events/pics/effects/shadow_medium.png diff --git a/graphics/event_objects/pics/effects/shadow_small.png b/graphics/object_events/pics/effects/shadow_small.png Binary files differindex f5feada2b..f5feada2b 100644 --- a/graphics/event_objects/pics/effects/shadow_small.png +++ b/graphics/object_events/pics/effects/shadow_small.png diff --git a/graphics/event_objects/pics/effects/short_grass.png b/graphics/object_events/pics/effects/short_grass.png Binary files differindex dc477e29f..dc477e29f 100644 --- a/graphics/event_objects/pics/effects/short_grass.png +++ b/graphics/object_events/pics/effects/short_grass.png diff --git a/graphics/event_objects/pics/effects/splash.png b/graphics/object_events/pics/effects/splash.png Binary files differindex 6e55ffae0..6e55ffae0 100644 --- a/graphics/event_objects/pics/effects/splash.png +++ b/graphics/object_events/pics/effects/splash.png diff --git a/graphics/event_objects/pics/effects/surf_blob.png b/graphics/object_events/pics/effects/surf_blob.png Binary files differindex b5656cf16..b5656cf16 100644 --- a/graphics/event_objects/pics/effects/surf_blob.png +++ b/graphics/object_events/pics/effects/surf_blob.png diff --git a/graphics/event_objects/pics/effects/tall_grass.png b/graphics/object_events/pics/effects/tall_grass.png Binary files differindex 919fc6f8a..919fc6f8a 100644 --- a/graphics/event_objects/pics/effects/tall_grass.png +++ b/graphics/object_events/pics/effects/tall_grass.png diff --git a/graphics/event_objects/pics/effects/tree_disguise.png b/graphics/object_events/pics/effects/tree_disguise.png Binary files differindex 8acbfbd5d..8acbfbd5d 100644 --- a/graphics/event_objects/pics/effects/tree_disguise.png +++ b/graphics/object_events/pics/effects/tree_disguise.png diff --git a/graphics/event_objects/pics/effects/unknown_16.png b/graphics/object_events/pics/effects/unknown_16.png Binary files differindex bb4789f9f..bb4789f9f 100755 --- a/graphics/event_objects/pics/effects/unknown_16.png +++ b/graphics/object_events/pics/effects/unknown_16.png diff --git a/graphics/event_objects/pics/effects/unknown_17.png b/graphics/object_events/pics/effects/unknown_17.png Binary files differindex f158bebc8..f158bebc8 100644 --- a/graphics/event_objects/pics/effects/unknown_17.png +++ b/graphics/object_events/pics/effects/unknown_17.png diff --git a/graphics/event_objects/pics/effects/unknown_18.png b/graphics/object_events/pics/effects/unknown_18.png Binary files differindex 65f4d97e2..65f4d97e2 100644 --- a/graphics/event_objects/pics/effects/unknown_18.png +++ b/graphics/object_events/pics/effects/unknown_18.png diff --git a/graphics/event_objects/pics/effects/unknown_19.png b/graphics/object_events/pics/effects/unknown_19.png Binary files differindex 4ae851e58..4ae851e58 100644 --- a/graphics/event_objects/pics/effects/unknown_19.png +++ b/graphics/object_events/pics/effects/unknown_19.png diff --git a/graphics/event_objects/pics/effects/unknown_20.png b/graphics/object_events/pics/effects/unknown_20.png Binary files differindex 7d6af5e0c..7d6af5e0c 100644 --- a/graphics/event_objects/pics/effects/unknown_20.png +++ b/graphics/object_events/pics/effects/unknown_20.png diff --git a/graphics/event_objects/pics/effects/unknown_29.png b/graphics/object_events/pics/effects/unknown_29.png Binary files differindex 03f89a5f5..03f89a5f5 100644 --- a/graphics/event_objects/pics/effects/unknown_29.png +++ b/graphics/object_events/pics/effects/unknown_29.png diff --git a/graphics/event_objects/pics/effects/unknown_33.png b/graphics/object_events/pics/effects/unknown_33.png Binary files differindex 26b852200..26b852200 100644 --- a/graphics/event_objects/pics/effects/unknown_33.png +++ b/graphics/object_events/pics/effects/unknown_33.png diff --git a/graphics/event_objects/pics/effects/unknown_35.png b/graphics/object_events/pics/effects/unknown_35.png Binary files differindex b2072bd26..b2072bd26 100644 --- a/graphics/event_objects/pics/effects/unknown_35.png +++ b/graphics/object_events/pics/effects/unknown_35.png diff --git a/graphics/event_objects/pics/effects/unused_grass.png b/graphics/object_events/pics/effects/unused_grass.png Binary files differindex ffd68ec1d..ffd68ec1d 100644 --- a/graphics/event_objects/pics/effects/unused_grass.png +++ b/graphics/object_events/pics/effects/unused_grass.png diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/object_events/pics/misc/birchs_bag.png Binary files differindex 21f463b71..21f463b71 100644 --- a/graphics/event_objects/pics/misc/birchs_bag.png +++ b/graphics/object_events/pics/misc/birchs_bag.png diff --git a/graphics/event_objects/pics/misc/birth_island_stone.png b/graphics/object_events/pics/misc/birth_island_stone.png Binary files differindex 3c5d82c11..3c5d82c11 100644 --- a/graphics/event_objects/pics/misc/birth_island_stone.png +++ b/graphics/object_events/pics/misc/birth_island_stone.png diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/object_events/pics/misc/breakable_rock.png Binary files differindex c5054da41..c5054da41 100644 --- a/graphics/event_objects/pics/misc/breakable_rock.png +++ b/graphics/object_events/pics/misc/breakable_rock.png diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/object_events/pics/misc/cable_car.png Binary files differindex 67f581fb9..67f581fb9 100644 --- a/graphics/event_objects/pics/misc/cable_car.png +++ b/graphics/object_events/pics/misc/cable_car.png diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/object_events/pics/misc/cuttable_tree.png Binary files differindex fba4ced1a..fba4ced1a 100644 --- a/graphics/event_objects/pics/misc/cuttable_tree.png +++ b/graphics/object_events/pics/misc/cuttable_tree.png diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/object_events/pics/misc/fossil.png Binary files differindex 3e070a6c9..3e070a6c9 100644 --- a/graphics/event_objects/pics/misc/fossil.png +++ b/graphics/object_events/pics/misc/fossil.png diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/object_events/pics/misc/item_ball.png Binary files differindex ef02e158c..ef02e158c 100644 --- a/graphics/event_objects/pics/misc/item_ball.png +++ b/graphics/object_events/pics/misc/item_ball.png diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/object_events/pics/misc/moving_box.png Binary files differindex 43b65c2c1..43b65c2c1 100644 --- a/graphics/event_objects/pics/misc/moving_box.png +++ b/graphics/object_events/pics/misc/moving_box.png diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/object_events/pics/misc/mr_brineys_boat.png Binary files differindex 249f25b51..249f25b51 100644 --- a/graphics/event_objects/pics/misc/mr_brineys_boat.png +++ b/graphics/object_events/pics/misc/mr_brineys_boat.png diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/object_events/pics/misc/pushable_boulder.png Binary files differindex eba6a116f..eba6a116f 100644 --- a/graphics/event_objects/pics/misc/pushable_boulder.png +++ b/graphics/object_events/pics/misc/pushable_boulder.png diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/object_events/pics/misc/ss_tidal.png Binary files differindex 44510d25a..44510d25a 100644 --- a/graphics/event_objects/pics/misc/ss_tidal.png +++ b/graphics/object_events/pics/misc/ss_tidal.png diff --git a/graphics/event_objects/pics/misc/statue.png b/graphics/object_events/pics/misc/statue.png Binary files differindex 7b4b13cd7..7b4b13cd7 100644 --- a/graphics/event_objects/pics/misc/statue.png +++ b/graphics/object_events/pics/misc/statue.png diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/object_events/pics/misc/submarine_shadow.png Binary files differindex d43bc98dc..d43bc98dc 100644 --- a/graphics/event_objects/pics/misc/submarine_shadow.png +++ b/graphics/object_events/pics/misc/submarine_shadow.png diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/object_events/pics/misc/truck.png Binary files differindex 46940a9a3..46940a9a3 100644 --- a/graphics/event_objects/pics/misc/truck.png +++ b/graphics/object_events/pics/misc/truck.png diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/object_events/pics/people/artist.png Binary files differindex 1a98032a7..1a98032a7 100644 --- a/graphics/event_objects/pics/people/artist.png +++ b/graphics/object_events/pics/people/artist.png diff --git a/graphics/event_objects/pics/people/beauty.png b/graphics/object_events/pics/people/beauty.png Binary files differindex dd3a3d76b..dd3a3d76b 100644 --- a/graphics/event_objects/pics/people/beauty.png +++ b/graphics/object_events/pics/people/beauty.png diff --git a/graphics/event_objects/pics/people/black_belt.png b/graphics/object_events/pics/people/black_belt.png Binary files differindex e6c901933..e6c901933 100644 --- a/graphics/event_objects/pics/people/black_belt.png +++ b/graphics/object_events/pics/people/black_belt.png diff --git a/graphics/event_objects/pics/people/boy_1.png b/graphics/object_events/pics/people/boy_1.png Binary files differindex cd7507c9b..cd7507c9b 100644 --- a/graphics/event_objects/pics/people/boy_1.png +++ b/graphics/object_events/pics/people/boy_1.png diff --git a/graphics/event_objects/pics/people/boy_2.png b/graphics/object_events/pics/people/boy_2.png Binary files differindex ff57b602b..ff57b602b 100644 --- a/graphics/event_objects/pics/people/boy_2.png +++ b/graphics/object_events/pics/people/boy_2.png diff --git a/graphics/event_objects/pics/people/boy_3.png b/graphics/object_events/pics/people/boy_3.png Binary files differindex b6dba7944..b6dba7944 100644 --- a/graphics/event_objects/pics/people/boy_3.png +++ b/graphics/object_events/pics/people/boy_3.png diff --git a/graphics/event_objects/pics/people/brendan/acro_bike.png b/graphics/object_events/pics/people/brendan/acro_bike.png Binary files differindex 183e2b7c9..183e2b7c9 100644 --- a/graphics/event_objects/pics/people/brendan/acro_bike.png +++ b/graphics/object_events/pics/people/brendan/acro_bike.png diff --git a/graphics/event_objects/pics/people/brendan/decorating.png b/graphics/object_events/pics/people/brendan/decorating.png Binary files differindex f3771e60e..f3771e60e 100644 --- a/graphics/event_objects/pics/people/brendan/decorating.png +++ b/graphics/object_events/pics/people/brendan/decorating.png diff --git a/graphics/event_objects/pics/people/brendan/field_move.png b/graphics/object_events/pics/people/brendan/field_move.png Binary files differindex 26ef74749..26ef74749 100644 --- a/graphics/event_objects/pics/people/brendan/field_move.png +++ b/graphics/object_events/pics/people/brendan/field_move.png diff --git a/graphics/event_objects/pics/people/brendan/fishing.png b/graphics/object_events/pics/people/brendan/fishing.png Binary files differindex bb2a8f747..bb2a8f747 100644 --- a/graphics/event_objects/pics/people/brendan/fishing.png +++ b/graphics/object_events/pics/people/brendan/fishing.png diff --git a/graphics/event_objects/pics/people/brendan/mach_bike.png b/graphics/object_events/pics/people/brendan/mach_bike.png Binary files differindex 661ebb733..661ebb733 100644 --- a/graphics/event_objects/pics/people/brendan/mach_bike.png +++ b/graphics/object_events/pics/people/brendan/mach_bike.png diff --git a/graphics/event_objects/pics/people/brendan/running.png b/graphics/object_events/pics/people/brendan/running.png Binary files differindex a66dbf8d3..a66dbf8d3 100644 --- a/graphics/event_objects/pics/people/brendan/running.png +++ b/graphics/object_events/pics/people/brendan/running.png diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/object_events/pics/people/brendan/surfing.png Binary files differindex 1baa4afc6..1baa4afc6 100644 --- a/graphics/event_objects/pics/people/brendan/surfing.png +++ b/graphics/object_events/pics/people/brendan/surfing.png diff --git a/graphics/event_objects/pics/people/brendan/underwater.png b/graphics/object_events/pics/people/brendan/underwater.png Binary files differindex 47f926b61..47f926b61 100644 --- a/graphics/event_objects/pics/people/brendan/underwater.png +++ b/graphics/object_events/pics/people/brendan/underwater.png diff --git a/graphics/event_objects/pics/people/brendan/walking.png b/graphics/object_events/pics/people/brendan/walking.png Binary files differindex 0560881fa..0560881fa 100644 --- a/graphics/event_objects/pics/people/brendan/walking.png +++ b/graphics/object_events/pics/people/brendan/walking.png diff --git a/graphics/event_objects/pics/people/brendan/watering.png b/graphics/object_events/pics/people/brendan/watering.png Binary files differindex 999608437..999608437 100644 --- a/graphics/event_objects/pics/people/brendan/watering.png +++ b/graphics/object_events/pics/people/brendan/watering.png diff --git a/graphics/event_objects/pics/people/bug_catcher.png b/graphics/object_events/pics/people/bug_catcher.png Binary files differindex 7f733b936..7f733b936 100644 --- a/graphics/event_objects/pics/people/bug_catcher.png +++ b/graphics/object_events/pics/people/bug_catcher.png diff --git a/graphics/event_objects/pics/people/cameraman.png b/graphics/object_events/pics/people/cameraman.png Binary files differindex b1f972438..b1f972438 100644 --- a/graphics/event_objects/pics/people/cameraman.png +++ b/graphics/object_events/pics/people/cameraman.png diff --git a/graphics/event_objects/pics/people/camper.png b/graphics/object_events/pics/people/camper.png Binary files differindex 3719d64f3..3719d64f3 100644 --- a/graphics/event_objects/pics/people/camper.png +++ b/graphics/object_events/pics/people/camper.png diff --git a/graphics/event_objects/pics/people/contest_judge.png b/graphics/object_events/pics/people/contest_judge.png Binary files differindex 919230cb7..919230cb7 100644 --- a/graphics/event_objects/pics/people/contest_judge.png +++ b/graphics/object_events/pics/people/contest_judge.png diff --git a/graphics/event_objects/pics/people/cook.png b/graphics/object_events/pics/people/cook.png Binary files differindex 9ac187130..9ac187130 100644 --- a/graphics/event_objects/pics/people/cook.png +++ b/graphics/object_events/pics/people/cook.png diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f.png b/graphics/object_events/pics/people/cycling_triathlete_f.png Binary files differindex a291b79c5..a291b79c5 100644 --- a/graphics/event_objects/pics/people/cycling_triathlete_f.png +++ b/graphics/object_events/pics/people/cycling_triathlete_f.png diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m.png b/graphics/object_events/pics/people/cycling_triathlete_m.png Binary files differindex 08a848d27..08a848d27 100644 --- a/graphics/event_objects/pics/people/cycling_triathlete_m.png +++ b/graphics/object_events/pics/people/cycling_triathlete_m.png diff --git a/graphics/event_objects/pics/people/devon_employee.png b/graphics/object_events/pics/people/devon_employee.png Binary files differindex 106bc58b3..106bc58b3 100644 --- a/graphics/event_objects/pics/people/devon_employee.png +++ b/graphics/object_events/pics/people/devon_employee.png diff --git a/graphics/event_objects/pics/people/elite_four/drake.png b/graphics/object_events/pics/people/elite_four/drake.png Binary files differindex 9fde008ff..9fde008ff 100644 --- a/graphics/event_objects/pics/people/elite_four/drake.png +++ b/graphics/object_events/pics/people/elite_four/drake.png diff --git a/graphics/event_objects/pics/people/elite_four/glacia.png b/graphics/object_events/pics/people/elite_four/glacia.png Binary files differindex fcf6dbde2..fcf6dbde2 100644 --- a/graphics/event_objects/pics/people/elite_four/glacia.png +++ b/graphics/object_events/pics/people/elite_four/glacia.png diff --git a/graphics/event_objects/pics/people/elite_four/phoebe.png b/graphics/object_events/pics/people/elite_four/phoebe.png Binary files differindex 243057ae2..243057ae2 100644 --- a/graphics/event_objects/pics/people/elite_four/phoebe.png +++ b/graphics/object_events/pics/people/elite_four/phoebe.png diff --git a/graphics/event_objects/pics/people/elite_four/sidney.png b/graphics/object_events/pics/people/elite_four/sidney.png Binary files differindex de9d08719..de9d08719 100644 --- a/graphics/event_objects/pics/people/elite_four/sidney.png +++ b/graphics/object_events/pics/people/elite_four/sidney.png diff --git a/graphics/event_objects/pics/people/expert_f.png b/graphics/object_events/pics/people/expert_f.png Binary files differindex a0d852cd4..a0d852cd4 100644 --- a/graphics/event_objects/pics/people/expert_f.png +++ b/graphics/object_events/pics/people/expert_f.png diff --git a/graphics/event_objects/pics/people/expert_m.png b/graphics/object_events/pics/people/expert_m.png Binary files differindex 6bd5afc44..6bd5afc44 100644 --- a/graphics/event_objects/pics/people/expert_m.png +++ b/graphics/object_events/pics/people/expert_m.png diff --git a/graphics/event_objects/pics/people/fat_man.png b/graphics/object_events/pics/people/fat_man.png Binary files differindex 392f0446e..392f0446e 100644 --- a/graphics/event_objects/pics/people/fat_man.png +++ b/graphics/object_events/pics/people/fat_man.png diff --git a/graphics/event_objects/pics/people/fisherman.png b/graphics/object_events/pics/people/fisherman.png Binary files differindex 486fc36ed..486fc36ed 100644 --- a/graphics/event_objects/pics/people/fisherman.png +++ b/graphics/object_events/pics/people/fisherman.png diff --git a/graphics/event_objects/pics/people/frontier_brains/anabel.png b/graphics/object_events/pics/people/frontier_brains/anabel.png Binary files differindex fce97a5e3..fce97a5e3 100644 --- a/graphics/event_objects/pics/people/frontier_brains/anabel.png +++ b/graphics/object_events/pics/people/frontier_brains/anabel.png diff --git a/graphics/event_objects/pics/people/frontier_brains/brandon.png b/graphics/object_events/pics/people/frontier_brains/brandon.png Binary files differindex a6cfcbbcb..a6cfcbbcb 100644 --- a/graphics/event_objects/pics/people/frontier_brains/brandon.png +++ b/graphics/object_events/pics/people/frontier_brains/brandon.png diff --git a/graphics/event_objects/pics/people/frontier_brains/greta.png b/graphics/object_events/pics/people/frontier_brains/greta.png Binary files differindex d8d577774..d8d577774 100644 --- a/graphics/event_objects/pics/people/frontier_brains/greta.png +++ b/graphics/object_events/pics/people/frontier_brains/greta.png diff --git a/graphics/event_objects/pics/people/frontier_brains/lucy.png b/graphics/object_events/pics/people/frontier_brains/lucy.png Binary files differindex 7f935612c..7f935612c 100644 --- a/graphics/event_objects/pics/people/frontier_brains/lucy.png +++ b/graphics/object_events/pics/people/frontier_brains/lucy.png diff --git a/graphics/event_objects/pics/people/frontier_brains/noland.png b/graphics/object_events/pics/people/frontier_brains/noland.png Binary files differindex b71430bd1..b71430bd1 100644 --- a/graphics/event_objects/pics/people/frontier_brains/noland.png +++ b/graphics/object_events/pics/people/frontier_brains/noland.png diff --git a/graphics/event_objects/pics/people/frontier_brains/spenser.png b/graphics/object_events/pics/people/frontier_brains/spenser.png Binary files differindex cd8563d5e..cd8563d5e 100644 --- a/graphics/event_objects/pics/people/frontier_brains/spenser.png +++ b/graphics/object_events/pics/people/frontier_brains/spenser.png diff --git a/graphics/event_objects/pics/people/frontier_brains/tucker.png b/graphics/object_events/pics/people/frontier_brains/tucker.png Binary files differindex d9daa0838..d9daa0838 100644 --- a/graphics/event_objects/pics/people/frontier_brains/tucker.png +++ b/graphics/object_events/pics/people/frontier_brains/tucker.png diff --git a/graphics/event_objects/pics/people/gameboy_kid.png b/graphics/object_events/pics/people/gameboy_kid.png Binary files differindex b0b742651..b0b742651 100644 --- a/graphics/event_objects/pics/people/gameboy_kid.png +++ b/graphics/object_events/pics/people/gameboy_kid.png diff --git a/graphics/event_objects/pics/people/gentleman.png b/graphics/object_events/pics/people/gentleman.png Binary files differindex 409c593e2..409c593e2 100644 --- a/graphics/event_objects/pics/people/gentleman.png +++ b/graphics/object_events/pics/people/gentleman.png diff --git a/graphics/event_objects/pics/people/girl_1.png b/graphics/object_events/pics/people/girl_1.png Binary files differindex d0666c1c3..d0666c1c3 100644 --- a/graphics/event_objects/pics/people/girl_1.png +++ b/graphics/object_events/pics/people/girl_1.png diff --git a/graphics/event_objects/pics/people/girl_2.png b/graphics/object_events/pics/people/girl_2.png Binary files differindex fa54bd715..fa54bd715 100644 --- a/graphics/event_objects/pics/people/girl_2.png +++ b/graphics/object_events/pics/people/girl_2.png diff --git a/graphics/event_objects/pics/people/girl_3.png b/graphics/object_events/pics/people/girl_3.png Binary files differindex 7e329f628..7e329f628 100644 --- a/graphics/event_objects/pics/people/girl_3.png +++ b/graphics/object_events/pics/people/girl_3.png diff --git a/graphics/event_objects/pics/people/gym_leaders/brawly.png b/graphics/object_events/pics/people/gym_leaders/brawly.png Binary files differindex 1fdd98b04..1fdd98b04 100644 --- a/graphics/event_objects/pics/people/gym_leaders/brawly.png +++ b/graphics/object_events/pics/people/gym_leaders/brawly.png diff --git a/graphics/event_objects/pics/people/gym_leaders/flannery.png b/graphics/object_events/pics/people/gym_leaders/flannery.png Binary files differindex 3339f2c4b..3339f2c4b 100644 --- a/graphics/event_objects/pics/people/gym_leaders/flannery.png +++ b/graphics/object_events/pics/people/gym_leaders/flannery.png diff --git a/graphics/event_objects/pics/people/gym_leaders/juan.png b/graphics/object_events/pics/people/gym_leaders/juan.png Binary files differindex aa246861a..aa246861a 100644 --- a/graphics/event_objects/pics/people/gym_leaders/juan.png +++ b/graphics/object_events/pics/people/gym_leaders/juan.png diff --git a/graphics/event_objects/pics/people/gym_leaders/liza.png b/graphics/object_events/pics/people/gym_leaders/liza.png Binary files differindex 6a1eec536..6a1eec536 100644 --- a/graphics/event_objects/pics/people/gym_leaders/liza.png +++ b/graphics/object_events/pics/people/gym_leaders/liza.png diff --git a/graphics/event_objects/pics/people/gym_leaders/norman.png b/graphics/object_events/pics/people/gym_leaders/norman.png Binary files differindex 48755d3bd..48755d3bd 100644 --- a/graphics/event_objects/pics/people/gym_leaders/norman.png +++ b/graphics/object_events/pics/people/gym_leaders/norman.png diff --git a/graphics/event_objects/pics/people/gym_leaders/roxanne.png b/graphics/object_events/pics/people/gym_leaders/roxanne.png Binary files differindex c1a1421a0..c1a1421a0 100644 --- a/graphics/event_objects/pics/people/gym_leaders/roxanne.png +++ b/graphics/object_events/pics/people/gym_leaders/roxanne.png diff --git a/graphics/event_objects/pics/people/gym_leaders/tate.png b/graphics/object_events/pics/people/gym_leaders/tate.png Binary files differindex f73ee136b..f73ee136b 100644 --- a/graphics/event_objects/pics/people/gym_leaders/tate.png +++ b/graphics/object_events/pics/people/gym_leaders/tate.png diff --git a/graphics/event_objects/pics/people/gym_leaders/wattson.png b/graphics/object_events/pics/people/gym_leaders/wattson.png Binary files differindex 73ab5e8fc..73ab5e8fc 100644 --- a/graphics/event_objects/pics/people/gym_leaders/wattson.png +++ b/graphics/object_events/pics/people/gym_leaders/wattson.png diff --git a/graphics/event_objects/pics/people/gym_leaders/winona.png b/graphics/object_events/pics/people/gym_leaders/winona.png Binary files differindex 9a1ce83eb..9a1ce83eb 100644 --- a/graphics/event_objects/pics/people/gym_leaders/winona.png +++ b/graphics/object_events/pics/people/gym_leaders/winona.png diff --git a/graphics/event_objects/pics/people/hex_maniac.png b/graphics/object_events/pics/people/hex_maniac.png Binary files differindex b0e3b22a0..b0e3b22a0 100644 --- a/graphics/event_objects/pics/people/hex_maniac.png +++ b/graphics/object_events/pics/people/hex_maniac.png diff --git a/graphics/event_objects/pics/people/hiker.png b/graphics/object_events/pics/people/hiker.png Binary files differindex 8c7b026a1..8c7b026a1 100644 --- a/graphics/event_objects/pics/people/hiker.png +++ b/graphics/object_events/pics/people/hiker.png diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman.png b/graphics/object_events/pics/people/hot_springs_old_woman.png Binary files differindex 874ba8a45..874ba8a45 100644 --- a/graphics/event_objects/pics/people/hot_springs_old_woman.png +++ b/graphics/object_events/pics/people/hot_springs_old_woman.png diff --git a/graphics/event_objects/pics/people/lass.png b/graphics/object_events/pics/people/lass.png Binary files differindex 9e27f70dd..9e27f70dd 100644 --- a/graphics/event_objects/pics/people/lass.png +++ b/graphics/object_events/pics/people/lass.png diff --git a/graphics/event_objects/pics/people/leaf.png b/graphics/object_events/pics/people/leaf.png Binary files differindex d96dd2663..d96dd2663 100644 --- a/graphics/event_objects/pics/people/leaf.png +++ b/graphics/object_events/pics/people/leaf.png diff --git a/graphics/event_objects/pics/people/link_receptionist.png b/graphics/object_events/pics/people/link_receptionist.png Binary files differindex 2ffdd5af6..2ffdd5af6 100644 --- a/graphics/event_objects/pics/people/link_receptionist.png +++ b/graphics/object_events/pics/people/link_receptionist.png diff --git a/graphics/event_objects/pics/people/little_boy.png b/graphics/object_events/pics/people/little_boy.png Binary files differindex 1b62a36d0..1b62a36d0 100644 --- a/graphics/event_objects/pics/people/little_boy.png +++ b/graphics/object_events/pics/people/little_boy.png diff --git a/graphics/event_objects/pics/people/little_girl.png b/graphics/object_events/pics/people/little_girl.png Binary files differindex 2540d84af..2540d84af 100644 --- a/graphics/event_objects/pics/people/little_girl.png +++ b/graphics/object_events/pics/people/little_girl.png diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/object_events/pics/people/man_1.png Binary files differindex 069cb3ed7..069cb3ed7 100644 --- a/graphics/event_objects/pics/people/man_1.png +++ b/graphics/object_events/pics/people/man_1.png diff --git a/graphics/event_objects/pics/people/man_2.png b/graphics/object_events/pics/people/man_2.png Binary files differindex 6c29797ec..6c29797ec 100644 --- a/graphics/event_objects/pics/people/man_2.png +++ b/graphics/object_events/pics/people/man_2.png diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/object_events/pics/people/man_3.png Binary files differindex 05a87d4dd..05a87d4dd 100644 --- a/graphics/event_objects/pics/people/man_3.png +++ b/graphics/object_events/pics/people/man_3.png diff --git a/graphics/event_objects/pics/people/man_4.png b/graphics/object_events/pics/people/man_4.png Binary files differindex 234d67924..234d67924 100644 --- a/graphics/event_objects/pics/people/man_4.png +++ b/graphics/object_events/pics/people/man_4.png diff --git a/graphics/event_objects/pics/people/man_5.png b/graphics/object_events/pics/people/man_5.png Binary files differindex f86aff0e4..f86aff0e4 100644 --- a/graphics/event_objects/pics/people/man_5.png +++ b/graphics/object_events/pics/people/man_5.png diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/object_events/pics/people/maniac.png Binary files differindex 29829c309..29829c309 100644 --- a/graphics/event_objects/pics/people/maniac.png +++ b/graphics/object_events/pics/people/maniac.png diff --git a/graphics/event_objects/pics/people/mart_employee.png b/graphics/object_events/pics/people/mart_employee.png Binary files differindex 43bdfef79..43bdfef79 100644 --- a/graphics/event_objects/pics/people/mart_employee.png +++ b/graphics/object_events/pics/people/mart_employee.png diff --git a/graphics/event_objects/pics/people/mauville_old_man_1.png b/graphics/object_events/pics/people/mauville_old_man_1.png Binary files differindex 200f733b6..200f733b6 100644 --- a/graphics/event_objects/pics/people/mauville_old_man_1.png +++ b/graphics/object_events/pics/people/mauville_old_man_1.png diff --git a/graphics/event_objects/pics/people/mauville_old_man_2.png b/graphics/object_events/pics/people/mauville_old_man_2.png Binary files differindex 6da0c24c4..6da0c24c4 100644 --- a/graphics/event_objects/pics/people/mauville_old_man_2.png +++ b/graphics/object_events/pics/people/mauville_old_man_2.png diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/object_events/pics/people/may/acro_bike.png Binary files differindex 81a35b75a..81a35b75a 100644 --- a/graphics/event_objects/pics/people/may/acro_bike.png +++ b/graphics/object_events/pics/people/may/acro_bike.png diff --git a/graphics/event_objects/pics/people/may/decorating.png b/graphics/object_events/pics/people/may/decorating.png Binary files differindex 8e8e34655..8e8e34655 100644 --- a/graphics/event_objects/pics/people/may/decorating.png +++ b/graphics/object_events/pics/people/may/decorating.png diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/object_events/pics/people/may/field_move.png Binary files differindex 7882009d5..7882009d5 100644 --- a/graphics/event_objects/pics/people/may/field_move.png +++ b/graphics/object_events/pics/people/may/field_move.png diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/object_events/pics/people/may/fishing.png Binary files differindex 69c57f12d..69c57f12d 100644 --- a/graphics/event_objects/pics/people/may/fishing.png +++ b/graphics/object_events/pics/people/may/fishing.png diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/object_events/pics/people/may/mach_bike.png Binary files differindex 14eaf36ea..14eaf36ea 100644 --- a/graphics/event_objects/pics/people/may/mach_bike.png +++ b/graphics/object_events/pics/people/may/mach_bike.png diff --git a/graphics/event_objects/pics/people/may/running.png b/graphics/object_events/pics/people/may/running.png Binary files differindex 54fa079a0..54fa079a0 100644 --- a/graphics/event_objects/pics/people/may/running.png +++ b/graphics/object_events/pics/people/may/running.png diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/object_events/pics/people/may/surfing.png Binary files differindex 758063ab8..758063ab8 100644 --- a/graphics/event_objects/pics/people/may/surfing.png +++ b/graphics/object_events/pics/people/may/surfing.png diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/object_events/pics/people/may/underwater.png Binary files differindex 8c260d932..8c260d932 100644 --- a/graphics/event_objects/pics/people/may/underwater.png +++ b/graphics/object_events/pics/people/may/underwater.png diff --git a/graphics/event_objects/pics/people/may/walking.png b/graphics/object_events/pics/people/may/walking.png Binary files differindex 4b71d1a55..4b71d1a55 100644 --- a/graphics/event_objects/pics/people/may/walking.png +++ b/graphics/object_events/pics/people/may/walking.png diff --git a/graphics/event_objects/pics/people/may/watering.png b/graphics/object_events/pics/people/may/watering.png Binary files differindex 368b6a462..368b6a462 100644 --- a/graphics/event_objects/pics/people/may/watering.png +++ b/graphics/object_events/pics/people/may/watering.png diff --git a/graphics/event_objects/pics/people/mom.png b/graphics/object_events/pics/people/mom.png Binary files differindex 252eccf48..252eccf48 100644 --- a/graphics/event_objects/pics/people/mom.png +++ b/graphics/object_events/pics/people/mom.png diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman.png b/graphics/object_events/pics/people/mystery_event_deliveryman.png Binary files differindex 8c1cbbc6e..8c1cbbc6e 100644 --- a/graphics/event_objects/pics/people/mystery_event_deliveryman.png +++ b/graphics/object_events/pics/people/mystery_event_deliveryman.png diff --git a/graphics/event_objects/pics/people/ninja_boy.png b/graphics/object_events/pics/people/ninja_boy.png Binary files differindex ce4f3e92c..ce4f3e92c 100644 --- a/graphics/event_objects/pics/people/ninja_boy.png +++ b/graphics/object_events/pics/people/ninja_boy.png diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/object_events/pics/people/nurse.png Binary files differindex 6e094f9f1..6e094f9f1 100644 --- a/graphics/event_objects/pics/people/nurse.png +++ b/graphics/object_events/pics/people/nurse.png diff --git a/graphics/event_objects/pics/people/old_man.png b/graphics/object_events/pics/people/old_man.png Binary files differindex fe2a77c6e..fe2a77c6e 100644 --- a/graphics/event_objects/pics/people/old_man.png +++ b/graphics/object_events/pics/people/old_man.png diff --git a/graphics/event_objects/pics/people/old_woman.png b/graphics/object_events/pics/people/old_woman.png Binary files differindex 84a5ba801..84a5ba801 100644 --- a/graphics/event_objects/pics/people/old_woman.png +++ b/graphics/object_events/pics/people/old_woman.png diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/object_events/pics/people/picnicker.png Binary files differindex a15eeb644..a15eeb644 100644 --- a/graphics/event_objects/pics/people/picnicker.png +++ b/graphics/object_events/pics/people/picnicker.png diff --git a/graphics/event_objects/pics/people/pokefan_f.png b/graphics/object_events/pics/people/pokefan_f.png Binary files differindex c97fc3507..c97fc3507 100644 --- a/graphics/event_objects/pics/people/pokefan_f.png +++ b/graphics/object_events/pics/people/pokefan_f.png diff --git a/graphics/event_objects/pics/people/pokefan_m.png b/graphics/object_events/pics/people/pokefan_m.png Binary files differindex a41a1ee9b..a41a1ee9b 100644 --- a/graphics/event_objects/pics/people/pokefan_m.png +++ b/graphics/object_events/pics/people/pokefan_m.png diff --git a/graphics/event_objects/pics/people/prof_birch.png b/graphics/object_events/pics/people/prof_birch.png Binary files differindex d3ea18c31..d3ea18c31 100644 --- a/graphics/event_objects/pics/people/prof_birch.png +++ b/graphics/object_events/pics/people/prof_birch.png diff --git a/graphics/event_objects/pics/people/psychic_m.png b/graphics/object_events/pics/people/psychic_m.png Binary files differindex 3efe5c0af..3efe5c0af 100644 --- a/graphics/event_objects/pics/people/psychic_m.png +++ b/graphics/object_events/pics/people/psychic_m.png diff --git a/graphics/event_objects/pics/people/quinty_plump.png b/graphics/object_events/pics/people/quinty_plump.png Binary files differindex 49d4c7038..49d4c7038 100644 --- a/graphics/event_objects/pics/people/quinty_plump.png +++ b/graphics/object_events/pics/people/quinty_plump.png diff --git a/graphics/event_objects/pics/people/red.png b/graphics/object_events/pics/people/red.png Binary files differindex 7215156c1..7215156c1 100644 --- a/graphics/event_objects/pics/people/red.png +++ b/graphics/object_events/pics/people/red.png diff --git a/graphics/event_objects/pics/people/reporter_f.png b/graphics/object_events/pics/people/reporter_f.png Binary files differindex 289aef6d9..289aef6d9 100644 --- a/graphics/event_objects/pics/people/reporter_f.png +++ b/graphics/object_events/pics/people/reporter_f.png diff --git a/graphics/event_objects/pics/people/reporter_m.png b/graphics/object_events/pics/people/reporter_m.png Binary files differindex 09b2b964e..09b2b964e 100644 --- a/graphics/event_objects/pics/people/reporter_m.png +++ b/graphics/object_events/pics/people/reporter_m.png diff --git a/graphics/event_objects/pics/people/rich_boy.png b/graphics/object_events/pics/people/rich_boy.png Binary files differindex 6536d2c23..6536d2c23 100644 --- a/graphics/event_objects/pics/people/rich_boy.png +++ b/graphics/object_events/pics/people/rich_boy.png diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman.png b/graphics/object_events/pics/people/rooftop_sale_woman.png Binary files differindex f1f9bc72b..f1f9bc72b 100644 --- a/graphics/event_objects/pics/people/rooftop_sale_woman.png +++ b/graphics/object_events/pics/people/rooftop_sale_woman.png diff --git a/graphics/event_objects/pics/people/rs_little_boy.png b/graphics/object_events/pics/people/rs_little_boy.png Binary files differindex 41bc20afb..41bc20afb 100644 --- a/graphics/event_objects/pics/people/rs_little_boy.png +++ b/graphics/object_events/pics/people/rs_little_boy.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png b/graphics/object_events/pics/people/ruby_sapphire_brendan/running.png Binary files differindex 3a4e710f3..3a4e710f3 100644 --- a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png +++ b/graphics/object_events/pics/people/ruby_sapphire_brendan/running.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png b/graphics/object_events/pics/people/ruby_sapphire_brendan/walking.png Binary files differindex 7f3d4bde7..7f3d4bde7 100644 --- a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png +++ b/graphics/object_events/pics/people/ruby_sapphire_brendan/walking.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png b/graphics/object_events/pics/people/ruby_sapphire_may/running.png Binary files differindex 7c546a286..7c546a286 100644 --- a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png +++ b/graphics/object_events/pics/people/ruby_sapphire_may/running.png diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png b/graphics/object_events/pics/people/ruby_sapphire_may/walking.png Binary files differindex 7c600a003..7c600a003 100644 --- a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png +++ b/graphics/object_events/pics/people/ruby_sapphire_may/walking.png diff --git a/graphics/event_objects/pics/people/running_triathlete_f.png b/graphics/object_events/pics/people/running_triathlete_f.png Binary files differindex f95eb2be2..f95eb2be2 100644 --- a/graphics/event_objects/pics/people/running_triathlete_f.png +++ b/graphics/object_events/pics/people/running_triathlete_f.png diff --git a/graphics/event_objects/pics/people/running_triathlete_m.png b/graphics/object_events/pics/people/running_triathlete_m.png Binary files differindex b2b681201..b2b681201 100644 --- a/graphics/event_objects/pics/people/running_triathlete_m.png +++ b/graphics/object_events/pics/people/running_triathlete_m.png diff --git a/graphics/event_objects/pics/people/sailor.png b/graphics/object_events/pics/people/sailor.png Binary files differindex 6c8a867f4..6c8a867f4 100644 --- a/graphics/event_objects/pics/people/sailor.png +++ b/graphics/object_events/pics/people/sailor.png diff --git a/graphics/event_objects/pics/people/school_kid_m.png b/graphics/object_events/pics/people/school_kid_m.png Binary files differindex ddfc28b10..ddfc28b10 100644 --- a/graphics/event_objects/pics/people/school_kid_m.png +++ b/graphics/object_events/pics/people/school_kid_m.png diff --git a/graphics/event_objects/pics/people/scientist_1.png b/graphics/object_events/pics/people/scientist_1.png Binary files differindex 2b1f6605d..2b1f6605d 100644 --- a/graphics/event_objects/pics/people/scientist_1.png +++ b/graphics/object_events/pics/people/scientist_1.png diff --git a/graphics/event_objects/pics/people/scientist_2.png b/graphics/object_events/pics/people/scientist_2.png Binary files differindex ba4759a71..ba4759a71 100644 --- a/graphics/event_objects/pics/people/scientist_2.png +++ b/graphics/object_events/pics/people/scientist_2.png diff --git a/graphics/event_objects/pics/people/scott.png b/graphics/object_events/pics/people/scott.png Binary files differindex 113614f5f..113614f5f 100644 --- a/graphics/event_objects/pics/people/scott.png +++ b/graphics/object_events/pics/people/scott.png diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/object_events/pics/people/steven.png Binary files differindex da692f51d..da692f51d 100644 --- a/graphics/event_objects/pics/people/steven.png +++ b/graphics/object_events/pics/people/steven.png diff --git a/graphics/event_objects/pics/people/swimmer_f.png b/graphics/object_events/pics/people/swimmer_f.png Binary files differindex 962e60a9c..962e60a9c 100644 --- a/graphics/event_objects/pics/people/swimmer_f.png +++ b/graphics/object_events/pics/people/swimmer_f.png diff --git a/graphics/event_objects/pics/people/swimmer_m.png b/graphics/object_events/pics/people/swimmer_m.png Binary files differindex eb1733da8..eb1733da8 100644 --- a/graphics/event_objects/pics/people/swimmer_m.png +++ b/graphics/object_events/pics/people/swimmer_m.png diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/object_events/pics/people/teala.png Binary files differindex cfc47b112..cfc47b112 100644 --- a/graphics/event_objects/pics/people/teala.png +++ b/graphics/object_events/pics/people/teala.png diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png b/graphics/object_events/pics/people/team_aqua/aqua_member_f.png Binary files differindex fab673878..fab673878 100644 --- a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png +++ b/graphics/object_events/pics/people/team_aqua/aqua_member_f.png diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png b/graphics/object_events/pics/people/team_aqua/aqua_member_m.png Binary files differindex 434085954..434085954 100644 --- a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png +++ b/graphics/object_events/pics/people/team_aqua/aqua_member_m.png diff --git a/graphics/event_objects/pics/people/team_aqua/archie.png b/graphics/object_events/pics/people/team_aqua/archie.png Binary files differindex 6ece66e06..6ece66e06 100644 --- a/graphics/event_objects/pics/people/team_aqua/archie.png +++ b/graphics/object_events/pics/people/team_aqua/archie.png diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_f.png b/graphics/object_events/pics/people/team_magma/magma_member_f.png Binary files differindex 60bd8494e..60bd8494e 100644 --- a/graphics/event_objects/pics/people/team_magma/magma_member_f.png +++ b/graphics/object_events/pics/people/team_magma/magma_member_f.png diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_m.png b/graphics/object_events/pics/people/team_magma/magma_member_m.png Binary files differindex f7581bb39..f7581bb39 100644 --- a/graphics/event_objects/pics/people/team_magma/magma_member_m.png +++ b/graphics/object_events/pics/people/team_magma/magma_member_m.png diff --git a/graphics/event_objects/pics/people/team_magma/maxie.png b/graphics/object_events/pics/people/team_magma/maxie.png Binary files differindex cc8b180ed..cc8b180ed 100644 --- a/graphics/event_objects/pics/people/team_magma/maxie.png +++ b/graphics/object_events/pics/people/team_magma/maxie.png diff --git a/graphics/event_objects/pics/people/tuber_f.png b/graphics/object_events/pics/people/tuber_f.png Binary files differindex bfcab635a..bfcab635a 100644 --- a/graphics/event_objects/pics/people/tuber_f.png +++ b/graphics/object_events/pics/people/tuber_f.png diff --git a/graphics/event_objects/pics/people/tuber_m.png b/graphics/object_events/pics/people/tuber_m.png Binary files differindex 48bc3b3b4..48bc3b3b4 100644 --- a/graphics/event_objects/pics/people/tuber_m.png +++ b/graphics/object_events/pics/people/tuber_m.png diff --git a/graphics/event_objects/pics/people/tuber_m_swimming.png b/graphics/object_events/pics/people/tuber_m_swimming.png Binary files differindex 15dedb259..15dedb259 100644 --- a/graphics/event_objects/pics/people/tuber_m_swimming.png +++ b/graphics/object_events/pics/people/tuber_m_swimming.png diff --git a/graphics/event_objects/pics/people/twin.png b/graphics/object_events/pics/people/twin.png Binary files differindex 5ce59ea1b..5ce59ea1b 100644 --- a/graphics/event_objects/pics/people/twin.png +++ b/graphics/object_events/pics/people/twin.png diff --git a/graphics/event_objects/pics/people/union_room_attendant.png b/graphics/object_events/pics/people/union_room_attendant.png Binary files differindex 8e8c3851c..8e8c3851c 100644 --- a/graphics/event_objects/pics/people/union_room_attendant.png +++ b/graphics/object_events/pics/people/union_room_attendant.png diff --git a/graphics/event_objects/pics/people/unused_woman.png b/graphics/object_events/pics/people/unused_woman.png Binary files differindex 395ed1c09..395ed1c09 100644 --- a/graphics/event_objects/pics/people/unused_woman.png +++ b/graphics/object_events/pics/people/unused_woman.png diff --git a/graphics/event_objects/pics/people/wallace.png b/graphics/object_events/pics/people/wallace.png Binary files differindex 2ef1d6050..2ef1d6050 100644 --- a/graphics/event_objects/pics/people/wallace.png +++ b/graphics/object_events/pics/people/wallace.png diff --git a/graphics/event_objects/pics/people/wally.png b/graphics/object_events/pics/people/wally.png Binary files differindex 190ee6713..190ee6713 100644 --- a/graphics/event_objects/pics/people/wally.png +++ b/graphics/object_events/pics/people/wally.png diff --git a/graphics/event_objects/pics/people/woman_1.png b/graphics/object_events/pics/people/woman_1.png Binary files differindex 2207993f7..2207993f7 100644 --- a/graphics/event_objects/pics/people/woman_1.png +++ b/graphics/object_events/pics/people/woman_1.png diff --git a/graphics/event_objects/pics/people/woman_2.png b/graphics/object_events/pics/people/woman_2.png Binary files differindex 8d35b1653..8d35b1653 100644 --- a/graphics/event_objects/pics/people/woman_2.png +++ b/graphics/object_events/pics/people/woman_2.png diff --git a/graphics/event_objects/pics/people/woman_3.png b/graphics/object_events/pics/people/woman_3.png Binary files differindex 2a29acae3..2a29acae3 100644 --- a/graphics/event_objects/pics/people/woman_3.png +++ b/graphics/object_events/pics/people/woman_3.png diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/object_events/pics/people/woman_4.png Binary files differindex 95dfc76da..95dfc76da 100644 --- a/graphics/event_objects/pics/people/woman_4.png +++ b/graphics/object_events/pics/people/woman_4.png diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/object_events/pics/people/woman_5.png Binary files differindex a7750dc4c..a7750dc4c 100644 --- a/graphics/event_objects/pics/people/woman_5.png +++ b/graphics/object_events/pics/people/woman_5.png diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/object_events/pics/people/youngster.png Binary files differindex c17e7c6cf..c17e7c6cf 100644 --- a/graphics/event_objects/pics/people/youngster.png +++ b/graphics/object_events/pics/people/youngster.png diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/object_events/pics/pokemon/azumarill.png Binary files differindex 84b07ea5b..84b07ea5b 100644 --- a/graphics/event_objects/pics/pokemon/azumarill.png +++ b/graphics/object_events/pics/pokemon/azumarill.png diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/object_events/pics/pokemon/azurill.png Binary files differindex 99cd25fe5..99cd25fe5 100644 --- a/graphics/event_objects/pics/pokemon/azurill.png +++ b/graphics/object_events/pics/pokemon/azurill.png diff --git a/graphics/event_objects/pics/pokemon/deoxys.png b/graphics/object_events/pics/pokemon/deoxys.png Binary files differindex 9aa8dc218..9aa8dc218 100644 --- a/graphics/event_objects/pics/pokemon/deoxys.png +++ b/graphics/object_events/pics/pokemon/deoxys.png diff --git a/graphics/event_objects/pics/pokemon/dusclops.png b/graphics/object_events/pics/pokemon/dusclops.png Binary files differindex fb2c85576..fb2c85576 100644 --- a/graphics/event_objects/pics/pokemon/dusclops.png +++ b/graphics/object_events/pics/pokemon/dusclops.png diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png b/graphics/object_events/pics/pokemon/enemy_zigzagoon.png Binary files differindex 2684ad130..2684ad130 100644 --- a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png +++ b/graphics/object_events/pics/pokemon/enemy_zigzagoon.png diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/object_events/pics/pokemon/groudon.png Binary files differindex 3d14c5ac9..3d14c5ac9 100644 --- a/graphics/event_objects/pics/pokemon/groudon.png +++ b/graphics/object_events/pics/pokemon/groudon.png diff --git a/graphics/event_objects/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png Binary files differindex e6c7374e0..e6c7374e0 100644 --- a/graphics/event_objects/pics/pokemon/ho_oh.png +++ b/graphics/object_events/pics/pokemon/ho_oh.png diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/object_events/pics/pokemon/kecleon.png Binary files differindex 47ae584b7..47ae584b7 100644 --- a/graphics/event_objects/pics/pokemon/kecleon.png +++ b/graphics/object_events/pics/pokemon/kecleon.png diff --git a/graphics/event_objects/pics/pokemon/kirlia.png b/graphics/object_events/pics/pokemon/kirlia.png Binary files differindex bac74a9cc..bac74a9cc 100644 --- a/graphics/event_objects/pics/pokemon/kirlia.png +++ b/graphics/object_events/pics/pokemon/kirlia.png diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/object_events/pics/pokemon/kyogre.png Binary files differindex 32f67aafa..32f67aafa 100644 --- a/graphics/event_objects/pics/pokemon/kyogre.png +++ b/graphics/object_events/pics/pokemon/kyogre.png diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/object_events/pics/pokemon/latias_latios.png Binary files differindex 4030d413c..4030d413c 100644 --- a/graphics/event_objects/pics/pokemon/latias_latios.png +++ b/graphics/object_events/pics/pokemon/latias_latios.png diff --git a/graphics/event_objects/pics/pokemon/lugia.png b/graphics/object_events/pics/pokemon/lugia.png Binary files differindex 1dfc6858b..1dfc6858b 100644 --- a/graphics/event_objects/pics/pokemon/lugia.png +++ b/graphics/object_events/pics/pokemon/lugia.png diff --git a/graphics/event_objects/pics/pokemon/mew.png b/graphics/object_events/pics/pokemon/mew.png Binary files differindex 00cbd2779..00cbd2779 100644 --- a/graphics/event_objects/pics/pokemon/mew.png +++ b/graphics/object_events/pics/pokemon/mew.png diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/object_events/pics/pokemon/pikachu.png Binary files differindex b2d15ef17..b2d15ef17 100644 --- a/graphics/event_objects/pics/pokemon/pikachu.png +++ b/graphics/object_events/pics/pokemon/pikachu.png diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/object_events/pics/pokemon/poochyena.png Binary files differindex 171a551d3..171a551d3 100644 --- a/graphics/event_objects/pics/pokemon/poochyena.png +++ b/graphics/object_events/pics/pokemon/poochyena.png diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/object_events/pics/pokemon/rayquaza.png Binary files differindex 9a74dc64f..9a74dc64f 100644 --- a/graphics/event_objects/pics/pokemon/rayquaza.png +++ b/graphics/object_events/pics/pokemon/rayquaza.png diff --git a/graphics/event_objects/pics/pokemon/rayquaza_still.png b/graphics/object_events/pics/pokemon/rayquaza_still.png Binary files differindex 55d638f29..55d638f29 100644 --- a/graphics/event_objects/pics/pokemon/rayquaza_still.png +++ b/graphics/object_events/pics/pokemon/rayquaza_still.png diff --git a/graphics/event_objects/pics/pokemon/regi.png b/graphics/object_events/pics/pokemon/regi.png Binary files differindex c3bb15e57..c3bb15e57 100644 --- a/graphics/event_objects/pics/pokemon/regi.png +++ b/graphics/object_events/pics/pokemon/regi.png diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/object_events/pics/pokemon/skitty.png Binary files differindex 2b7810412..2b7810412 100644 --- a/graphics/event_objects/pics/pokemon/skitty.png +++ b/graphics/object_events/pics/pokemon/skitty.png diff --git a/graphics/event_objects/pics/pokemon/sudowoodo.png b/graphics/object_events/pics/pokemon/sudowoodo.png Binary files differindex 0e084dcc0..0e084dcc0 100644 --- a/graphics/event_objects/pics/pokemon/sudowoodo.png +++ b/graphics/object_events/pics/pokemon/sudowoodo.png diff --git a/graphics/event_objects/pics/pokemon/vigoroth.png b/graphics/object_events/pics/pokemon/vigoroth.png Binary files differindex d9ea6dbed..d9ea6dbed 100644 --- a/graphics/event_objects/pics/pokemon/vigoroth.png +++ b/graphics/object_events/pics/pokemon/vigoroth.png diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/object_events/pics/pokemon/wingull.png Binary files differindex 9401d77f8..9401d77f8 100644 --- a/graphics/event_objects/pics/pokemon/wingull.png +++ b/graphics/object_events/pics/pokemon/wingull.png diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/object_events/pics/pokemon/zigzagoon.png Binary files differindex 2eaf2403d..2eaf2403d 100644 --- a/graphics/event_objects/pics/pokemon/zigzagoon.png +++ b/graphics/object_events/pics/pokemon/zigzagoon.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index fbdb6348c..28351aa90 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -15,7 +15,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine PKNAVGFXDIR := graphics/pokenav PKNAVOPTIONSGFXDIR := graphics/pokenav/options PSSGFXDIR := graphics/pokemon_storage -EVENTOBJGFXDIR := graphics/event_objects +OBJEVENTGFXDIR := graphics/object_events MISCGFXDIR := graphics/misc types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark @@ -644,7 +644,7 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp @cat $^ >$@ -$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 11 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index d77172d0b..b22854ed5 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -16,9 +16,9 @@ void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); -void LoadBattlePyramidEventObjectTemplates(void); -void LoadBattlePyramidFloorEventObjectScripts(void); -u8 GetNumBattlePyramidEventObjects(void); +void LoadBattlePyramidObjectEventTemplates(void); +void LoadBattlePyramidFloorObjectEventScripts(void); +u8 GetNumBattlePyramidObjectEvents(void); u16 GetBattlePyramidPickupItemId(void); #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/battle_setup.h b/include/battle_setup.h index 984c820bb..08fa60155 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -34,8 +34,8 @@ void ChooseStarter(void); void ResetTrainerOpponentIds(void); void SetMapVarsToTrainer(void); const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); -void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript); -void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript); +void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerScript); +void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript); void SetUpTwoTrainersBattle(void); bool32 GetTrainerFlagFromScriptPointer(const u8 *data); void SetUpTrainerMovement(void); diff --git a/include/berry.h b/include/berry.h index ebe1e9a38..afd1bc499 100644 --- a/include/berry.h +++ b/include/berry.h @@ -6,7 +6,7 @@ void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); -bool32 EventObjectInteractionWaterBerryTree(void); +bool32 ObjectEventInteractionWaterBerryTree(void); bool8 IsPlayerFacingEmptyBerryTreePatch(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -19,10 +19,10 @@ u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); void Bag_ChooseBerry(void); -void EventObjectInteractionGetBerryTreeData(void); -void EventObjectInteractionPlantBerryTree(void); -void EventObjectInteractionPickBerryTree(void); -void EventObjectInteractionRemoveBerryTree(void); +void ObjectEventInteractionGetBerryTreeData(void); +void ObjectEventInteractionPlantBerryTree(void); +void ObjectEventInteractionPickBerryTree(void); +void ObjectEventInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); diff --git a/include/constants/coins.h b/include/constants/coins.h index fd68f3f9e..3ae3bb23f 100644 --- a/include/constants/coins.h +++ b/include/constants/coins.h @@ -3,4 +3,4 @@ #define MAX_COINS 9999 -#endif // GUARD_CONSTANTS_COINS_H
\ No newline at end of file +#endif // GUARD_CONSTANTS_COINS_H diff --git a/include/constants/bg_event_constants.h b/include/constants/event_bg.h index a915bc509..64f3331b8 100755 --- a/include/constants/bg_event_constants.h +++ b/include/constants/event_bg.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_BG_EVENT_H -#define GUARD_CONSTANTS_BG_EVENT_H +#ifndef GUARD_CONSTANTS_EVENT_BG_H +#define GUARD_CONSTANTS_EVENT_BG_H #define BG_EVENT_PLAYER_FACING_ANY 0 #define BG_EVENT_PLAYER_FACING_NORTH 1 @@ -10,4 +10,4 @@ #define BG_EVENT_HIDDEN_ITEM 7 #define BG_EVENT_SECRET_BASE 8 -#endif // GUARD_CONSTANTS_BG_EVENT_H +#endif // GUARD_CONSTANTS_EVENT_BG_H diff --git a/include/constants/event_object_movement_constants.h b/include/constants/event_object_movement.h index ed6f6c7fb..6a4405b65 100755 --- a/include/constants/event_object_movement_constants.h +++ b/include/constants/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_CONSTANTS_EVENTOBJMV_H -#define GUARD_CONSTANTS_EVENTOBJMV_H +#ifndef GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H +#define GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H #define MOVEMENT_TYPE_NONE 0x0 #define MOVEMENT_TYPE_LOOK_AROUND 0x1 @@ -244,4 +244,4 @@ #define MOVEMENT_ACTION_STEP_END 0xFE -#endif // GUARD_CONSTANTS_EVENTOBJMV_H +#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 07ed2d40c..83d9f6e4e 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,266 +1,266 @@ #ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H #define GUARD_CONSTANTS_EVENT_OBJECTS_H -#define EVENT_OBJ_GFX_BRENDAN_NORMAL 0 -#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE 1 -#define EVENT_OBJ_GFX_BRENDAN_SURFING 2 -#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3 -#define EVENT_OBJ_GFX_QUINTY_PLUMP 4 -#define EVENT_OBJ_GFX_NINJA_BOY 5 -#define EVENT_OBJ_GFX_TWIN 6 -#define EVENT_OBJ_GFX_BOY_1 7 -#define EVENT_OBJ_GFX_GIRL_1 8 -#define EVENT_OBJ_GFX_BOY_2 9 -#define EVENT_OBJ_GFX_GIRL_2 10 -#define EVENT_OBJ_GFX_LITTLE_BOY 11 -#define EVENT_OBJ_GFX_LITTLE_GIRL 12 -#define EVENT_OBJ_GFX_BOY_3 13 -#define EVENT_OBJ_GFX_GIRL_3 14 -#define EVENT_OBJ_GFX_RICH_BOY 15 -#define EVENT_OBJ_GFX_WOMAN_1 16 -#define EVENT_OBJ_GFX_FAT_MAN 17 -#define EVENT_OBJ_GFX_POKEFAN_F 18 -#define EVENT_OBJ_GFX_MAN_1 19 -#define EVENT_OBJ_GFX_WOMAN_2 20 -#define EVENT_OBJ_GFX_EXPERT_M 21 -#define EVENT_OBJ_GFX_EXPERT_F 22 -#define EVENT_OBJ_GFX_MAN_2 23 -#define EVENT_OBJ_GFX_WOMAN_3 24 -#define EVENT_OBJ_GFX_POKEFAN_M 25 -#define EVENT_OBJ_GFX_WOMAN_4 26 -#define EVENT_OBJ_GFX_COOK 27 -#define EVENT_OBJ_GFX_LINK_RECEPTIONIST 28 -#define EVENT_OBJ_GFX_OLD_MAN 29 -#define EVENT_OBJ_GFX_OLD_WOMAN 30 -#define EVENT_OBJ_GFX_CAMPER 31 -#define EVENT_OBJ_GFX_PICNICKER 32 -#define EVENT_OBJ_GFX_MAN_3 33 -#define EVENT_OBJ_GFX_WOMAN_5 34 -#define EVENT_OBJ_GFX_YOUNGSTER 35 -#define EVENT_OBJ_GFX_BUG_CATCHER 36 -#define EVENT_OBJ_GFX_PSYCHIC_M 37 -#define EVENT_OBJ_GFX_SCHOOL_KID_M 38 -#define EVENT_OBJ_GFX_MANIAC 39 -#define EVENT_OBJ_GFX_HEX_MANIAC 40 -#define EVENT_OBJ_GFX_RAYQUAZA_1 41 -#define EVENT_OBJ_GFX_SWIMMER_M 42 -#define EVENT_OBJ_GFX_SWIMMER_F 43 -#define EVENT_OBJ_GFX_BLACK_BELT 44 -#define EVENT_OBJ_GFX_BEAUTY 45 -#define EVENT_OBJ_GFX_SCIENTIST_1 46 -#define EVENT_OBJ_GFX_LASS 47 -#define EVENT_OBJ_GFX_GENTLEMAN 48 -#define EVENT_OBJ_GFX_SAILOR 49 -#define EVENT_OBJ_GFX_FISHERMAN 50 -#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M 51 -#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F 52 -#define EVENT_OBJ_GFX_TUBER_F 53 -#define EVENT_OBJ_GFX_TUBER_M 54 -#define EVENT_OBJ_GFX_HIKER 55 -#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M 56 -#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F 57 -#define EVENT_OBJ_GFX_NURSE 58 -#define EVENT_OBJ_GFX_ITEM_BALL 59 -#define EVENT_OBJ_GFX_BERRY_TREE 60 -#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61 -#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62 -#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63 -#define EVENT_OBJ_GFX_PROF_BIRCH 64 -#define EVENT_OBJ_GFX_MAN_4 65 -#define EVENT_OBJ_GFX_MAN_5 66 -#define EVENT_OBJ_GFX_REPORTER_M 67 -#define EVENT_OBJ_GFX_REPORTER_F 68 -#define EVENT_OBJ_GFX_BARD 69 -#define EVENT_OBJ_GFX_ANABEL 70 -#define EVENT_OBJ_GFX_TUCKER 71 -#define EVENT_OBJ_GFX_GRETA 72 -#define EVENT_OBJ_GFX_SPENSER 73 -#define EVENT_OBJ_GFX_NOLAND 74 -#define EVENT_OBJ_GFX_LUCY 75 -#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL 76 -#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77 -#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78 -#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79 -#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80 -#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL 81 -#define EVENT_OBJ_GFX_CUTTABLE_TREE 82 -#define EVENT_OBJ_GFX_MART_EMPLOYEE 83 -#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN 84 -#define EVENT_OBJ_GFX_TEALA 85 -#define EVENT_OBJ_GFX_BREAKABLE_ROCK 86 -#define EVENT_OBJ_GFX_PUSHABLE_BOULDER 87 -#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT 88 -#define EVENT_OBJ_GFX_MAY_NORMAL 89 -#define EVENT_OBJ_GFX_MAY_MACH_BIKE 90 -#define EVENT_OBJ_GFX_MAY_ACRO_BIKE 91 -#define EVENT_OBJ_GFX_MAY_SURFING 92 -#define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93 -#define EVENT_OBJ_GFX_TRUCK 94 -#define EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX 95 -#define EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY 96 -#define EVENT_OBJ_GFX_BIRCHS_BAG 97 -#define EVENT_OBJ_GFX_ZIGZAGOON_1 98 -#define EVENT_OBJ_GFX_ARTIST 99 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING 103 -#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 -#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL 105 -#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106 -#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107 -#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING 108 -#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109 -#define EVENT_OBJ_GFX_CAMERAMAN 110 -#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER 111 -#define EVENT_OBJ_GFX_MAY_UNDERWATER 112 -#define EVENT_OBJ_GFX_MOVING_BOX 113 -#define EVENT_OBJ_GFX_CABLE_CAR 114 -#define EVENT_OBJ_GFX_SCIENTIST_2 115 -#define EVENT_OBJ_GFX_DEVON_EMPLOYEE 116 -#define EVENT_OBJ_GFX_AQUA_MEMBER_M 117 -#define EVENT_OBJ_GFX_AQUA_MEMBER_F 118 -#define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119 -#define EVENT_OBJ_GFX_MAGMA_MEMBER_F 120 -#define EVENT_OBJ_GFX_SIDNEY 121 -#define EVENT_OBJ_GFX_PHOEBE 122 -#define EVENT_OBJ_GFX_GLACIA 123 -#define EVENT_OBJ_GFX_DRAKE 124 -#define EVENT_OBJ_GFX_ROXANNE 125 -#define EVENT_OBJ_GFX_BRAWLY 126 -#define EVENT_OBJ_GFX_WATTSON 127 -#define EVENT_OBJ_GFX_FLANNERY 128 -#define EVENT_OBJ_GFX_NORMAN 129 -#define EVENT_OBJ_GFX_WINONA 130 -#define EVENT_OBJ_GFX_LIZA 131 -#define EVENT_OBJ_GFX_TATE 132 -#define EVENT_OBJ_GFX_WALLACE 133 -#define EVENT_OBJ_GFX_STEVEN 134 -#define EVENT_OBJ_GFX_WALLY 135 -#define EVENT_OBJ_GFX_LITTLE_BOY_3 136 -#define EVENT_OBJ_GFX_BRENDAN_FISHING 137 -#define EVENT_OBJ_GFX_MAY_FISHING 138 -#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139 -#define EVENT_OBJ_GFX_SS_TIDAL 140 -#define EVENT_OBJ_GFX_SUBMARINE_SHADOW 141 -#define EVENT_OBJ_GFX_PICHU_DOLL 142 -#define EVENT_OBJ_GFX_PIKACHU_DOLL 143 -#define EVENT_OBJ_GFX_MARILL_DOLL 144 -#define EVENT_OBJ_GFX_TOGEPI_DOLL 145 -#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL 146 -#define EVENT_OBJ_GFX_CHIKORITA_DOLL 147 -#define EVENT_OBJ_GFX_TOTODILE_DOLL 148 -#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL 149 -#define EVENT_OBJ_GFX_MEOWTH_DOLL 150 -#define EVENT_OBJ_GFX_CLEFAIRY_DOLL 151 -#define EVENT_OBJ_GFX_DITTO_DOLL 152 -#define EVENT_OBJ_GFX_SMOOCHUM_DOLL 153 -#define EVENT_OBJ_GFX_TREECKO_DOLL 154 -#define EVENT_OBJ_GFX_TORCHIC_DOLL 155 -#define EVENT_OBJ_GFX_MUDKIP_DOLL 156 -#define EVENT_OBJ_GFX_DUSKULL_DOLL 157 -#define EVENT_OBJ_GFX_WYNAUT_DOLL 158 -#define EVENT_OBJ_GFX_BALTOY_DOLL 159 -#define EVENT_OBJ_GFX_KECLEON_DOLL 160 -#define EVENT_OBJ_GFX_AZURILL_DOLL 161 -#define EVENT_OBJ_GFX_SKITTY_DOLL 162 -#define EVENT_OBJ_GFX_SWABLU_DOLL 163 -#define EVENT_OBJ_GFX_GULPIN_DOLL 164 -#define EVENT_OBJ_GFX_LOTAD_DOLL 165 -#define EVENT_OBJ_GFX_SEEDOT_DOLL 166 -#define EVENT_OBJ_GFX_PIKA_CUSHION 167 -#define EVENT_OBJ_GFX_ROUND_CUSHION 168 -#define EVENT_OBJ_GFX_KISS_CUSHION 169 -#define EVENT_OBJ_GFX_ZIGZAG_CUSHION 170 -#define EVENT_OBJ_GFX_SPIN_CUSHION 171 -#define EVENT_OBJ_GFX_DIAMOND_CUSHION 172 -#define EVENT_OBJ_GFX_BALL_CUSHION 173 -#define EVENT_OBJ_GFX_GRASS_CUSHION 174 -#define EVENT_OBJ_GFX_FIRE_CUSHION 175 -#define EVENT_OBJ_GFX_WATER_CUSHION 176 -#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL 177 -#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL 178 -#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL 179 -#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL 180 -#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL 181 -#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL 182 -#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL 183 -#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL 184 -#define EVENT_OBJ_GFX_BIG_REGICE_DOLL 185 -#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186 -#define EVENT_OBJ_GFX_LATIAS 187 -#define EVENT_OBJ_GFX_LATIOS 188 -#define EVENT_OBJ_GFX_GAMEBOY_KID 189 -#define EVENT_OBJ_GFX_CONTEST_JUDGE 190 -#define EVENT_OBJ_GFX_BRENDAN_WATERING 191 -#define EVENT_OBJ_GFX_MAY_WATERING 192 -#define EVENT_OBJ_GFX_BRENDAN_DECORATING 193 -#define EVENT_OBJ_GFX_MAY_DECORATING 194 -#define EVENT_OBJ_GFX_ARCHIE 195 -#define EVENT_OBJ_GFX_MAXIE 196 -#define EVENT_OBJ_GFX_KYOGRE_1 197 -#define EVENT_OBJ_GFX_GROUDON_1 198 -#define EVENT_OBJ_GFX_FOSSIL 199 -#define EVENT_OBJ_GFX_REGIROCK 200 -#define EVENT_OBJ_GFX_REGICE 201 -#define EVENT_OBJ_GFX_REGISTEEL 202 -#define EVENT_OBJ_GFX_SKITTY 203 -#define EVENT_OBJ_GFX_KECLEON_1 204 -#define EVENT_OBJ_GFX_KYOGRE_2 205 -#define EVENT_OBJ_GFX_GROUDON_2 206 -#define EVENT_OBJ_GFX_RAYQUAZA_2 207 -#define EVENT_OBJ_GFX_ZIGZAGOON_2 208 -#define EVENT_OBJ_GFX_PIKACHU 209 -#define EVENT_OBJ_GFX_AZUMARILL 210 -#define EVENT_OBJ_GFX_WINGULL 211 -#define EVENT_OBJ_GFX_KECLEON_2 212 -#define EVENT_OBJ_GFX_TUBER_M_SWIMMING 213 -#define EVENT_OBJ_GFX_AZURILL 214 -#define EVENT_OBJ_GFX_MOM 215 -#define EVENT_OBJ_GFX_LINK_BRENDAN 216 -#define EVENT_OBJ_GFX_LINK_MAY 217 -#define EVENT_OBJ_GFX_JUAN 218 -#define EVENT_OBJ_GFX_SCOTT 219 -#define EVENT_OBJ_GFX_POOCHYENA 220 -#define EVENT_OBJ_GFX_KYOGRE_3 221 -#define EVENT_OBJ_GFX_GROUDON_3 222 -#define EVENT_OBJ_GFX_MYSTERY_GIFT_MAN 223 -#define EVENT_OBJ_GFX_TRICK_HOUSE_STATUE 224 -#define EVENT_OBJ_GFX_KIRLIA 225 -#define EVENT_OBJ_GFX_DUSCLOPS 226 -#define EVENT_OBJ_GFX_UNION_ROOM_NURSE 227 -#define EVENT_OBJ_GFX_SUDOWOODO 228 -#define EVENT_OBJ_GFX_MEW 229 -#define EVENT_OBJ_GFX_RED 230 -#define EVENT_OBJ_GFX_LEAF 231 -#define EVENT_OBJ_GFX_DEOXYS 232 -#define EVENT_OBJ_GFX_DEOXYS_TRIANGLE 233 -#define EVENT_OBJ_GFX_BRANDON 234 -#define EVENT_OBJ_GFX_LINK_RS_BRENDAN 235 -#define EVENT_OBJ_GFX_LINK_RS_MAY 236 -#define EVENT_OBJ_GFX_LUGIA 237 -#define EVENT_OBJ_GFX_HOOH 238 -#define EVENT_OBJ_GFX_BARD_2 239 +#define OBJ_EVENT_GFX_BRENDAN_NORMAL 0 +#define OBJ_EVENT_GFX_BRENDAN_MACH_BIKE 1 +#define OBJ_EVENT_GFX_BRENDAN_SURFING 2 +#define OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE 3 +#define OBJ_EVENT_GFX_QUINTY_PLUMP 4 +#define OBJ_EVENT_GFX_NINJA_BOY 5 +#define OBJ_EVENT_GFX_TWIN 6 +#define OBJ_EVENT_GFX_BOY_1 7 +#define OBJ_EVENT_GFX_GIRL_1 8 +#define OBJ_EVENT_GFX_BOY_2 9 +#define OBJ_EVENT_GFX_GIRL_2 10 +#define OBJ_EVENT_GFX_LITTLE_BOY 11 +#define OBJ_EVENT_GFX_LITTLE_GIRL 12 +#define OBJ_EVENT_GFX_BOY_3 13 +#define OBJ_EVENT_GFX_GIRL_3 14 +#define OBJ_EVENT_GFX_RICH_BOY 15 +#define OBJ_EVENT_GFX_WOMAN_1 16 +#define OBJ_EVENT_GFX_FAT_MAN 17 +#define OBJ_EVENT_GFX_POKEFAN_F 18 +#define OBJ_EVENT_GFX_MAN_1 19 +#define OBJ_EVENT_GFX_WOMAN_2 20 +#define OBJ_EVENT_GFX_EXPERT_M 21 +#define OBJ_EVENT_GFX_EXPERT_F 22 +#define OBJ_EVENT_GFX_MAN_2 23 +#define OBJ_EVENT_GFX_WOMAN_3 24 +#define OBJ_EVENT_GFX_POKEFAN_M 25 +#define OBJ_EVENT_GFX_WOMAN_4 26 +#define OBJ_EVENT_GFX_COOK 27 +#define OBJ_EVENT_GFX_LINK_RECEPTIONIST 28 +#define OBJ_EVENT_GFX_OLD_MAN 29 +#define OBJ_EVENT_GFX_OLD_WOMAN 30 +#define OBJ_EVENT_GFX_CAMPER 31 +#define OBJ_EVENT_GFX_PICNICKER 32 +#define OBJ_EVENT_GFX_MAN_3 33 +#define OBJ_EVENT_GFX_WOMAN_5 34 +#define OBJ_EVENT_GFX_YOUNGSTER 35 +#define OBJ_EVENT_GFX_BUG_CATCHER 36 +#define OBJ_EVENT_GFX_PSYCHIC_M 37 +#define OBJ_EVENT_GFX_SCHOOL_KID_M 38 +#define OBJ_EVENT_GFX_MANIAC 39 +#define OBJ_EVENT_GFX_HEX_MANIAC 40 +#define OBJ_EVENT_GFX_RAYQUAZA_1 41 +#define OBJ_EVENT_GFX_SWIMMER_M 42 +#define OBJ_EVENT_GFX_SWIMMER_F 43 +#define OBJ_EVENT_GFX_BLACK_BELT 44 +#define OBJ_EVENT_GFX_BEAUTY 45 +#define OBJ_EVENT_GFX_SCIENTIST_1 46 +#define OBJ_EVENT_GFX_LASS 47 +#define OBJ_EVENT_GFX_GENTLEMAN 48 +#define OBJ_EVENT_GFX_SAILOR 49 +#define OBJ_EVENT_GFX_FISHERMAN 50 +#define OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M 51 +#define OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F 52 +#define OBJ_EVENT_GFX_TUBER_F 53 +#define OBJ_EVENT_GFX_TUBER_M 54 +#define OBJ_EVENT_GFX_HIKER 55 +#define OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M 56 +#define OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F 57 +#define OBJ_EVENT_GFX_NURSE 58 +#define OBJ_EVENT_GFX_ITEM_BALL 59 +#define OBJ_EVENT_GFX_BERRY_TREE 60 +#define OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES 61 +#define OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES 62 +#define OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE 63 +#define OBJ_EVENT_GFX_PROF_BIRCH 64 +#define OBJ_EVENT_GFX_MAN_4 65 +#define OBJ_EVENT_GFX_MAN_5 66 +#define OBJ_EVENT_GFX_REPORTER_M 67 +#define OBJ_EVENT_GFX_REPORTER_F 68 +#define OBJ_EVENT_GFX_BARD 69 +#define OBJ_EVENT_GFX_ANABEL 70 +#define OBJ_EVENT_GFX_TUCKER 71 +#define OBJ_EVENT_GFX_GRETA 72 +#define OBJ_EVENT_GFX_SPENSER 73 +#define OBJ_EVENT_GFX_NOLAND 74 +#define OBJ_EVENT_GFX_LUCY 75 +#define OBJ_EVENT_GFX_UNUSED_NATU_DOLL 76 +#define OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL 77 +#define OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL 78 +#define OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL 79 +#define OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL 80 +#define OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL 81 +#define OBJ_EVENT_GFX_CUTTABLE_TREE 82 +#define OBJ_EVENT_GFX_MART_EMPLOYEE 83 +#define OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN 84 +#define OBJ_EVENT_GFX_TEALA 85 +#define OBJ_EVENT_GFX_BREAKABLE_ROCK 86 +#define OBJ_EVENT_GFX_PUSHABLE_BOULDER 87 +#define OBJ_EVENT_GFX_MR_BRINEYS_BOAT 88 +#define OBJ_EVENT_GFX_MAY_NORMAL 89 +#define OBJ_EVENT_GFX_MAY_MACH_BIKE 90 +#define OBJ_EVENT_GFX_MAY_ACRO_BIKE 91 +#define OBJ_EVENT_GFX_MAY_SURFING 92 +#define OBJ_EVENT_GFX_MAY_FIELD_MOVE 93 +#define OBJ_EVENT_GFX_TRUCK 94 +#define OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX 95 +#define OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY 96 +#define OBJ_EVENT_GFX_BIRCHS_BAG 97 +#define OBJ_EVENT_GFX_ZIGZAGOON_1 98 +#define OBJ_EVENT_GFX_ARTIST 99 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL 100 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE 101 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE 102 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING 103 +#define OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE 104 +#define OBJ_EVENT_GFX_RIVAL_MAY_NORMAL 105 +#define OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE 106 +#define OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE 107 +#define OBJ_EVENT_GFX_RIVAL_MAY_SURFING 108 +#define OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE 109 +#define OBJ_EVENT_GFX_CAMERAMAN 110 +#define OBJ_EVENT_GFX_BRENDAN_UNDERWATER 111 +#define OBJ_EVENT_GFX_MAY_UNDERWATER 112 +#define OBJ_EVENT_GFX_MOVING_BOX 113 +#define OBJ_EVENT_GFX_CABLE_CAR 114 +#define OBJ_EVENT_GFX_SCIENTIST_2 115 +#define OBJ_EVENT_GFX_DEVON_EMPLOYEE 116 +#define OBJ_EVENT_GFX_AQUA_MEMBER_M 117 +#define OBJ_EVENT_GFX_AQUA_MEMBER_F 118 +#define OBJ_EVENT_GFX_MAGMA_MEMBER_M 119 +#define OBJ_EVENT_GFX_MAGMA_MEMBER_F 120 +#define OBJ_EVENT_GFX_SIDNEY 121 +#define OBJ_EVENT_GFX_PHOEBE 122 +#define OBJ_EVENT_GFX_GLACIA 123 +#define OBJ_EVENT_GFX_DRAKE 124 +#define OBJ_EVENT_GFX_ROXANNE 125 +#define OBJ_EVENT_GFX_BRAWLY 126 +#define OBJ_EVENT_GFX_WATTSON 127 +#define OBJ_EVENT_GFX_FLANNERY 128 +#define OBJ_EVENT_GFX_NORMAN 129 +#define OBJ_EVENT_GFX_WINONA 130 +#define OBJ_EVENT_GFX_LIZA 131 +#define OBJ_EVENT_GFX_TATE 132 +#define OBJ_EVENT_GFX_WALLACE 133 +#define OBJ_EVENT_GFX_STEVEN 134 +#define OBJ_EVENT_GFX_WALLY 135 +#define OBJ_EVENT_GFX_LITTLE_BOY_3 136 +#define OBJ_EVENT_GFX_BRENDAN_FISHING 137 +#define OBJ_EVENT_GFX_MAY_FISHING 138 +#define OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN 139 +#define OBJ_EVENT_GFX_SS_TIDAL 140 +#define OBJ_EVENT_GFX_SUBMARINE_SHADOW 141 +#define OBJ_EVENT_GFX_PICHU_DOLL 142 +#define OBJ_EVENT_GFX_PIKACHU_DOLL 143 +#define OBJ_EVENT_GFX_MARILL_DOLL 144 +#define OBJ_EVENT_GFX_TOGEPI_DOLL 145 +#define OBJ_EVENT_GFX_CYNDAQUIL_DOLL 146 +#define OBJ_EVENT_GFX_CHIKORITA_DOLL 147 +#define OBJ_EVENT_GFX_TOTODILE_DOLL 148 +#define OBJ_EVENT_GFX_JIGGLYPUFF_DOLL 149 +#define OBJ_EVENT_GFX_MEOWTH_DOLL 150 +#define OBJ_EVENT_GFX_CLEFAIRY_DOLL 151 +#define OBJ_EVENT_GFX_DITTO_DOLL 152 +#define OBJ_EVENT_GFX_SMOOCHUM_DOLL 153 +#define OBJ_EVENT_GFX_TREECKO_DOLL 154 +#define OBJ_EVENT_GFX_TORCHIC_DOLL 155 +#define OBJ_EVENT_GFX_MUDKIP_DOLL 156 +#define OBJ_EVENT_GFX_DUSKULL_DOLL 157 +#define OBJ_EVENT_GFX_WYNAUT_DOLL 158 +#define OBJ_EVENT_GFX_BALTOY_DOLL 159 +#define OBJ_EVENT_GFX_KECLEON_DOLL 160 +#define OBJ_EVENT_GFX_AZURILL_DOLL 161 +#define OBJ_EVENT_GFX_SKITTY_DOLL 162 +#define OBJ_EVENT_GFX_SWABLU_DOLL 163 +#define OBJ_EVENT_GFX_GULPIN_DOLL 164 +#define OBJ_EVENT_GFX_LOTAD_DOLL 165 +#define OBJ_EVENT_GFX_SEEDOT_DOLL 166 +#define OBJ_EVENT_GFX_PIKA_CUSHION 167 +#define OBJ_EVENT_GFX_ROUND_CUSHION 168 +#define OBJ_EVENT_GFX_KISS_CUSHION 169 +#define OBJ_EVENT_GFX_ZIGZAG_CUSHION 170 +#define OBJ_EVENT_GFX_SPIN_CUSHION 171 +#define OBJ_EVENT_GFX_DIAMOND_CUSHION 172 +#define OBJ_EVENT_GFX_BALL_CUSHION 173 +#define OBJ_EVENT_GFX_GRASS_CUSHION 174 +#define OBJ_EVENT_GFX_FIRE_CUSHION 175 +#define OBJ_EVENT_GFX_WATER_CUSHION 176 +#define OBJ_EVENT_GFX_BIG_SNORLAX_DOLL 177 +#define OBJ_EVENT_GFX_BIG_RHYDON_DOLL 178 +#define OBJ_EVENT_GFX_BIG_LAPRAS_DOLL 179 +#define OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL 180 +#define OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL 181 +#define OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL 182 +#define OBJ_EVENT_GFX_BIG_WAILMER_DOLL 183 +#define OBJ_EVENT_GFX_BIG_REGIROCK_DOLL 184 +#define OBJ_EVENT_GFX_BIG_REGICE_DOLL 185 +#define OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL 186 +#define OBJ_EVENT_GFX_LATIAS 187 +#define OBJ_EVENT_GFX_LATIOS 188 +#define OBJ_EVENT_GFX_GAMEBOY_KID 189 +#define OBJ_EVENT_GFX_CONTEST_JUDGE 190 +#define OBJ_EVENT_GFX_BRENDAN_WATERING 191 +#define OBJ_EVENT_GFX_MAY_WATERING 192 +#define OBJ_EVENT_GFX_BRENDAN_DECORATING 193 +#define OBJ_EVENT_GFX_MAY_DECORATING 194 +#define OBJ_EVENT_GFX_ARCHIE 195 +#define OBJ_EVENT_GFX_MAXIE 196 +#define OBJ_EVENT_GFX_KYOGRE_1 197 +#define OBJ_EVENT_GFX_GROUDON_1 198 +#define OBJ_EVENT_GFX_FOSSIL 199 +#define OBJ_EVENT_GFX_REGIROCK 200 +#define OBJ_EVENT_GFX_REGICE 201 +#define OBJ_EVENT_GFX_REGISTEEL 202 +#define OBJ_EVENT_GFX_SKITTY 203 +#define OBJ_EVENT_GFX_KECLEON_1 204 +#define OBJ_EVENT_GFX_KYOGRE_2 205 +#define OBJ_EVENT_GFX_GROUDON_2 206 +#define OBJ_EVENT_GFX_RAYQUAZA_2 207 +#define OBJ_EVENT_GFX_ZIGZAGOON_2 208 +#define OBJ_EVENT_GFX_PIKACHU 209 +#define OBJ_EVENT_GFX_AZUMARILL 210 +#define OBJ_EVENT_GFX_WINGULL 211 +#define OBJ_EVENT_GFX_KECLEON_2 212 +#define OBJ_EVENT_GFX_TUBER_M_SWIMMING 213 +#define OBJ_EVENT_GFX_AZURILL 214 +#define OBJ_EVENT_GFX_MOM 215 +#define OBJ_EVENT_GFX_LINK_BRENDAN 216 +#define OBJ_EVENT_GFX_LINK_MAY 217 +#define OBJ_EVENT_GFX_JUAN 218 +#define OBJ_EVENT_GFX_SCOTT 219 +#define OBJ_EVENT_GFX_POOCHYENA 220 +#define OBJ_EVENT_GFX_KYOGRE_3 221 +#define OBJ_EVENT_GFX_GROUDON_3 222 +#define OBJ_EVENT_GFX_MYSTERY_GIFT_MAN 223 +#define OBJ_EVENT_GFX_TRICK_HOUSE_STATUE 224 +#define OBJ_EVENT_GFX_KIRLIA 225 +#define OBJ_EVENT_GFX_DUSCLOPS 226 +#define OBJ_EVENT_GFX_UNION_ROOM_NURSE 227 +#define OBJ_EVENT_GFX_SUDOWOODO 228 +#define OBJ_EVENT_GFX_MEW 229 +#define OBJ_EVENT_GFX_RED 230 +#define OBJ_EVENT_GFX_LEAF 231 +#define OBJ_EVENT_GFX_DEOXYS 232 +#define OBJ_EVENT_GFX_DEOXYS_TRIANGLE 233 +#define OBJ_EVENT_GFX_BRANDON 234 +#define OBJ_EVENT_GFX_LINK_RS_BRENDAN 235 +#define OBJ_EVENT_GFX_LINK_RS_MAY 236 +#define OBJ_EVENT_GFX_LUGIA 237 +#define OBJ_EVENT_GFX_HOOH 238 +#define OBJ_EVENT_GFX_BARD_2 239 // These are dynamic object gfx ids. // They correspond with the values of the VAR_OBJ_GFX_ID_X vars. // More info about them in include/constants/vars.h -#define EVENT_OBJ_GFX_VAR_0 240 -#define EVENT_OBJ_GFX_VAR_1 241 -#define EVENT_OBJ_GFX_VAR_2 242 -#define EVENT_OBJ_GFX_VAR_3 243 -#define EVENT_OBJ_GFX_VAR_4 244 -#define EVENT_OBJ_GFX_VAR_5 245 -#define EVENT_OBJ_GFX_VAR_6 246 -#define EVENT_OBJ_GFX_VAR_7 247 -#define EVENT_OBJ_GFX_VAR_8 248 -#define EVENT_OBJ_GFX_VAR_9 249 -#define EVENT_OBJ_GFX_VAR_A 250 -#define EVENT_OBJ_GFX_VAR_B 251 -#define EVENT_OBJ_GFX_VAR_C 252 -#define EVENT_OBJ_GFX_VAR_D 253 -#define EVENT_OBJ_GFX_VAR_E 254 -#define EVENT_OBJ_GFX_VAR_F 255 +#define OBJ_EVENT_GFX_VAR_0 240 +#define OBJ_EVENT_GFX_VAR_1 241 +#define OBJ_EVENT_GFX_VAR_2 242 +#define OBJ_EVENT_GFX_VAR_3 243 +#define OBJ_EVENT_GFX_VAR_4 244 +#define OBJ_EVENT_GFX_VAR_5 245 +#define OBJ_EVENT_GFX_VAR_6 246 +#define OBJ_EVENT_GFX_VAR_7 247 +#define OBJ_EVENT_GFX_VAR_8 248 +#define OBJ_EVENT_GFX_VAR_9 249 +#define OBJ_EVENT_GFX_VAR_A 250 +#define OBJ_EVENT_GFX_VAR_B 251 +#define OBJ_EVENT_GFX_VAR_C 252 +#define OBJ_EVENT_GFX_VAR_D 253 +#define OBJ_EVENT_GFX_VAR_E 254 +#define OBJ_EVENT_GFX_VAR_F 255 #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 @@ -274,9 +274,9 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#define FIRST_DECORATION_SPRITE_GFX EVENT_OBJ_GFX_PICHU_DOLL +#define FIRST_DECORATION_SPRITE_GFX OBJ_EVENT_GFX_PICHU_DOLL -#define EVENT_OBJ_ID_PLAYER 0xFF -#define EVENT_OBJ_ID_CAMERA 0x7F +#define OBJ_EVENT_ID_PLAYER 0xFF +#define OBJ_EVENT_ID_CAMERA 0x7F #endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/constants/global.h b/include/constants/global.h index 4c638d63f..96acec853 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -32,7 +32,7 @@ // capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 -#define EVENT_OBJECTS_COUNT 16 +#define OBJECT_EVENTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 300 #define VARS_COUNT 256 @@ -46,7 +46,7 @@ #define BAG_POKEBALLS_COUNT 16 #define BAG_TMHM_COUNT 64 #define BAG_BERRIES_COUNT 46 -#define EVENT_OBJECT_TEMPLATES_COUNT 64 +#define OBJECT_EVENT_TEMPLATES_COUNT 64 #define DECOR_MAX_SECRET_BASE 16 #define DECOR_MAX_PLAYERS_HOUSE 12 #define APPRENTICE_COUNT 4 diff --git a/include/constants/vars.h b/include/constants/vars.h index d078cf841..29e8f9955 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -25,7 +25,7 @@ // object gfx id vars // These 0x10 vars are used to dynamically control a map object's sprite. // For example, the rival's sprite id is dynamically set based on the player's gender. -// See VarGetEventObjectGraphicsId(). +// See VarGetObjectEventGraphicsId(). #define VAR_OBJ_GFX_ID_0 0x4010 #define VAR_OBJ_GFX_ID_1 0x4011 #define VAR_OBJ_GFX_ID_2 0x4012 diff --git a/include/event_data.h b/include/event_data.h index 11289c1ab..4c1d4a046 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -24,7 +24,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetEventObjectGraphicsId(u8 id); +u8 VarGetObjectEventGraphicsId(u8 id); u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h deleted file mode 100644 index 037c0080d..000000000 --- a/include/event_obj_lock.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GUARD_EVENT_OBJ_LOCK_H -#define GUARD_EVENT_OBJ_LOCK_H - -bool8 sub_80983C4(void); -void ScriptFreezeEventObjects(void); -bool8 sub_809847C(void); -void LockSelectedEventObject(void); -void sub_8098630(void); -bool8 sub_8098734(void); -void ScriptUnfreezeEventObjects(void); -void sub_8098524(void); - -#endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_lock.h b/include/event_object_lock.h new file mode 100644 index 000000000..a3b350019 --- /dev/null +++ b/include/event_object_lock.h @@ -0,0 +1,13 @@ +#ifndef GUARD_EVENT_OBJECT_LOCK_H +#define GUARD_EVENT_OBJECT_LOCK_H + +bool8 sub_80983C4(void); +void ScriptFreezeObjectEvents(void); +bool8 sub_809847C(void); +void LockSelectedObjectEvent(void); +void sub_8098630(void); +bool8 sub_8098734(void); +void ScriptUnfreezeObjectEvents(void); +void sub_8098524(void); + +#endif // GUARD_EVENT_OBJECT_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 93f73e635..3c006767f 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -1,5 +1,5 @@ -#ifndef GUARD_FIELD_EVENT_OBJ_H -#define GUARD_FIELD_EVENT_OBJ_H +#ifndef GUARD_EVENT_OBJECT_MOVEMENT_H +#define GUARD_EVENT_OBJECT_MOVEMENT_H #define NUM_OBJECT_GRAPHICS_INFO 239 #define SPRITE_VAR 240 @@ -52,80 +52,80 @@ struct PairedPalettes const u16 *data; }; -struct LockedAnimEventObjects +struct LockedAnimObjectEvents { - u8 eventObjectIds[EVENT_OBJECTS_COUNT]; + u8 objectEventIds[OBJECT_EVENTS_COUNT]; u8 count; }; -extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; -extern const struct OamData gEventObjectBaseOam_32x8; -extern const struct OamData gEventObjectBaseOam_32x32; +extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[]; +extern const struct OamData gObjectEventBaseOam_32x8; +extern const struct OamData gObjectEventBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; -extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; +extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[]; -void ResetEventObjects(void); +void ResetObjectEvents(void); u8 GetMoveDirectionAnimNum(u8); -u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetEventObjectIdByXY(s16, s16); -void SetEventObjectDirection(struct EventObject *, u8); -u8 GetFirstInactiveEventObjectId(void); -void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); +u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetObjectEventIdByXY(s16, s16); +void SetObjectEventDirection(struct ObjectEvent *, u8); +u8 GetFirstInactiveObjectEventId(void); +void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); -void TryMoveEventObjectToMapCoords(u8, u8, u8, s16, s16); +void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); void sub_808E16C(s16, s16); void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); void sub_80930E0(s16 *, s16 *, s16, s16); -void EventObjectClearHeldMovement(struct EventObject *); -void EventObjectClearHeldMovementIfActive(struct EventObject *); -void TrySpawnEventObjects(s16, s16); +void ObjectEventClearHeldMovement(struct ObjectEvent *); +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); +void TrySpawnObjectEvents(s16, s16); u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction); -u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); -u8 TrySpawnEventObject(u8, u8, u8); -u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); -u8 SpawnSpecialEventObject(struct EventObjectTemplate *); +u8 AddPseudoObjectEvent(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); +u8 TrySpawnObjectEvent(u8, u8, u8); +u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); -void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId); -void EventObjectTurn(struct EventObject *, u8); -void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId); +void ObjectEventSetGraphicsId(struct ObjectEvent *, u8 graphicsId); +void ObjectEventTurn(struct ObjectEvent *, u8); +void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void FreeAndReserveObjectSpritePalettes(void); void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); -void ShiftEventObjectCoords(struct EventObject *, s16, s16); -void MoveEventObjectToMapCoords(struct EventObject *, s16, s16); -void TryOverrideEventObjectTemplateCoords(u8, u8, u8); -void InitEventObjectPalettes(u8 palSlot); -void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); -u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); +void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16); +void MoveObjectEventToMapCoords(struct ObjectEvent *, s16, s16); +void TryOverrideObjectEventTemplateCoords(u8, u8, u8); +void InitObjectEventPalettes(u8 palSlot); +void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *)); +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); u8 GetOppositeDirection(u8); u8 GetWalkInPlaceFastestMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceNormalMovementAction(u32); u8 GetWalkInPlaceSlowMovementAction(u32); -u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); +u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); -bool8 EventObjectIsHeldMovementActive(struct EventObject *); -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType); +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *); +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z); +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType); u8 GetTrainerFacingDirectionMovementType(u8 direction); -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction); +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction); u8 GetFaceDirectionMovementAction(u32); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); @@ -148,56 +148,56 @@ u8 GetFishingDirectionAnimNum(u8 direction); u8 GetAcroWheelieDirectionAnimNum(u8 direction); u8 GetFishingBiteDirectionAnimNum(u8 direction); u8 GetFishingNoCatchDirectionAnimNum(u8 direction); -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId); -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); -u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject); -void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType); -void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject); -void ShiftStillEventObjectCoords(struct EventObject *pObject); -void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 specialAnimId); +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent); +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); +void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType); +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent); +void ShiftStillObjectEventCoords(struct ObjectEvent *pObject); +void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); -void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y); u8 GetWalkSlowMovementAction(u32); u8 GetJumpMovementAction(u32); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8); -void EventObjectUpdateZCoord(struct EventObject *pObject); +void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); -void UnfreezeEventObject(struct EventObject *); -u8 FindLockedEventObjectIndex(struct EventObject *); +void UnfreezeObjectEvent(struct ObjectEvent *); +u8 FindLockedObjectEventIndex(struct ObjectEvent *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct EventObject *); +void DoShadowFieldEffect(struct ObjectEvent *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); void SetAndStartSpriteAnim(struct Sprite *, u8, u8); bool8 SpriteAnimEnded(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void CreateLevitateMovementTask(struct EventObject *); +void CreateLevitateMovementTask(struct ObjectEvent *); void DestroyExtraMovementTask(u8); -void UnfreezeEventObjects(void); -void FreezeEventObjectsExceptOne(u8 eventObjectId); +void UnfreezeObjectEvents(void); +void FreezeObjectEventsExceptOne(u8 objectEventId); void sub_8097B78(u8, u8); void sub_8098074(u8 var1, u8 var2); -void FreezeEventObjects(void); -bool8 FreezeEventObject(struct EventObject *eventObject); +void FreezeObjectEvents(void); +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent); u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8); u8 GetLedgeJumpDirection(s16, s16, u8); void CameraObjectSetFollowedObjectId(u8 objectId); u16 GetObjectPaletteTag(u8 palSlot); -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); s16 sub_809773C(s16 a1); s16 sub_8097728(s16 a1); void CameraObjectReset2(void); -u8 EventObjectGetBerryTreeId(u8 eventObjectId); +u8 ObjectEventGetBerryTreeId(u8 objectEventId); void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); bool8 IsBerryTreeSparkling(u8, u8, u8); @@ -262,13 +262,13 @@ u8 GetJumpMovementAction(u32); u8 GetJump2MovementAction(u32); u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); -u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *); u8 GetVectorDirection(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16); u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16); @@ -280,147 +280,147 @@ u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16); -u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); -bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *); +bool8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); void sub_8097C44(u8 var, bool32 var2); bool32 sub_8097C8C(u8 var); void sub_8097BB4(u8 var1, u8 graphicsId); void sub_8097CC4(u8 var1, u8 var2); bool32 sub_8097D9C(u8 var); -#endif //GUARD_FIELD_EVENT_OBJ_H +#endif //GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/faraway_island.h b/include/faraway_island.h index 4946bda8a..084b5a277 100755 --- a/include/faraway_island.h +++ b/include/faraway_island.h @@ -2,9 +2,9 @@ #define GUARD_FARAWAY_ISLAND_H u32 GetMewMoveDirection(void); -bool8 sub_81D4A58(struct EventObject*); +bool8 sub_81D4A58(struct ObjectEvent*); void UpdateFarawayIslandStepCounter(void); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *); bool8 IsMewPlayingHideAndSeek(void); #endif // GUARD_FARAWAY_ISLAND_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index feb20cef6..f722a6063 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -29,7 +29,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void RestartWildEncounterImmunitySteps(void); u8 *sub_8068E24(struct MapPosition *); -const u8 *GetEventObjectScriptPointerPlayerFacing(void); +const u8 *GetObjectEventScriptPointerPlayerFacing(void); bool8 sub_8068870(u16 a); bool8 sub_8068894(void); bool8 sub_8068A64(struct MapPosition *, u16); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 6ea9771e6..8257bc110 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -9,11 +9,11 @@ u8 CreateWarpArrowSprite(void); u8 sub_8155800(u8 oldSpriteId); void sub_81555AC(u8, u8); -bool8 sub_8155DA0(struct EventObject *); -void sub_8155D78(struct EventObject *); +bool8 sub_8155DA0(struct ObjectEvent *); +void sub_8155D78(struct ObjectEvent *); void StartAshFieldEffect(s16, s16, u16, s16); -void SetUpReflection(struct EventObject*, struct Sprite*, u8); -u32 StartFieldEffectForEventObject(u8, struct EventObject*); +void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8); +u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void sub_8155F80(struct Sprite*); void UpdateShadowFieldEffect(struct Sprite*); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 8d87779e6..db045e540 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a); void PlayerSetAnimId(u8 a, u8 b); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); -u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); void sub_808BCE8(void); diff --git a/include/frontier_util.h b/include/frontier_util.h index d6cdb3a62..f445949ef 100644 --- a/include/frontier_util.h +++ b/include/frontier_util.h @@ -16,10 +16,10 @@ u8 GetFrontierBrainTrainerPicIndex(void); u8 GetFrontierBrainTrainerClass(void); void CopyFrontierBrainTrainerName(u8 *dst); bool8 IsFrontierBrainFemale(void); -void SetFrontierBrainEventObjGfx_2(void); +void SetFrontierBrainObjEventGfx_2(void); void CreateFrontierBrainPokemon(void); u16 GetFrontierBrainMonSpecies(u8 monId); -void SetFrontierBrainEventObjGfx(u8 facility); +void SetFrontierBrainObjEventGfx(u8 facility); u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId); u8 GetFrontierBrainMonNature(u8 monId); u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index e6421f37c..5b12568fd 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -50,7 +50,7 @@ struct BackupMapLayout u16 *map; }; -struct EventObjectTemplate +struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -102,11 +102,11 @@ struct BgEvent struct MapEvents { - u8 eventObjectCount; + u8 objectEventCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -143,7 +143,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct EventObject +struct ObjectEvent { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -206,7 +206,7 @@ struct EventObject /*size = 0x24*/ }; -struct EventObjectGraphicsInfo +struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag1; @@ -263,7 +263,7 @@ enum COLLISION_OUTSIDE_RANGE, COLLISION_IMPASSABLE, COLLISION_ELEVATION_MISMATCH, - COLLISION_EVENT_OBJECT, + COLLISION_OBJECT_EVENT, COLLISION_STOP_SURFING, COLLISION_LEDGE_JUMP, COLLISION_PUSHED_BOULDER, @@ -298,7 +298,7 @@ struct PlayerAvatar /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; - /*0x05*/ u8 eventObjectId; + /*0x05*/ u8 objectEventId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie @@ -320,8 +320,8 @@ struct Camera s32 y; }; -extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT]; +extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; extern struct Camera gCamera; diff --git a/include/global.h b/include/global.h index 557bdc1c5..aab601879 100644 --- a/include/global.h +++ b/include/global.h @@ -924,8 +924,8 @@ struct SaveBlock1 /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; - /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; + /*0xA30*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; + /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[OBJECT_EVENT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/load_save.h b/include/load_save.h index bf50bffd7..2f4a9ace6 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -22,8 +22,8 @@ void SetContinueGameWarpStatusToDynamicWarp(void); void ClearContinueGameWarpStatus2(void); void SavePlayerParty(void); void LoadPlayerParty(void); -void SaveEventObjects(void); -void LoadEventObjects(void); +void SaveObjectEvents(void); +void LoadObjectEvents(void); void SaveSerializedGame(void); void LoadSerializedGame(void); void LoadPlayerBag(void); diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index 3845ac290..29c66a992 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -5,7 +5,7 @@ extern struct BardSong gBardSong; void SetMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void); -void ScrSpecial_SetMauvilleOldManEventObjGfx(void); +void ScrSpecial_SetMauvilleOldManObjEventGfx(void); u8 sub_81201C8(void); void sub_8120B70(OldMan *dest); void sub_8120670(void); diff --git a/include/overworld.h b/include/overworld.h index b86067701..0e3c7e006 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -30,17 +30,17 @@ struct InitialPlayerAvatarState u8 direction; }; -struct LinkPlayerEventObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; - u8 eventObjId; + u8 objEventId; u8 movementMode; }; // Exported RAM declarations extern struct WarpData gLastUsedWarp; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; @@ -63,10 +63,10 @@ void IncrementGameStat(u8 index); u32 GetGameStat(u8 index); void SetGameStat(u8 index, u32 value); void ApplyNewEncryptionKeyToGameStats(u32 newKey); -void LoadEventObjTemplatesFromHeader(void); -void LoadSaveblockEventObjScripts(void); -void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); -void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); +void LoadObjEventTemplatesFromHeader(void); +void LoadSaveblockObjEventScripts(void); +void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y); +void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); @@ -157,6 +157,6 @@ bool32 sub_8087598(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); bool32 sub_808766C(void); -void ClearLinkPlayerEventObjects(void); +void ClearLinkPlayerObjectEvents(void); #endif // GUARD_OVERWORLD_H diff --git a/include/script.h b/include/script.h index 3f92964ac..f9fb09b5d 100644 --- a/include/script.h +++ b/include/script.h @@ -59,7 +59,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 const u8 *GetRamScript(u8 objectId, const u8 *script); bool32 ValidateSavedRamScript(void); u8 *GetSavedRamScriptIfValid(void); -void InitRamScript_NoEventObject(u8 *script, u16 scriptSize); +void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize); // srccmd.h void SetMovingNpcId(u16 npcId); diff --git a/include/script_movement.h b/include/script_movement.h index f9a97cf46..03f8bf0b7 100644 --- a/include/script_movement.h +++ b/include/script_movement.h @@ -3,6 +3,6 @@ bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript); bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup); -void ScriptMovement_UnfreezeEventObjects(void); +void ScriptMovement_UnfreezeObjectEvents(void); #endif // GUARD_SCRIPT_MOVEMENT_H diff --git a/include/shop.h b/include/shop.h index 10e2b1060..164d6f3c2 100644 --- a/include/shop.h +++ b/include/shop.h @@ -13,7 +13,7 @@ enum // shop view window NPC info enum enum { - EVENT_OBJ_ID, + OBJ_EVENT_ID, X_COORD, Y_COORD, ANIM_NUM, diff --git a/include/trainer_hill.h b/include/trainer_hill.h index c07aeb6d7..c849bcced 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -60,15 +60,15 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId); bool8 InTrainerHillChallenge(void); void nullsub_129(void); void PrintOnTrainerHillRecordsWindow(void); -void LoadTrainerHillEventObjectTemplates(void); -bool32 LoadTrainerHillFloorEventObjectScripts(void); +void LoadTrainerHillObjectEventTemplates(void); +bool32 LoadTrainerHillFloorObjectEventScripts(void); void GenerateTrainerHillFloorLayout(u16 *mapArg); bool32 InTrainerHill(void); u8 GetCurrentTrainerHillMapId(void); const struct WarpEvent* SetWarpDestinationTrainerHill4F(void); const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId); u16 LocalIdToHillTrainerId(u8 localId); -bool8 GetHillTrainerFlag(u8 eventObjectId); +bool8 GetHillTrainerFlag(u8 objectEventId); void SetHillTrainerFlag(void); const u8 *GetTrainerHillTrainerScript(void); void FillHillTrainerParty(void); diff --git a/include/trainer_see.h b/include/trainer_see.h index daf9d0298..9d88e05fa 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,7 +3,7 @@ struct ApproachingTrainer { - u8 eventObjectId; + u8 objectEventId; u8 radius; // plus 1 const u8 *trainerScriptPtr; u8 taskId; @@ -17,14 +17,14 @@ extern bool8 gTrainerApproachedPlayer; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void sub_80B4578(struct EventObject *var); +void sub_80B4578(struct ObjectEvent *var); void EndTrainerApproach(void); void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); -u8 GetCurrentApproachingTrainerEventObjectId(void); -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); +u8 GetCurrentApproachingTrainerObjectEventId(void); +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId); void PlayerFaceTrainerAfterBattle(void); #endif // GUARD_TRAINER_SEE_H diff --git a/ld_script.txt b/ld_script.txt index 2f6137773..d8c50c40c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -113,7 +113,7 @@ SECTIONS { src/field_player_avatar.o(.text); src/event_object_movement.o(.text); src/field_message_box.o(.text); - src/event_obj_lock.o(.text); + src/event_object_lock.o(.text); src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 6e49a0a66..262d53232 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -1,663 +1,663 @@ -EVENTOBJGFXDIR := graphics/event_objects/pics +OBJEVENTGFXDIR := graphics/object_events/pics -$(EVENTOBJGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/artist.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/artist.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/beauty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/camper.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cook.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hiker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hiker.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/lass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/leaf.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/leaf.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/twin.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/twin.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_4.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_5.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/maniac.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mom.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mom.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/nurse.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_man.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/red.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/red.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/sailor.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/sailor.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scott.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scott.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/steven.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/steven.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/teala.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/teala.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/wallace.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wallace.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wally.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 8 -mheight 8 -$(EVENTOBJGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/ash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/ash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 1 -$(EVENTOBJGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 diff --git a/src/apprentice.c b/src/apprentice.c index 2c8959024..7f493a136 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -923,7 +923,7 @@ static void PrintApprenticeMessage(void) static void Script_PrintApprenticeMessage(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); DrawDialogueFrame(0, 1); @@ -1215,15 +1215,15 @@ static void SaveApprentice(void) static void SetSavedApprenticeTrainerGfxId(void) { u8 i; - u8 mapObjectGfxId; + u8 objectEventGfxId; u8 class = gApprentices[gSaveBlock2Ptr->apprentices[0].id].facilityClass; for (i = 0; i < ARRAY_COUNT(gTowerMaleFacilityClasses) && gTowerMaleFacilityClasses[i] != class; i++) ; if (i != ARRAY_COUNT(gTowerMaleFacilityClasses)) { - mapObjectGfxId = gTowerMaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerMaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); return; } @@ -1231,23 +1231,23 @@ static void SetSavedApprenticeTrainerGfxId(void) ; if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses)) { - mapObjectGfxId = gTowerFemaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerFemaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); } } static void SetPlayerApprenticeTrainerGfxId(void) { u8 i; - u8 mapObjectGfxId; + u8 objectEventGfxId; u8 class = gApprentices[PLAYER_APPRENTICE.id].facilityClass; for (i = 0; i < ARRAY_COUNT(gTowerMaleFacilityClasses) && gTowerMaleFacilityClasses[i] != class; i++) ; if (i != ARRAY_COUNT(gTowerMaleFacilityClasses)) { - mapObjectGfxId = gTowerMaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerMaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); return; } @@ -1255,8 +1255,8 @@ static void SetPlayerApprenticeTrainerGfxId(void) ; if (i != ARRAY_COUNT(gTowerFemaleFacilityClasses)) { - mapObjectGfxId = gTowerFemaleTrainerGfxIds[i]; - VarSet(VAR_OBJ_GFX_ID_0, mapObjectGfxId); + objectEventGfxId = gTowerFemaleTrainerGfxIds[i]; + VarSet(VAR_OBJ_GFX_ID_0, objectEventGfxId); } } diff --git a/src/battle_pike.c b/src/battle_pike.c index f9c6c84a4..f6745e8c9 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -53,7 +53,7 @@ static void SetRoomType(void); static void GetBattlePikeData(void); static void SetBattlePikeData(void); static void IsNextRoomFinal(void); -static void SetupRoomEventObjects(void); +static void SetupRoomObjectEvents(void); static void GetRoomType(void); static void SetInWildMonRoom(void); static void ClearInWildMonRoom(void); @@ -269,151 +269,151 @@ static const struct PikeWildMon *const *const sWildMons[2] = static const struct PikeRoomNPC sNPCTable[] = { { - .graphicsId = EVENT_OBJ_GFX_POKEFAN_F, + .graphicsId = OBJ_EVENT_GFX_POKEFAN_F, .speechId1 = 3, .speechId2 = 5, .speechId3 = 6 }, { - .graphicsId = EVENT_OBJ_GFX_NINJA_BOY, + .graphicsId = OBJ_EVENT_GFX_NINJA_BOY, .speechId1 = 13, .speechId2 = 32, .speechId3 = 37 }, { - .graphicsId = EVENT_OBJ_GFX_FAT_MAN, + .graphicsId = OBJ_EVENT_GFX_FAT_MAN, .speechId1 = 8, .speechId2 = 11, .speechId3 = 12 }, { - .graphicsId = EVENT_OBJ_GFX_BUG_CATCHER, + .graphicsId = OBJ_EVENT_GFX_BUG_CATCHER, .speechId1 = 34, .speechId2 = 30, .speechId3 = 33 }, { - .graphicsId = EVENT_OBJ_GFX_EXPERT_M, + .graphicsId = OBJ_EVENT_GFX_EXPERT_M, .speechId1 = 0, .speechId2 = 0, .speechId3 = 0 }, { - .graphicsId = EVENT_OBJ_GFX_OLD_WOMAN, + .graphicsId = OBJ_EVENT_GFX_OLD_WOMAN, .speechId1 = 1, .speechId2 = 1, .speechId3 = 1 }, { - .graphicsId = EVENT_OBJ_GFX_BLACK_BELT, + .graphicsId = OBJ_EVENT_GFX_BLACK_BELT, .speechId1 = 22, .speechId2 = 23, .speechId3 = 27 }, { - .graphicsId = EVENT_OBJ_GFX_HIKER, + .graphicsId = OBJ_EVENT_GFX_HIKER, .speechId1 = 8, .speechId2 = 22, .speechId3 = 31 }, { - .graphicsId = EVENT_OBJ_GFX_GIRL_3, + .graphicsId = OBJ_EVENT_GFX_GIRL_3, .speechId1 = 13, .speechId2 = 39, .speechId3 = 21 }, { - .graphicsId = EVENT_OBJ_GFX_WOMAN_2, + .graphicsId = OBJ_EVENT_GFX_WOMAN_2, .speechId1 = 2, .speechId2 = 4, .speechId3 = 17 }, { - .graphicsId = EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, + .graphicsId = OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M, .speechId1 = 30, .speechId2 = 20, .speechId3 = 36 }, { - .graphicsId = EVENT_OBJ_GFX_MAN_5, + .graphicsId = OBJ_EVENT_GFX_MAN_5, .speechId1 = 28, .speechId2 = 34, .speechId3 = 25 }, { - .graphicsId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .graphicsId = OBJ_EVENT_GFX_SCHOOL_KID_M, .speechId1 = 23, .speechId2 = 38, .speechId3 = 26 }, { - .graphicsId = EVENT_OBJ_GFX_FISHERMAN, + .graphicsId = OBJ_EVENT_GFX_FISHERMAN, .speechId1 = 23, .speechId2 = 30, .speechId3 = 11 }, { - .graphicsId = EVENT_OBJ_GFX_LASS, + .graphicsId = OBJ_EVENT_GFX_LASS, .speechId1 = 15, .speechId2 = 19, .speechId3 = 14 }, { - .graphicsId = EVENT_OBJ_GFX_MANIAC, + .graphicsId = OBJ_EVENT_GFX_MANIAC, .speechId1 = 2, .speechId2 = 29, .speechId3 = 26 }, { - .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + .graphicsId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, .speechId1 = 37, .speechId2 = 12, .speechId3 = 32 }, { - .graphicsId = EVENT_OBJ_GFX_MAN_3, + .graphicsId = OBJ_EVENT_GFX_MAN_3, .speechId1 = 24, .speechId2 = 23, .speechId3 = 38 }, { - .graphicsId = EVENT_OBJ_GFX_WOMAN_3, + .graphicsId = OBJ_EVENT_GFX_WOMAN_3, .speechId1 = 5, .speechId2 = 22, .speechId3 = 4 }, { - .graphicsId = EVENT_OBJ_GFX_LITTLE_BOY, + .graphicsId = OBJ_EVENT_GFX_LITTLE_BOY, .speechId1 = 41, .speechId2 = 37, .speechId3 = 35 }, { - .graphicsId = EVENT_OBJ_GFX_TUBER_F, + .graphicsId = OBJ_EVENT_GFX_TUBER_F, .speechId1 = 39, .speechId2 = 14, .speechId3 = 13 }, { - .graphicsId = EVENT_OBJ_GFX_GENTLEMAN, + .graphicsId = OBJ_EVENT_GFX_GENTLEMAN, .speechId1 = 10, .speechId2 = 7, .speechId3 = 9 }, { - .graphicsId = EVENT_OBJ_GFX_LITTLE_GIRL, + .graphicsId = OBJ_EVENT_GFX_LITTLE_GIRL, .speechId1 = 40, .speechId2 = 20, .speechId3 = 16 }, { - .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + .graphicsId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, .speechId1 = 18, .speechId2 = 13, .speechId3 = 21 }, { - .graphicsId = EVENT_OBJ_GFX_MAN_1, + .graphicsId = OBJ_EVENT_GFX_MAN_1, .speechId1 = 22, .speechId2 = 31, .speechId3 = 27 @@ -484,7 +484,7 @@ static void (* const sBattlePikeFunctions[])(void) = [BATTLE_PIKE_FUNC_GET_DATA] = GetBattlePikeData, [BATTLE_PIKE_FUNC_SET_DATA] = SetBattlePikeData, [BATTLE_PIKE_FUNC_IS_FINAL_ROOM] = IsNextRoomFinal, - [BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS] = SetupRoomEventObjects, + [BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS] = SetupRoomObjectEvents, [BATTLE_PIKE_FUNC_GET_ROOM_TYPE] = GetRoomType, [BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM] = SetInWildMonRoom, [BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM] = ClearInWildMonRoom, @@ -552,14 +552,14 @@ static void SetRoomType(void) sRoomType = roomType; } -static void SetupRoomEventObjects(void) +static void SetupRoomObjectEvents(void) { bool32 setObjGfx1, setObjGfx2; u32 objGfx1; u16 objGfx2; - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST); - VarSet(VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_DUSCLOPS); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST); + VarSet(VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_DUSCLOPS); setObjGfx1 = TRUE; setObjGfx2 = FALSE; objGfx1 = 0; @@ -572,28 +572,28 @@ static void SetupRoomEventObjects(void) setObjGfx1 = FALSE; break; case PIKE_ROOM_HEAL_FULL: - objGfx1 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx1 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; break; case PIKE_ROOM_NPC: objGfx1 = (u8)(GetNPCRoomGraphicsId()); break; case PIKE_ROOM_STATUS: - objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = OBJ_EVENT_GFX_GENTLEMAN; if (sStatusMon == PIKE_STATUS_DUSCLOPS) - objGfx2 = EVENT_OBJ_GFX_DUSCLOPS; + objGfx2 = OBJ_EVENT_GFX_DUSCLOPS; else - objGfx2 = EVENT_OBJ_GFX_KIRLIA; + objGfx2 = OBJ_EVENT_GFX_KIRLIA; setObjGfx2 = TRUE; break; case PIKE_ROOM_HEAL_PART: - objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = OBJ_EVENT_GFX_GENTLEMAN; break; case PIKE_ROOM_WILD_MONS: setObjGfx1 = FALSE; break; case PIKE_ROOM_HARD_BATTLE: PrepareOneTrainer(TRUE); - objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx2 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; setObjGfx1 = FALSE; setObjGfx2 = TRUE; break; @@ -602,8 +602,8 @@ static void SetupRoomEventObjects(void) setObjGfx1 = FALSE; break; case PIKE_ROOM_BRAIN: - SetFrontierBrainEventObjGfx(FRONTIER_FACILITY_PIKE); - objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + SetFrontierBrainObjEventGfx(FRONTIER_FACILITY_PIKE); + objGfx2 = OBJ_EVENT_GFX_LINK_RECEPTIONIST; setObjGfx1 = FALSE; setObjGfx2 = TRUE; break; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index e876b6e17..b189fd635 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -29,7 +29,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_pyramid.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/frontier_util.h" #include "constants/items.h" #include "constants/layouts.h" @@ -96,8 +96,8 @@ static void GetPyramidEntranceAndExitSquareIds(u8 *, u8 *); static void SetPyramidObjectPositionsUniformly(u8); static bool8 SetPyramidObjectPositionsInAndNearSquare(u8, u8); static bool8 SetPyramidObjectPositionsNearSquare(u8, u8); -static bool8 TrySetPyramidEventObjectPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); -static bool8 TrySetPyramidEventObjectPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); +static bool8 TrySetPyramidObjectEventPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId); +static bool8 TrySetPyramidObjectEventPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId); // Const rom data. #define ABILITY_RANDOM 2 // For wild mons data. @@ -1010,14 +1010,14 @@ static void SetPickupItem(void) static void HidePyramidItem(void) { - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; int i = 0; for (;;) { if (events[i].localId == gSpecialVar_LastTalked) { - // Rather than using event flags to hide the item event object, + // Rather than using event flags to hide the item object event, // it moves them far off the map bounds. events[i].x = 0x7FFF; events[i].y = 0x7FFF; @@ -1041,8 +1041,8 @@ static void ShowPostBattleHintText(void) u8 id; int textGroup = 0; int textIndex = 0; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - u16 trainerId = LocalIdToPyramidTrainerId(gEventObjects[gSelectedEventObject].localId); + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; + u16 trainerId = LocalIdToPyramidTrainerId(gObjectEvents[gSelectedObjectEvent].localId); for (i = 0; i < ARRAY_COUNT(sTrainerTextGroups); i++) { @@ -1053,7 +1053,7 @@ static void ShowPostBattleHintText(void) } } - hintType = sHintTextTypes[gEventObjects[gSelectedEventObject].localId - 1]; + hintType = sHintTextTypes[gObjectEvents[gSelectedObjectEvent].localId - 1]; i = 0; while (!i) { @@ -1064,9 +1064,9 @@ static void ShowPostBattleHintText(void) i = 1; break; case HINT_REMAINING_ITEMS: - for (i = 0; i < GetNumBattlePyramidEventObjects(); i++) + for (i = 0; i < GetNumBattlePyramidObjectEvents(); i++) { - if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) + if (events[i].graphicsId == OBJ_EVENT_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) textIndex++; } i = 1; @@ -1243,8 +1243,8 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx { if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE) { - x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; - y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; + x += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.x; + y += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.y; if (x >= minDistanceForExitHint || x <= -minDistanceForExitHint || y >= minDistanceForExitHint @@ -1311,7 +1311,7 @@ u16 LocalIdToPyramidTrainerId(u8 localId) bool8 GetBattlePyramidTrainerFlag(u8 eventId) { - return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gEventObjects[eventId].localId - 1]; + return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gObjectEvents[eventId].localId - 1]; } void MarkApproachingPyramidTrainersAsBattled(void) @@ -1319,7 +1319,7 @@ void MarkApproachingPyramidTrainersAsBattled(void) MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_A); if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { - gSelectedEventObject = GetChosenApproachingTrainerEventObjectId(1); + gSelectedObjectEvent = GetChosenApproachingTrainerObjectEventId(1); MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_B); } } @@ -1334,10 +1334,10 @@ static void MarkPyramidTrainerAsBattled(u16 trainerId) gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i]; } - gEventObjects[gSelectedEventObject].movementType = MOVEMENT_TYPE_WANDER_AROUND; - gSaveBlock1Ptr->eventObjectTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; - gEventObjects[gSelectedEventObject].initialCoords.x = gEventObjects[gSelectedEventObject].currentCoords.x; - gEventObjects[gSelectedEventObject].initialCoords.y = gEventObjects[gSelectedEventObject].currentCoords.y; + gObjectEvents[gSelectedObjectEvent].movementType = MOVEMENT_TYPE_WANDER_AROUND; + gSaveBlock1Ptr->objectEventTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; + gObjectEvents[gSelectedObjectEvent].initialCoords.x = gObjectEvents[gSelectedObjectEvent].currentCoords.x; + gObjectEvents[gSelectedObjectEvent].initialCoords.y = gObjectEvents[gSelectedObjectEvent].currentCoords.y; } void GenerateBattlePyramidWildMon(void) @@ -1480,7 +1480,7 @@ void sub_81A9F80(void) ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); } -static u16 GetUniqueTrainerId(u8 eventObjectId) +static u16 GetUniqueTrainerId(u8 objectEventId) { int i; u16 trainerId; @@ -1492,24 +1492,24 @@ static u16 GetUniqueTrainerId(u8 eventObjectId) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0; i < eventObjectId; i++) + for (i = 0; i < objectEventId; i++) { if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != eventObjectId); + } while (i != objectEventId); } else { do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0; i < eventObjectId; i++) + for (i = 0; i < objectEventId; i++) { if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != eventObjectId); + } while (i != objectEventId); } return trainerId; @@ -1568,7 +1568,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio free(floorLayoutOffsets); } -void LoadBattlePyramidEventObjectTemplates(void) +void LoadBattlePyramidObjectEventTemplates(void) { int i; u8 id; @@ -1579,7 +1579,7 @@ void LoadBattlePyramidEventObjectTemplates(void) id = GetPyramidFloorTemplateId(); GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); for (i = 0; i < 2; i++) { u8 objectPositionsType; @@ -1614,14 +1614,14 @@ void LoadBattlePyramidEventObjectTemplates(void) } } -void LoadBattlePyramidFloorEventObjectScripts(void) +void LoadBattlePyramidFloorObjectEventScripts(void) { int i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { - if (events[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (events[i].graphicsId != OBJ_EVENT_GFX_ITEM_BALL) events[i].script = BattlePyramid_TrainerBattle; else events[i].script = BattlePyramid_FindItemBall; @@ -1691,7 +1691,7 @@ static void SetPyramidObjectPositionsUniformly(u8 objType) } } while (!(bits & 2)); - } while (!(bits & 4) && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); + } while (!(bits & 4) && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); bits &= 1; } free(floorLayoutOffsets); @@ -1724,14 +1724,14 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) { if (r7 == 0) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) r7 = 1; else numPlacedObjects++; } if (r7 & 1) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) { do { @@ -1739,7 +1739,7 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) borderedIndex = 0; r7 += 2; - } while (r7 >> 1 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); + } while (r7 >> 1 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); numPlacedObjects++; } else @@ -1786,7 +1786,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) for (i = 0; i < numObjects; i++) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) { do { @@ -1794,7 +1794,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4) borderOffset = 0; r8++; - } while (r8 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); + } while (r8 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); numPlacedObjects++; } else @@ -1813,7 +1813,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) return (numObjects / 2) > numPlacedObjects; } -static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidObjectEventPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId) { int x, y; @@ -1823,7 +1823,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou { for (x = 7; x > -1; x--) { - if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId)) return FALSE; } } @@ -1834,7 +1834,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou { for (x = 0; x < 8; x++) { - if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId)) return FALSE; } } @@ -1843,42 +1843,42 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou return TRUE; } -static bool8 TrySetPyramidEventObjectPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId) { int i, j; const struct MapHeader *mapHeader; - struct EventObjectTemplate *floorEvents = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *floorEvents = gSaveBlock1Ptr->objectEventTemplates; mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); - for (i = 0; i < mapHeader->events->eventObjectCount; i++) + for (i = 0; i < mapHeader->events->objectEventCount; i++) { - if (mapHeader->events->eventObjects[i].x != x || mapHeader->events->eventObjects[i].y != y) + if (mapHeader->events->objectEvents[i].x != x || mapHeader->events->objectEvents[i].y != y) continue; - if (objType != OBJ_TRAINERS || mapHeader->events->eventObjects[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == OBJ_EVENT_GFX_ITEM_BALL) { - if (objType != OBJ_ITEMS || mapHeader->events->eventObjects[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != OBJ_EVENT_GFX_ITEM_BALL) continue; } // Ensure an object wasn't previously placed in the exact same position. - for (j = 0; j < eventObjectId; j++) + for (j = 0; j < objectEventId; j++) { if (floorEvents[j].x == x + ((squareId % 4) * 8) && floorEvents[j].y == y + ((squareId / 4) * 8)) break; } - if (j == eventObjectId) + if (j == objectEventId) { - floorEvents[eventObjectId] = mapHeader->events->eventObjects[i]; - floorEvents[eventObjectId].x += (squareId % 4) * 8; - floorEvents[eventObjectId].y += (squareId / 4) * 8; - floorEvents[eventObjectId].localId = eventObjectId + 1; - if (floorEvents[eventObjectId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + floorEvents[objectEventId] = mapHeader->events->objectEvents[i]; + floorEvents[objectEventId].x += (squareId % 4) * 8; + floorEvents[objectEventId].y += (squareId / 4) * 8; + floorEvents[objectEventId].localId = objectEventId + 1; + if (floorEvents[objectEventId].graphicsId != OBJ_EVENT_GFX_ITEM_BALL) { - i = GetUniqueTrainerId(eventObjectId); - floorEvents[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); - gSaveBlock2Ptr->frontier.trainerIds[eventObjectId] = i; + i = GetUniqueTrainerId(objectEventId); + floorEvents[objectEventId].graphicsId = GetBattleFacilityTrainerGfxId(i); + gSaveBlock2Ptr->frontier.trainerIds[objectEventId] = i; } return FALSE; } @@ -1919,10 +1919,10 @@ static u8 GetPyramidFloorTemplateId(void) return 0; } -u8 GetNumBattlePyramidEventObjects(void) +u8 GetNumBattlePyramidObjectEvents(void) { u8 i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < 16; i++) { diff --git a/src/battle_setup.c b/src/battle_setup.c index b98b5df06..ea4e807c7 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -91,7 +91,7 @@ EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; EWRAM_DATA u16 gPartnerTrainerId = 0; -EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; +EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0; EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL; @@ -145,7 +145,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -158,7 +158,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -171,7 +171,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -184,7 +184,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -197,7 +197,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -210,7 +210,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -223,7 +223,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[] { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -384,7 +384,7 @@ void BattleSetup_StartBattlePikeWildBattle(void) static void DoStandardWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; @@ -403,7 +403,7 @@ static void DoStandardWildBattle(void) void BattleSetup_StartRoamerBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; @@ -417,7 +417,7 @@ void BattleSetup_StartRoamerBattle(void) static void DoSafariBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndSafariBattle; gBattleTypeFlags = BATTLE_TYPE_SAFARI; @@ -427,7 +427,7 @@ static void DoSafariBattle(void) static void DoBattlePikeWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_PIKE; @@ -1008,7 +1008,7 @@ static void InitTrainerBattleVariables(void) sTrainerBDefeatSpeech = NULL; sTrainerBBattleScriptRetAddr = NULL; } - sTrainerEventObjectLocalId = 0; + sTrainerObjectEventLocalId = 0; sTrainerVictorySpeech = NULL; sTrainerCannotBattleSpeech = NULL; sTrainerBattleEndScript = NULL; @@ -1071,10 +1071,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co void SetMapVarsToTrainer(void) { - if (sTrainerEventObjectLocalId != 0) + if (sTrainerObjectEventLocalId != 0) { - gSpecialVar_LastTalked = sTrainerEventObjectLocalId; - gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + gSpecialVar_LastTalked = sTrainerObjectEventLocalId; + gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } @@ -1168,19 +1168,19 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) +void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(EventScript_271354); ScriptContext2_Enable(); } -void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) +void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerObjEventId; + gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); } @@ -1198,9 +1198,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void SetUpTrainerMovement(void) { - struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; + struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; - SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); + SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection)); } u8 GetTrainerBattleMode(void) @@ -1211,9 +1211,9 @@ u8 GetTrainerBattleMode(void) bool8 GetTrainerFlag(void) { if (InBattlePyramid()) - return GetBattlePyramidTrainerFlag(gSelectedEventObject); + return GetBattlePyramidTrainerFlag(gSelectedObjectEvent); else if (InTrainerHill()) - return GetHillTrainerFlag(gSelectedEventObject); + return GetHillTrainerFlag(gSelectedObjectEvent); else return FlagGet(GetTrainerAFlag()); } @@ -1358,7 +1358,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gSpecialVar_LastTalked)); else - CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId)); sub_80982B8(); } @@ -1367,7 +1367,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gSpecialVar_LastTalked)); else - CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId)); sub_80982B8(); } diff --git a/src/battle_tower.c b/src/battle_tower.c index 49dd6d32a..20c10bc15 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -208,60 +208,60 @@ const u8 gTowerFemaleFacilityClasses[20] = const u8 gTowerMaleTrainerGfxIds[30] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_TUBER_M, - EVENT_OBJ_GFX_MAN_3, - EVENT_OBJ_GFX_RICH_BOY, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_BLACK_BELT, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_PSYCHIC_M, - EVENT_OBJ_GFX_GENTLEMAN, - EVENT_OBJ_GFX_SCHOOL_KID_M, - EVENT_OBJ_GFX_POKEFAN_M, - EVENT_OBJ_GFX_EXPERT_M, - EVENT_OBJ_GFX_YOUNGSTER, - EVENT_OBJ_GFX_FISHERMAN, - EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_MAN_3, - EVENT_OBJ_GFX_MAN_5, - EVENT_OBJ_GFX_NINJA_BOY, - EVENT_OBJ_GFX_SAILOR, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_MAN_4, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_BUG_CATCHER, - EVENT_OBJ_GFX_HIKER + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_TUBER_M, + OBJ_EVENT_GFX_MAN_3, + OBJ_EVENT_GFX_RICH_BOY, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_PSYCHIC_M, + OBJ_EVENT_GFX_GENTLEMAN, + OBJ_EVENT_GFX_SCHOOL_KID_M, + OBJ_EVENT_GFX_POKEFAN_M, + OBJ_EVENT_GFX_EXPERT_M, + OBJ_EVENT_GFX_YOUNGSTER, + OBJ_EVENT_GFX_FISHERMAN, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_MAN_3, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_NINJA_BOY, + OBJ_EVENT_GFX_SAILOR, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_MAN_4, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_HIKER }; const u8 gTowerFemaleTrainerGfxIds[20] = { - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_TUBER_F, - EVENT_OBJ_GFX_WOMAN_5, - EVENT_OBJ_GFX_HEX_MANIAC, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_BEAUTY, - EVENT_OBJ_GFX_LASS, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_POKEFAN_F, - EVENT_OBJ_GFX_EXPERT_F, - EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_5, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_LASS + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_TUBER_F, + OBJ_EVENT_GFX_WOMAN_5, + OBJ_EVENT_GFX_HEX_MANIAC, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_BEAUTY, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_POKEFAN_F, + OBJ_EVENT_GFX_EXPERT_F, + OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_5, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_LASS }; // Excludes the unused RS_FACILITY_CLASS_BOARDER_1 and _2 @@ -1418,7 +1418,7 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) } else if (trainerId == TRAINER_FRONTIER_BRAIN) { - SetFrontierBrainEventObjGfx_2(); + SetFrontierBrainObjEventGfx_2(); return; } else if (trainerId < TRAINER_RECORD_MIXING_FRIEND) @@ -1486,13 +1486,13 @@ void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId) { case 0: default: - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1); return; case 1: - VarSet(VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1); return; case 15: - VarSet(VAR_OBJ_GFX_ID_E, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_E, OBJ_EVENT_GFX_BOY_1); return; } } @@ -1551,7 +1551,7 @@ u8 GetBattleFacilityTrainerGfxId(u16 trainerId) } else { - return EVENT_OBJ_GFX_BOY_1; + return OBJ_EVENT_GFX_BOY_1; } } @@ -2512,9 +2512,9 @@ static void sub_81642A0(void) s32 challengeNum; u32 species1, species2; u32 level; - struct EventObjectTemplate *eventObjTemplates; + struct ObjectEventTemplate *objEventTemplates; - eventObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + objEventTemplates = gSaveBlock1Ptr->objectEventTemplates; lvlMode = gSaveBlock2Ptr->frontier.lvlMode; battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7; @@ -2544,7 +2544,7 @@ static void sub_81642A0(void) for (i = 0; i < 6; i++) { trainerId = gSaveBlock2Ptr->frontier.trainerIds[i]; - eventObjTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); + objEventTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); for (j = 0; j < 2; j++) { while (1) @@ -2598,7 +2598,7 @@ static void sub_81642A0(void) if (r10 != 0) { gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10]; - eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); + objEventTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1); sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]); } @@ -2641,7 +2641,7 @@ static void sub_81642A0(void) if (r10 != 0) { gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10]; - eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); + objEventTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2); sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]); } @@ -3701,7 +3701,7 @@ u8 FacilityClassToGraphicsId(u8 facilityClass) } else { - return EVENT_OBJ_GFX_BOY_1; + return OBJ_EVENT_GFX_BOY_1; } } diff --git a/src/battle_transition.c b/src/battle_transition.c index 9e66b8938..bf1ced2f8 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -750,7 +750,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 = { .tileTag = 0xFFFF, .paletteTag = 4105, - .oam = &gEventObjectBaseOam_32x32, + .oam = &gObjectEventBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, .images = sSpriteImageTable_85C8E2C, .affineAnims = sSpriteAffineAnimTable_85C8E60, @@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC = .callback = sub_8148380 }; -static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_10.gbapal"); +static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_10.gbapal"); const struct SpritePalette gFieldEffectObjectPaletteInfo10 = { diff --git a/src/berry.c b/src/berry.c index bbaa2b03b..7a8ab37fa 100644 --- a/src/berry.c +++ b/src/berry.c @@ -12,7 +12,7 @@ #include "string_util.h" #include "text.h" #include "constants/berry.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/items.h" static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); @@ -995,9 +995,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id) return &gSaveBlock1Ptr->berryTrees[id]; } -bool32 EventObjectInteractionWaterBerryTree(void) +bool32 ObjectEventInteractionWaterBerryTree(void) { - struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); + struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); switch (tree->stage) { @@ -1021,8 +1021,8 @@ bool32 EventObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingEmptyBerryTreePatch(void) { - if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript - && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY) + if (GetObjectEventScriptPointerPlayerFacing() == BerryTreeScript + && GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY) return TRUE; else return FALSE; @@ -1030,10 +1030,10 @@ bool8 IsPlayerFacingEmptyBerryTreePatch(void) bool8 TryToWaterBerryTree(void) { - if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript) + if (GetObjectEventScriptPointerPlayerFacing() != BerryTreeScript) return FALSE; else - return EventObjectInteractionWaterBerryTree(); + return ObjectEventInteractionWaterBerryTree(); } void ClearBerryTrees(void) @@ -1242,7 +1242,7 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } -void EventObjectInteractionGetBerryTreeData(void) +void ObjectEventInteractionGetBerryTreeData(void) { u8 id; u8 berry; @@ -1250,7 +1250,7 @@ void EventObjectInteractionGetBerryTreeData(void) u8 group; u8 num; - id = EventObjectGetBerryTreeId(gSelectedEventObject); + id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); localId = gSpecialVar_LastTalked; @@ -1265,15 +1265,15 @@ void EventObjectInteractionGetBerryTreeData(void) GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006); } -void EventObjectInteractionGetBerryName(void) +void ObjectEventInteractionGetBerryName(void) { - u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)); + u8 berryType = GetBerryTypeByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); GetBerryNameByBerryType(berryType, gStringVar1); } -void EventObjectInteractionGetBerryCountString(void) +void ObjectEventInteractionGetBerryCountString(void) { - u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 treeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(treeId); u8 count = GetBerryCountByBerryTreeId(treeId); GetBerryCountStringByBerryType(berry, gStringVar1, count); @@ -1284,25 +1284,25 @@ void Bag_ChooseBerry(void) SetMainCallback2(CB2_ChooseBerry); } -void EventObjectInteractionPlantBerryTree(void) +void ObjectEventInteractionPlantBerryTree(void) { u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); - PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE); - EventObjectInteractionGetBerryTreeData(); + PlantBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE); + ObjectEventInteractionGetBerryTreeData(); } -void EventObjectInteractionPickBerryTree(void) +void ObjectEventInteractionPickBerryTree(void) { - u8 id = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(id); gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } -void EventObjectInteractionRemoveBerryTree(void) +void ObjectEventInteractionRemoveBerryTree(void) { - RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject)); + RemoveBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } @@ -1326,14 +1326,14 @@ void ResetBerryTreeSparkleFlags(void) top = cam_top + 3; right = cam_left + 14; bottom = top + 8; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) + if (gObjectEvents[i].active && gObjectEvents[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH) { - cam_left = gEventObjects[i].currentCoords.x; - cam_top = gEventObjects[i].currentCoords.y; + cam_left = gObjectEvents[i].currentCoords.x; + cam_top = gObjectEvents[i].currentCoords.y; if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom) - ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId); + ResetBerryTreeSparkleFlag(gObjectEvents[i].trainerRange_berryTreeId); } } } diff --git a/src/bike.c b/src/bike.c index fad61ffab..b265a31bb 100644 --- a/src/bike.c +++ b/src/bike.c @@ -46,7 +46,7 @@ static void Bike_UpdateDirTimerHistory(u8); static void Bike_UpdateABStartSelectHistory(u8); static u8 Bike_DPadToDirection(u16); static u8 GetBikeCollision(u8); -static u8 GetBikeCollisionAt(struct EventObject *, s16, s16, u8, u8); +static u8 GetBikeCollisionAt(struct ObjectEvent *, s16, s16, u8, u8); static bool8 IsRunningDisallowedByMetatile(u8); static void Bike_TryAdvanceCyclingRoadCollisions(); static u8 CanBikeFaceDirOnMetatile(u8, u8); @@ -186,31 +186,31 @@ static void MachBikeTransition_FaceDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior)) { PlayerTurnInPlace(direction); Bike_SetBikeStill(); } else { - MachBikeTransition_FaceDirection(playerEventObj->facingDirection); + MachBikeTransition_FaceDirection(playerObjEvent->facingDirection); } } static void MachBikeTransition_TrySpeedUp(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; u8 collision; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == FALSE) { // we cannot go forward, so either slow down or, if we are stopped, idle face direction. if (gPlayerAvatar.bikeSpeed) - MachBikeTransition_TrySlowDown(playerEventObj->movementDirection); + MachBikeTransition_TrySlowDown(playerObjEvent->movementDirection); else - MachBikeTransition_FaceDirection(playerEventObj->movementDirection); + MachBikeTransition_FaceDirection(playerObjEvent->movementDirection); } else { @@ -226,7 +226,7 @@ static void MachBikeTransition_TrySpeedUp(u8 direction) { // we hit a solid object that is not a ledge, so perform the collision. Bike_SetBikeStill(); - if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) PlayerOnBikeCollideWithFarawayIslandMew(direction); else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) PlayerOnBikeCollide(direction); @@ -261,7 +261,7 @@ static void MachBikeTransition_TrySlowDown(u8 direction) else { Bike_SetBikeStill(); - if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) PlayerOnBikeCollideWithFarawayIslandMew(direction); else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) PlayerOnBikeCollide(direction); @@ -366,10 +366,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; gPlayerAvatar.runningState = NOT_MOVING; if (heldKeys & B_BUTTON) @@ -378,7 +378,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 { // B button was released. gPlayerAvatar.bikeFrameCounter = 0; - if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // Go back to normal on flat ground *newDirection = direction; @@ -413,15 +413,15 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // B button was released Bike_SetBikeStill(); - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // even though B was released, dont undo the wheelie on the bumpy slope. gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING; @@ -460,15 +460,15 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; direction = GetPlayerFacingDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // we were moving on a wheelie, but we let go while moving. reset bike still status Bike_SetBikeStill(); - if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) { // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; @@ -514,10 +514,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->facingDirectionLocked = 0; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + playerObjEvent->facingDirectionLocked = 0; + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -535,21 +535,21 @@ static void AcroBikeTransition_FaceDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerFaceDirection(direction); } static void AcroBikeTransition_Moving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - AcroBikeTransition_FaceDirection(playerEventObj->movementDirection); + AcroBikeTransition_FaceDirection(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -557,7 +557,7 @@ static void AcroBikeTransition_Moving(u8 direction) { if (collision == COLLISION_LEDGE_JUMP) PlayerJumpLedge(direction); - else if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + else if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) PlayerOnBikeCollideWithFarawayIslandMew(direction); else if (collision < COLLISION_STOP_SURFING || collision > COLLISION_ROTATING_GATE) PlayerOnBikeCollide(direction); @@ -570,48 +570,48 @@ static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerStartWheelie(direction); } static void AcroBikeTransition_WheelieToNormal(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerEndWheelie(direction); } static void AcroBikeTransition_WheelieIdle(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerIdleWheelie(direction); } static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) - direction = playerEventObj->movementDirection; + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) + direction = playerObjEvent->movementDirection; PlayerStandingHoppingWheelie(direction); } static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - AcroBikeTransition_WheelieHoppingStanding(playerEventObj->movementDirection); + AcroBikeTransition_WheelieHoppingStanding(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -641,7 +641,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; collision = GetBikeCollision(direction); if (collision) @@ -659,9 +659,9 @@ static void AcroBikeTransition_SideJump(u8 direction) return; } } - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; PlaySE(SE_JITE_PYOKO); - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); } @@ -673,11 +673,11 @@ static void AcroBikeTransition_TurnJump(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerIdleWheelie(playerEventObj->movementDirection); + PlayerIdleWheelie(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -693,7 +693,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (collision < COLLISION_STOP_SURFING) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -707,11 +707,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerStartWheelie(playerEventObj->movementDirection); + PlayerStartWheelie(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -727,7 +727,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (collision < COLLISION_STOP_SURFING) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_808B980(direction); //hit wall? @@ -741,11 +741,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) + if (CanBikeFaceDirOnMetatile(direction, playerObjEvent->currentMetatileBehavior) == 0) { - PlayerEndWheelie(playerEventObj->movementDirection); + PlayerEndWheelie(playerObjEvent->movementDirection); return; } collision = GetBikeCollision(direction); @@ -868,19 +868,19 @@ static u8 Bike_DPadToDirection(u16 heldKeys) static u8 GetBikeCollision(u8 direction) { u8 metatitleBehavior; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - s16 x = playerEventObj->currentCoords.x; - s16 y = playerEventObj->currentCoords.y; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + s16 x = playerObjEvent->currentCoords.x; + s16 y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); - return GetBikeCollisionAt(playerEventObj, x, y, direction, metatitleBehavior); + return GetBikeCollisionAt(playerObjEvent, x, y, direction, metatitleBehavior); } -static u8 GetBikeCollisionAt(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) +static u8 GetBikeCollisionAt(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatitleBehavior) { - u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior); + u8 collision = CheckForObjectEventCollision(objectEvent, x, y, direction, metatitleBehavior); - if (collision > COLLISION_EVENT_OBJECT) + if (collision > COLLISION_OBJECT_EVENT) return collision; if (collision == COLLISION_NONE && IsRunningDisallowedByMetatile(metatitleBehavior)) @@ -966,7 +966,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/cable_car.c b/src/cable_car.c index d310ae299..00eedfdae 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -768,15 +768,15 @@ static void LoadCableCarSprites(void) u8 i; u8 playerGraphicsIds[2] = { - EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, - EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, + OBJ_EVENT_GFX_RIVAL_MAY_NORMAL }; u16 rval = Random(); u8 hikerGraphicsIds[4] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_ZIGZAGOON_1 + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_ZIGZAGOON_1 }; s16 hikerCoords[2][2] = { { 0, 80 }, @@ -797,7 +797,7 @@ static void LoadCableCarSprites(void) { case 0: default: - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -821,7 +821,7 @@ static void LoadCableCarSprites(void) break; case 1: CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -852,7 +852,7 @@ static void LoadCableCarSprites(void) } if ((rval % 64) == 0) { - spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; diff --git a/src/contest.c b/src/contest.c index e538b5ae0..f1741d16a 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2615,9 +2615,9 @@ void sub_80DA8C8(u8 partyIndex) } memcpy(gContestMons[gContestPlayerMonIndex].trainerName, name, 8); if (gSaveBlock2Ptr->playerGender == MALE) - gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_BRENDAN; + gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_BRENDAN; else - gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_MAY; + gContestMons[gContestPlayerMonIndex].trainerGfxId = OBJ_EVENT_GFX_LINK_MAY; gContestMons[gContestPlayerMonIndex].aiChecks = 0; gContestMons[gContestPlayerMonIndex].unk2C[0] = 0; gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES); diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h index 010559e3b..8fa746725 100644 --- a/src/data/contest_opponents.h +++ b/src/data/contest_opponents.h @@ -182,7 +182,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_POOCHYENA, .nickname = _("POOCHY"), .trainerName = _("JIMMY"), - .trainerGfxId = EVENT_OBJ_GFX_BOY_1, + .trainerGfxId = OBJ_EVENT_GFX_BOY_1, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -211,7 +211,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ILLUMISE, .nickname = _("MUSILLE"), .trainerName = _("EDITH"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -240,7 +240,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DUSTOX, .nickname = _("DUSTER"), .trainerName = _("EVAN"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -269,7 +269,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEEDOT, .nickname = _("DOTS"), .trainerName = _("KELSEY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -298,7 +298,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TAILLOW, .nickname = _("TATAY"), .trainerName = _("MADISON"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -327,7 +327,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_NINCADA, .nickname = _("NINDA"), .trainerName = _("RAYMOND"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -356,7 +356,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SHROOMISH, .nickname = _("SMISH"), .trainerName = _("GRANT"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -385,7 +385,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SPHEAL, .nickname = _("SLEAL"), .trainerName = _("PAIGE"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -414,7 +414,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLAKOTH, .nickname = _("SLOKTH"), .trainerName = _("ALEC"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -443,7 +443,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_WHISMUR, .nickname = _("WHIRIS"), .trainerName = _("SYDNEY"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -472,7 +472,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MAKUHITA, .nickname = _("MAHITA"), .trainerName = _("MORRIS"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x8010FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -501,7 +501,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ARON, .nickname = _("RONAR"), .trainerName = _("MARIAH"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x8008FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -530,7 +530,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CROBAT, .nickname = _("BATRO"), .trainerName = _("RUSSELL"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x90004FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -559,7 +559,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GULPIN, .nickname = _("GULIN"), .trainerName = _("MELANIE"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x40002FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -588,7 +588,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MANECTRIC, .nickname = _("RIKELEC"), .trainerName = _("CHANCE"), - .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY, + .trainerGfxId = OBJ_EVENT_GFX_RICH_BOY, .aiChecks = 0x80001FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -617,7 +617,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BULBASAUR, .nickname = _("BULBY"), .trainerName = _("AGATHA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -646,7 +646,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BUTTERFREE, .nickname = _("FUTTERBE"), .trainerName = _("BEAU"), - .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -675,7 +675,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PIDGEOTTO, .nickname = _("PIDEOT"), .trainerName = _("KAY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -704,7 +704,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DIGLETT, .nickname = _("DIGLE"), .trainerName = _("CALE"), - .trainerGfxId = EVENT_OBJ_GFX_HIKER, + .trainerGfxId = OBJ_EVENT_GFX_HIKER, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -733,7 +733,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_POLIWAG, .nickname = _("WAGIL"), .trainerName = _("CAITLIN"), - .trainerGfxId = EVENT_OBJ_GFX_TUBER_F, + .trainerGfxId = OBJ_EVENT_GFX_TUBER_F, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -762,7 +762,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TOTODILE, .nickname = _("TOTDIL"), .trainerName = _("COLBY"), - .trainerGfxId = EVENT_OBJ_GFX_NINJA_BOY, + .trainerGfxId = OBJ_EVENT_GFX_NINJA_BOY, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -791,7 +791,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LEDYBA, .nickname = _("BALEDY"), .trainerName = _("KYLIE"), - .trainerGfxId = EVENT_OBJ_GFX_BEAUTY, + .trainerGfxId = OBJ_EVENT_GFX_BEAUTY, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = TRUE, @@ -820,7 +820,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DELIBIRD, .nickname = _("BIRDLY"), .trainerName = _("LIAM"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_5, + .trainerGfxId = OBJ_EVENT_GFX_MAN_5, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -849,7 +849,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LARVITAR, .nickname = _("TARVITAR"), .trainerName = _("MILO"), - .trainerGfxId = EVENT_OBJ_GFX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_MANIAC, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_NORMAL, .aiPool_Cool = FALSE, @@ -878,7 +878,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ROSELIA, .nickname = _("RELIA"), .trainerName = _("KARINA"), - .trainerGfxId = EVENT_OBJ_GFX_PICNICKER, + .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiChecks = 0x24000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -907,7 +907,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DODRIO, .nickname = _("DUODO"), .trainerName = _("BOBBY"), - .trainerGfxId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + .trainerGfxId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -936,7 +936,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TRAPINCH, .nickname = _("PINCHIN"), .trainerName = _("CLAIRE"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x81000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -965,7 +965,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CACNEA, .nickname = _("NACAC"), .trainerName = _("WILLIE"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x80800FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -994,7 +994,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SANDSLASH, .nickname = _("SHRAND"), .trainerName = _("CASSIDY"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x10400FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1023,7 +1023,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BALTOY, .nickname = _("TOYBAL"), .trainerName = _("MORGAN"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x8200FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1052,7 +1052,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MEDICHAM, .nickname = _("CHAMCHAM"), .trainerName = _("SUMMER"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x10100FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1081,7 +1081,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SPINDA, .nickname = _("SPININ"), .trainerName = _("MILES"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x80080FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1110,7 +1110,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SWABLU, .nickname = _("SWABY"), .trainerName = _("AUDREY"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0xA0040FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1139,7 +1139,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SPOINK, .nickname = _("POINKER"), .trainerName = _("AVERY"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1168,7 +1168,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_KECLEON, .nickname = _("KECON"), .trainerName = _("ARIANA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x80010FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1197,7 +1197,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GOLDEEN, .nickname = _("GOLDEN"), .trainerName = _("ASHTON"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x80008FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1226,7 +1226,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BARBOACH, .nickname = _("BOBOACH"), .trainerName = _("SANDRA"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x80004FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1255,7 +1255,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SKARMORY, .nickname = _("CORPY"), .trainerName = _("CARSON"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x8002FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1284,7 +1284,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LOTAD, .nickname = _("TADO"), .trainerName = _("KATRINA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x8001FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1313,7 +1313,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLOWBRO, .nickname = _("BROWLO"), .trainerName = _("LUKE"), - .trainerGfxId = EVENT_OBJ_GFX_FAT_MAN, + .trainerGfxId = OBJ_EVENT_GFX_FAT_MAN, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1342,7 +1342,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_FARFETCHD, .nickname = _("FETCHIN"), .trainerName = _("RAUL"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_5, + .trainerGfxId = OBJ_EVENT_GFX_MAN_5, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1371,7 +1371,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEEL, .nickname = _("SEELEY"), .trainerName = _("JADA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1400,7 +1400,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DROWZEE, .nickname = _("DROWZIN"), .trainerName = _("ZEEK"), - .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M, + .trainerGfxId = OBJ_EVENT_GFX_PSYCHIC_M, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1429,7 +1429,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HITMONCHAN, .nickname = _("HITEMON"), .trainerName = _("DIEGO"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_M, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1458,7 +1458,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BLISSEY, .nickname = _("BLISS"), .trainerName = _("ALIYAH"), - .trainerGfxId = EVENT_OBJ_GFX_TEALA, + .trainerGfxId = OBJ_EVENT_GFX_TEALA, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1487,7 +1487,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ELEKID, .nickname = _("KIDLEK"), .trainerName = _("NATALIA"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = TRUE, @@ -1516,7 +1516,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SNUBBULL, .nickname = _("SNUBBINS"), .trainerName = _("DEVIN"), - .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN, + .trainerGfxId = OBJ_EVENT_GFX_GENTLEMAN, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1545,7 +1545,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MISDREAVUS, .nickname = _("DREAVIS"), .trainerName = _("TYLOR"), - .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_SUPER, .aiPool_Cool = FALSE, @@ -1574,7 +1574,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LAIRON, .nickname = _("LAIRN"), .trainerName = _("RONNIE"), - .trainerGfxId = EVENT_OBJ_GFX_HIKER, + .trainerGfxId = OBJ_EVENT_GFX_HIKER, .aiChecks = 0x84000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1603,7 +1603,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SHIFTRY, .nickname = _("SHIFTY"), .trainerName = _("CLAUDIA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1632,7 +1632,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_NINJASK, .nickname = _("NINAS"), .trainerName = _("ELIAS"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x81000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1661,7 +1661,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SWELLOW, .nickname = _("WELOW"), .trainerName = _("JADE"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x80800FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1690,7 +1690,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MIGHTYENA, .nickname = _("YENA"), .trainerName = _("FRANCIS"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1719,7 +1719,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BEAUTIFLY, .nickname = _("TIFLY"), .trainerName = _("ALISHA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x80200FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1748,7 +1748,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEAKING, .nickname = _("KINGSEA"), .trainerName = _("SAUL"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x80100FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1777,7 +1777,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CASTFORM, .nickname = _("CASTER"), .trainerName = _("FELICIA"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0x80080FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1806,7 +1806,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MACHOKE, .nickname = _("CHOKEM"), .trainerName = _("EMILIO"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x80040FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -1835,7 +1835,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LOMBRE, .nickname = _("LOMBE"), .trainerName = _("KARLA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1864,7 +1864,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SEVIPER, .nickname = _("VIPES"), .trainerName = _("DARRYL"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x80010FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1893,7 +1893,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_WAILMER, .nickname = _("MERAIL"), .trainerName = _("SELENA"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_F, .aiChecks = 0x80008FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1922,7 +1922,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MAGIKARP, .nickname = _("KARPAG"), .trainerName = _("NOEL"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x80004FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1951,7 +1951,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LUNATONE, .nickname = _("LUNONE"), .trainerName = _("LACEY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x80002FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -1980,7 +1980,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ABSOL, .nickname = _("ABSO"), .trainerName = _("CORBIN"), - .trainerGfxId = EVENT_OBJ_GFX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_MANIAC, .aiChecks = 0x80001FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2009,7 +2009,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_EXEGGUTOR, .nickname = _("EGGSOR"), .trainerName = _("GRACIE"), - .trainerGfxId = EVENT_OBJ_GFX_PICNICKER, + .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2038,7 +2038,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_CUBONE, .nickname = _("CUBIN"), .trainerName = _("COLTIN"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_4, + .trainerGfxId = OBJ_EVENT_GFX_MAN_4, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2067,7 +2067,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HITMONLEE, .nickname = _("HITMON"), .trainerName = _("ELLIE"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_F, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_F, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2096,7 +2096,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SQUIRTLE, .nickname = _("SURTLE"), .trainerName = _("MARCUS"), - .trainerGfxId = EVENT_OBJ_GFX_SAILOR, + .trainerGfxId = OBJ_EVENT_GFX_SAILOR, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2125,7 +2125,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_KANGASKHAN, .nickname = _("KHANKAN"), .trainerName = _("KIARA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_3, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_3, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2154,7 +2154,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PINECO, .nickname = _("PINOC"), .trainerName = _("BRYCE"), - .trainerGfxId = EVENT_OBJ_GFX_BUG_CATCHER, + .trainerGfxId = OBJ_EVENT_GFX_BUG_CATCHER, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2183,7 +2183,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DUNSPARCE, .nickname = _("DILTOT"), .trainerName = _("JAMIE"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_5, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2212,7 +2212,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HOUNDOOM, .nickname = _("DOOMOND"), .trainerName = _("JORGE"), - .trainerGfxId = EVENT_OBJ_GFX_GENTLEMAN, + .trainerGfxId = OBJ_EVENT_GFX_GENTLEMAN, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = TRUE, @@ -2241,7 +2241,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MILTANK, .nickname = _("MILKAN"), .trainerName = _("DEVON"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_M, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_M, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_HYPER, .aiPool_Cool = FALSE, @@ -2270,7 +2270,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GYARADOS, .nickname = _("RADOS"), .trainerName = _("JUSTINA"), - .trainerGfxId = EVENT_OBJ_GFX_PICNICKER, + .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiChecks = 0x84000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2299,7 +2299,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LOUDRED, .nickname = _("LOUDERD"), .trainerName = _("RALPH"), - .trainerGfxId = EVENT_OBJ_GFX_EXPERT_M, + .trainerGfxId = OBJ_EVENT_GFX_EXPERT_M, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2328,7 +2328,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SKITTY, .nickname = _("SITTY"), .trainerName = _("ROSA"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_1, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiChecks = 0x81000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2357,7 +2357,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLAKING, .nickname = _("SLING"), .trainerName = _("KEATON"), - .trainerGfxId = EVENT_OBJ_GFX_LITTLE_BOY, + .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiChecks = 0x80800FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2386,7 +2386,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ALTARIA, .nickname = _("TARIA"), .trainerName = _("MAYRA"), - .trainerGfxId = EVENT_OBJ_GFX_POKEFAN_F, + .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2415,7 +2415,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_KIRLIA, .nickname = _("LIRKI"), .trainerName = _("LAMAR"), - .trainerGfxId = EVENT_OBJ_GFX_RICH_BOY, + .trainerGfxId = OBJ_EVENT_GFX_RICH_BOY, .aiChecks = 0x80200FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2444,7 +2444,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_BELLOSSOM, .nickname = _("BLOSSOM"), .trainerName = _("AUBREY"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_4, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiChecks = 0x80100FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2473,7 +2473,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SABLEYE, .nickname = _("EYESAB"), .trainerName = _("NIGEL"), - .trainerGfxId = EVENT_OBJ_GFX_CAMPER, + .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiChecks = 0x80080FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2502,7 +2502,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_NATU, .nickname = _("UTAN"), .trainerName = _("CAMILLE"), - .trainerGfxId = EVENT_OBJ_GFX_LASS, + .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiChecks = 0x80040FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2531,7 +2531,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SHARPEDO, .nickname = _("PEDOS"), .trainerName = _("DEON"), - .trainerGfxId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiChecks = 0x80020FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2560,7 +2560,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_LUVDISC, .nickname = _("LUVIS"), .trainerName = _("JANELLE"), - .trainerGfxId = EVENT_OBJ_GFX_GIRL_2, + .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiChecks = 0x80010FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2589,7 +2589,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_HERACROSS, .nickname = _("HEROSS"), .trainerName = _("HEATH"), - .trainerGfxId = EVENT_OBJ_GFX_MAN_3, + .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiChecks = 0x80008FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2618,7 +2618,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ELECTRODE, .nickname = _("RODLECT"), .trainerName = _("SASHA"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x80004FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2647,7 +2647,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PICHU, .nickname = _("CHUPY"), .trainerName = _("FRANKIE"), - .trainerGfxId = EVENT_OBJ_GFX_YOUNGSTER, + .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiChecks = 0x80002FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2676,7 +2676,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_WOBBUFFET, .nickname = _("WOBET"), .trainerName = _("HELEN"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_1, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiChecks = 0x80001FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2705,7 +2705,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_GENGAR, .nickname = _("GAREN"), .trainerName = _("CAMILE"), - .trainerGfxId = EVENT_OBJ_GFX_HEX_MANIAC, + .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiChecks = 0xC000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2734,7 +2734,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_PORYGON, .nickname = _("GONPOR"), .trainerName = _("MARTIN"), - .trainerGfxId = EVENT_OBJ_GFX_SCIENTIST_1, + .trainerGfxId = OBJ_EVENT_GFX_SCIENTIST_1, .aiChecks = 0x82000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2763,7 +2763,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_DRAGONITE, .nickname = _("DRITE"), .trainerName = _("SERGIO"), - .trainerGfxId = EVENT_OBJ_GFX_BOY_1, + .trainerGfxId = OBJ_EVENT_GFX_BOY_1, .aiChecks = 0x21000FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2792,7 +2792,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_MEOWTH, .nickname = _("MEOWY"), .trainerName = _("KAILEY"), - .trainerGfxId = EVENT_OBJ_GFX_TWIN, + .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiChecks = 0x20800FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2821,7 +2821,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_JYNX, .nickname = _("NYX"), .trainerName = _("PERLA"), - .trainerGfxId = EVENT_OBJ_GFX_BEAUTY, + .trainerGfxId = OBJ_EVENT_GFX_BEAUTY, .aiChecks = 0x80400FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2850,7 +2850,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_TOGEPI, .nickname = _("GEPITO"), .trainerName = _("CLARA"), - .trainerGfxId = EVENT_OBJ_GFX_WOMAN_2, + .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiChecks = 0x10200FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2879,7 +2879,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_ESPEON, .nickname = _("SPEON"), .trainerName = _("JAKOB"), - .trainerGfxId = EVENT_OBJ_GFX_PSYCHIC_M, + .trainerGfxId = OBJ_EVENT_GFX_PSYCHIC_M, .aiChecks = 0x20100FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, @@ -2908,7 +2908,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_SLOWKING, .nickname = _("SLOWGO"), .trainerName = _("TREY"), - .trainerGfxId = EVENT_OBJ_GFX_SAILOR, + .trainerGfxId = OBJ_EVENT_GFX_SAILOR, .aiChecks = 0x8080FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = FALSE, @@ -2937,7 +2937,7 @@ const struct ContestPokemon gContestOpponents[] = .species = SPECIES_URSARING, .nickname = _("URSING"), .trainerName = _("LANE"), - .trainerGfxId = EVENT_OBJ_GFX_BLACK_BELT, + .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiChecks = 0x40040FFF, .whichRank = CONTEST_RANK_MASTER, .aiPool_Cool = TRUE, diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h index 2b91cb53d..f11520511 100644 --- a/src/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h @@ -461,181 +461,181 @@ const u16 DecorGfx_KISS_POSTER[] = { }; const u16 DecorGfx_PICHU_DOLL[] = { - EVENT_OBJ_GFX_PICHU_DOLL + OBJ_EVENT_GFX_PICHU_DOLL }; const u16 DecorGfx_PIKACHU_DOLL[] = { - EVENT_OBJ_GFX_PIKACHU_DOLL + OBJ_EVENT_GFX_PIKACHU_DOLL }; const u16 DecorGfx_MARILL_DOLL[] = { - EVENT_OBJ_GFX_MARILL_DOLL + OBJ_EVENT_GFX_MARILL_DOLL }; const u16 DecorGfx_TOGEPI_DOLL[] = { - EVENT_OBJ_GFX_TOGEPI_DOLL + OBJ_EVENT_GFX_TOGEPI_DOLL }; const u16 DecorGfx_CYNDAQUIL_DOLL[] = { - EVENT_OBJ_GFX_CYNDAQUIL_DOLL + OBJ_EVENT_GFX_CYNDAQUIL_DOLL }; const u16 DecorGfx_CHIKORITA_DOLL[] = { - EVENT_OBJ_GFX_CHIKORITA_DOLL + OBJ_EVENT_GFX_CHIKORITA_DOLL }; const u16 DecorGfx_TOTODILE_DOLL[] = { - EVENT_OBJ_GFX_TOTODILE_DOLL + OBJ_EVENT_GFX_TOTODILE_DOLL }; const u16 DecorGfx_JIGGLYPUFF_DOLL[] = { - EVENT_OBJ_GFX_JIGGLYPUFF_DOLL + OBJ_EVENT_GFX_JIGGLYPUFF_DOLL }; const u16 DecorGfx_MEOWTH_DOLL[] = { - EVENT_OBJ_GFX_MEOWTH_DOLL + OBJ_EVENT_GFX_MEOWTH_DOLL }; const u16 DecorGfx_CLEFAIRY_DOLL[] = { - EVENT_OBJ_GFX_CLEFAIRY_DOLL + OBJ_EVENT_GFX_CLEFAIRY_DOLL }; const u16 DecorGfx_DITTO_DOLL[] = { - EVENT_OBJ_GFX_DITTO_DOLL + OBJ_EVENT_GFX_DITTO_DOLL }; const u16 DecorGfx_SMOOCHUM_DOLL[] = { - EVENT_OBJ_GFX_SMOOCHUM_DOLL + OBJ_EVENT_GFX_SMOOCHUM_DOLL }; const u16 DecorGfx_TREECKO_DOLL[] = { - EVENT_OBJ_GFX_TREECKO_DOLL + OBJ_EVENT_GFX_TREECKO_DOLL }; const u16 DecorGfx_TORCHIC_DOLL[] = { - EVENT_OBJ_GFX_TORCHIC_DOLL + OBJ_EVENT_GFX_TORCHIC_DOLL }; const u16 DecorGfx_MUDKIP_DOLL[] = { - EVENT_OBJ_GFX_MUDKIP_DOLL + OBJ_EVENT_GFX_MUDKIP_DOLL }; const u16 DecorGfx_DUSKULL_DOLL[] = { - EVENT_OBJ_GFX_DUSKULL_DOLL + OBJ_EVENT_GFX_DUSKULL_DOLL }; const u16 DecorGfx_WYNAUT_DOLL[] = { - EVENT_OBJ_GFX_WYNAUT_DOLL + OBJ_EVENT_GFX_WYNAUT_DOLL }; const u16 DecorGfx_BALTOY_DOLL[] = { - EVENT_OBJ_GFX_BALTOY_DOLL + OBJ_EVENT_GFX_BALTOY_DOLL }; const u16 DecorGfx_KECLEON_DOLL[] = { - EVENT_OBJ_GFX_KECLEON_DOLL + OBJ_EVENT_GFX_KECLEON_DOLL }; const u16 DecorGfx_AZURILL_DOLL[] = { - EVENT_OBJ_GFX_AZURILL_DOLL + OBJ_EVENT_GFX_AZURILL_DOLL }; const u16 DecorGfx_SKITTY_DOLL[] = { - EVENT_OBJ_GFX_SKITTY_DOLL + OBJ_EVENT_GFX_SKITTY_DOLL }; const u16 DecorGfx_SWABLU_DOLL[] = { - EVENT_OBJ_GFX_SWABLU_DOLL + OBJ_EVENT_GFX_SWABLU_DOLL }; const u16 DecorGfx_GULPIN_DOLL[] = { - EVENT_OBJ_GFX_GULPIN_DOLL + OBJ_EVENT_GFX_GULPIN_DOLL }; const u16 DecorGfx_LOTAD_DOLL[] = { - EVENT_OBJ_GFX_LOTAD_DOLL + OBJ_EVENT_GFX_LOTAD_DOLL }; const u16 DecorGfx_SEEDOT_DOLL[] = { - EVENT_OBJ_GFX_SEEDOT_DOLL + OBJ_EVENT_GFX_SEEDOT_DOLL }; const u16 DecorGfx_PIKA_CUSHION[] = { - EVENT_OBJ_GFX_PIKA_CUSHION + OBJ_EVENT_GFX_PIKA_CUSHION }; const u16 DecorGfx_ROUND_CUSHION[] = { - EVENT_OBJ_GFX_ROUND_CUSHION + OBJ_EVENT_GFX_ROUND_CUSHION }; const u16 DecorGfx_KISS_CUSHION[] = { - EVENT_OBJ_GFX_KISS_CUSHION + OBJ_EVENT_GFX_KISS_CUSHION }; const u16 DecorGfx_ZIGZAG_CUSHION[] = { - EVENT_OBJ_GFX_ZIGZAG_CUSHION + OBJ_EVENT_GFX_ZIGZAG_CUSHION }; const u16 DecorGfx_SPIN_CUSHION[] = { - EVENT_OBJ_GFX_SPIN_CUSHION + OBJ_EVENT_GFX_SPIN_CUSHION }; const u16 DecorGfx_DIAMOND_CUSHION[] = { - EVENT_OBJ_GFX_DIAMOND_CUSHION + OBJ_EVENT_GFX_DIAMOND_CUSHION }; const u16 DecorGfx_BALL_CUSHION[] = { - EVENT_OBJ_GFX_BALL_CUSHION + OBJ_EVENT_GFX_BALL_CUSHION }; const u16 DecorGfx_GRASS_CUSHION[] = { - EVENT_OBJ_GFX_GRASS_CUSHION + OBJ_EVENT_GFX_GRASS_CUSHION }; const u16 DecorGfx_FIRE_CUSHION[] = { - EVENT_OBJ_GFX_FIRE_CUSHION + OBJ_EVENT_GFX_FIRE_CUSHION }; const u16 DecorGfx_WATER_CUSHION[] = { - EVENT_OBJ_GFX_WATER_CUSHION + OBJ_EVENT_GFX_WATER_CUSHION }; const u16 DecorGfx_SNORLAX_DOLL[] = { - EVENT_OBJ_GFX_BIG_SNORLAX_DOLL + OBJ_EVENT_GFX_BIG_SNORLAX_DOLL }; const u16 DecorGfx_RHYDON_DOLL[] = { - EVENT_OBJ_GFX_BIG_RHYDON_DOLL + OBJ_EVENT_GFX_BIG_RHYDON_DOLL }; const u16 DecorGfx_LAPRAS_DOLL[] = { - EVENT_OBJ_GFX_BIG_LAPRAS_DOLL + OBJ_EVENT_GFX_BIG_LAPRAS_DOLL }; const u16 DecorGfx_VENUSAUR_DOLL[] = { - EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL + OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL }; const u16 DecorGfx_CHARIZARD_DOLL[] = { - EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL + OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL }; const u16 DecorGfx_BLASTOISE_DOLL[] = { - EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL + OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL }; const u16 DecorGfx_WAILMER_DOLL[] = { - EVENT_OBJ_GFX_BIG_WAILMER_DOLL + OBJ_EVENT_GFX_BIG_WAILMER_DOLL }; const u16 DecorGfx_REGIROCK_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGIROCK_DOLL + OBJ_EVENT_GFX_BIG_REGIROCK_DOLL }; const u16 DecorGfx_REGICE_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGICE_DOLL + OBJ_EVENT_GFX_BIG_REGICE_DOLL }; const u16 DecorGfx_REGISTEEL_DOLL[] = { - EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL + OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL }; diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h deleted file mode 100755 index 27d5b1f9a..000000000 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ /dev/null @@ -1,565 +0,0 @@ -const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; - -const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; - -const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; - -const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; - -const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, -}; - -const u8 *const gBerryTreePaletteSlotTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, -}; - -const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - // 3 unused berries. - [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, -}; diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h deleted file mode 100755 index 6203e0548..000000000 --- a/src/data/field_event_obj/event_object_anims.h +++ /dev/null @@ -1,1171 +0,0 @@ -const union AnimCmd gEventObjectImageAnim_StayStill[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceSouth[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceNorth[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceWest[] = -{ - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceEast[] = -{ - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoSouth[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(3, 8, .hFlip = TRUE), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoNorth[] = -{ - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(4, 8, .hFlip = TRUE), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoWest[] = -{ - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoEast[] = -{ - ANIMCMD_FRAME(5, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(6, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastSouth[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastNorth[] = -{ - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(4, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastWest[] = -{ - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastEast[] = -{ - ANIMCMD_FRAME(5, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(6, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterSouth[] = -{ - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(3, 2, .hFlip = TRUE), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterNorth[] = -{ - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(4, 2, .hFlip = TRUE), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterWest[] = -{ - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterEast[] = -{ - ANIMCMD_FRAME(5, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(6, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestSouth[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(3, 1, .hFlip = TRUE), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestNorth[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(4, 1, .hFlip = TRUE), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestWest[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestEast[] = -{ - ANIMCMD_FRAME(5, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(6, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceSouth[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceNorth[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceWest[] = -{ - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceEast[] = -{ - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoSouth[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoNorth[] = -{ - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoWest[] = -{ - ANIMCMD_FRAME(7, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(8, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoEast[] = -{ - ANIMCMD_FRAME(7, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(8, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastSouth[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastNorth[] = -{ - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastWest[] = -{ - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastEast[] = -{ - ANIMCMD_FRAME(7, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(8, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterSouth[] = -{ - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterNorth[] = -{ - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterWest[] = -{ - ANIMCMD_FRAME(7, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(8, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterEast[] = -{ - ANIMCMD_FRAME(7, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(8, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestSouth[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestNorth[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestWest[] = -{ - ANIMCMD_FRAME(7, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(8, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestEast[] = -{ - ANIMCMD_FRAME(7, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(8, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunSouth[] = -{ - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_FRAME(13, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunNorth[] = -{ - ANIMCMD_FRAME(14, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_FRAME(15, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunWest[] = -{ - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_FRAME(17, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunEast[] = -{ - ANIMCMD_FRAME(16, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_FRAME(17, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FieldMove[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(4, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobSouth[] = -{ - ANIMCMD_FRAME(9, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobNorth[] = -{ - ANIMCMD_FRAME(10, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobWest[] = -{ - ANIMCMD_FRAME(11, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobEast[] = -{ - ANIMCMD_FRAME(11, 32, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelSouth[] = -{ - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelNorth[] = -{ - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelWest[] = -{ - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelEast[] = -{ - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelNorth[] = -{ - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelWest[] = -{ - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(20, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelEast[] = -{ - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(20, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelSouth[] = -{ - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelNorth[] = -{ - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelWest[] = -{ - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelEast[] = -{ - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelNorth[] = -{ - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelWest[] = -{ - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelEast[] = -{ - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieSouth[] = -{ - ANIMCMD_FRAME(21, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(22, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieNorth[] = -{ - ANIMCMD_FRAME(23, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_FRAME(24, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieWest[] = -{ - ANIMCMD_FRAME(25, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_FRAME(26, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieEast[] = -{ - ANIMCMD_FRAME(25, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_FRAME(26, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage0[] = -{ - ANIMCMD_FRAME(0, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(2, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage2[] = -{ - ANIMCMD_FRAME(3, 48), - ANIMCMD_FRAME(4, 48), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage3[] = -{ - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage4[] = -{ - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_NurseBow[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(9, 32), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_RockBreak[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TreeCut[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodSouth[] = -{ - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(11, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodNorth[] = -{ - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(7, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodWest[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodEast[] = -{ - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(9, 6), - ANIMCMD_FRAME(8, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodNorth[] = -{ - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(5, 6), - ANIMCMD_FRAME(4, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodWest[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodEast[] = -{ - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonSouth[] = -{ - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(11, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(11, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonNorth[] = -{ - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(7, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(7, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonWest[] = -{ - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonEast[] = -{ - ANIMCMD_FRAME(2, 6, .hFlip = TRUE), - ANIMCMD_FRAME(3, 6, .hFlip = TRUE), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8508FD8[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(7), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509008[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509040[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509050[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509060[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_LOOP(8), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509078[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_LOOP(8), - AFFINEANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_HoOhFlapWings[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HoOhStayStill[] = -{ - ANIMCMD_FRAME(3, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { - gEventObjectImageAnim_StayStill, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = { - gEventObjectImageAnim_QuintyPlumpFaceSouth, - gEventObjectImageAnim_QuintyPlumpFaceNorth, - gEventObjectImageAnim_QuintyPlumpFaceWest, - gEventObjectImageAnim_QuintyPlumpFaceEast, - gEventObjectImageAnim_QuintyPlumpGoSouth, - gEventObjectImageAnim_QuintyPlumpGoNorth, - gEventObjectImageAnim_QuintyPlumpGoWest, - gEventObjectImageAnim_QuintyPlumpGoEast, - gEventObjectImageAnim_QuintyPlumpGoFastSouth, - gEventObjectImageAnim_QuintyPlumpGoFastNorth, - gEventObjectImageAnim_QuintyPlumpGoFastWest, - gEventObjectImageAnim_QuintyPlumpGoFastEast, - gEventObjectImageAnim_QuintyPlumpGoFasterSouth, - gEventObjectImageAnim_QuintyPlumpGoFasterNorth, - gEventObjectImageAnim_QuintyPlumpGoFasterWest, - gEventObjectImageAnim_QuintyPlumpGoFasterEast, - gEventObjectImageAnim_QuintyPlumpGoFastestSouth, - gEventObjectImageAnim_QuintyPlumpGoFastestNorth, - gEventObjectImageAnim_QuintyPlumpGoFastestWest, - gEventObjectImageAnim_QuintyPlumpGoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_HoOh[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_HoOhFlapWings, - gEventObjectImageAnim_HoOhStayStill, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Groudon3[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd gEventObjectImageAnim_85091F0[] = -{ - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_85091F8[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509200[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509208[] = -{ - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509210[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509218[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509220[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509228[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509230[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Rayquaza2[] = { - gEventObjectImageAnim_8509218, - gEventObjectImageAnim_8509220, - gEventObjectImageAnim_8509228, - gEventObjectImageAnim_8509230, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_85091F0, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_RunSouth, - gEventObjectImageAnim_RunNorth, - gEventObjectImageAnim_RunWest, - gEventObjectImageAnim_RunEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_BunnyHoppyBackWheelSouth, - gEventObjectImageAnim_BunnyHoppyBackWheelNorth, - gEventObjectImageAnim_BunnyHoppyBackWheelWest, - gEventObjectImageAnim_BunnyHoppyBackWheelEast, - gEventObjectImageAnim_BunnyHoppyFrontWheelSouth, - gEventObjectImageAnim_BunnyHoppyFrontWheelNorth, - gEventObjectImageAnim_BunnyHoppyFrontWheelWest, - gEventObjectImageAnim_BunnyHoppyFrontWheelEast, - gEventObjectImageAnim_StandingWheelieBackWheelSouth, - gEventObjectImageAnim_StandingWheelieBackWheelNorth, - gEventObjectImageAnim_StandingWheelieBackWheelWest, - gEventObjectImageAnim_StandingWheelieBackWheelEast, - gEventObjectImageAnim_StandingWheelieFrontWheelSouth, - gEventObjectImageAnim_StandingWheelieFrontWheelNorth, - gEventObjectImageAnim_StandingWheelieFrontWheelWest, - gEventObjectImageAnim_StandingWheelieFrontWheelEast, - gEventObjectImageAnim_MovingWheelieSouth, - gEventObjectImageAnim_MovingWheelieNorth, - gEventObjectImageAnim_MovingWheelieWest, - gEventObjectImageAnim_MovingWheelieEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_GetOnOffSurfBlobSouth, - gEventObjectImageAnim_GetOnOffSurfBlobNorth, - gEventObjectImageAnim_GetOnOffSurfBlobWest, - gEventObjectImageAnim_GetOnOffSurfBlobEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_NurseBow, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = { - gEventObjectImageAnim_FieldMove, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { - gEventObjectImageAnim_BerryTreeStage0, - gEventObjectImageAnim_BerryTreeStage1, - gEventObjectImageAnim_BerryTreeStage2, - gEventObjectImageAnim_BerryTreeStage3, - gEventObjectImageAnim_BerryTreeStage4, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { - gEventObjectImageAnim_StayStill, - gEventObjectImageAnim_RockBreak, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { - gEventObjectImageAnim_StayStill, - gEventObjectImageAnim_TreeCut, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = { - gEventObjectImageAnim_TakeOutRodSouth, - gEventObjectImageAnim_TakeOutRodNorth, - gEventObjectImageAnim_TakeOutRodWest, - gEventObjectImageAnim_TakeOutRodEast, - gEventObjectImageAnim_PutAwayRodSouth, - gEventObjectImageAnim_PutAwayRodNorth, - gEventObjectImageAnim_PutAwayRodWest, - gEventObjectImageAnim_PutAwayRodEast, - gEventObjectImageAnim_HookedPokemonSouth, - gEventObjectImageAnim_HookedPokemonNorth, - gEventObjectImageAnim_HookedPokemonWest, - gEventObjectImageAnim_HookedPokemonEast, -}; - -const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = { - gEventObjectRotScalAnim_8508FD8, - gEventObjectRotScalAnim_8509008, - gEventObjectRotScalAnim_8509050, - gEventObjectRotScalAnim_8509040, - gEventObjectRotScalAnim_8509078, - gEventObjectRotScalAnim_8509060, -}; - -const struct UnkStruct_085094AC gUnknown_085094AC[] = { - { - .anims = gEventObjectImageAnimTable_QuintyPlump, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Standard, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_BrendanMayNormal, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_AcroBike, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Surfing, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Nurse, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Fishing, - .animPos = {1, 3, 0, 2}, - }, - { - NULL, - {0, 0, 0, 0}, - }, -}; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h deleted file mode 100755 index f7f1f33ba..000000000 --- a/src/data/field_event_obj/event_object_graphics.h +++ /dev/null @@ -1,362 +0,0 @@ -const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); -const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); -const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); -const u32 gEventObjectPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); -const u32 gEventObjectPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); -const u16 NullPalette_8499A38[16] = {}; -const u16 NullPalette_8499A58[16] = {}; -const u16 NullPalette_8499A78[16] = {}; -const u16 NullPalette_8499A98[16] = {}; -const u16 NullPalette_8499AB8[16] = {}; -const u16 NullPalette_8499AD8[16] = {}; -const u16 NullPalette_8499AF8[16] = {}; -const u16 NullPalette_8499B18[16] = {}; -const u16 NullPalette_8499B38[16] = {}; -const u16 NullPalette_8499B58[16] = {}; -const u16 NullPalette_8499B78[16] = {}; -const u16 NullPalette_8499B98[16] = {}; -const u16 NullPalette_8499BB8[16] = {}; -const u16 NullPalette_8499BD8[16] = {}; -const u16 NullPalette_8499BF8[16] = {}; -const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); -const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); -const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); -const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); -const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); -const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); -const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); -const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); -const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); -const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); -const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); -const u32 gEventObjectPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); -const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); -const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); -const u32 gEventObjectPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); -const u32 gEventObjectPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); -const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); -const u16 NullPalette_84A54F8[16] = {}; -const u16 NullPalette_84A5518[16] = {}; -const u16 NullPalette_84A5538[16] = {}; -const u16 NullPalette_84A5558[16] = {}; -const u16 NullPalette_84A5578[16] = {}; -const u16 NullPalette_84A5598[16] = {}; -const u16 NullPalette_84A55B8[16] = {}; -const u16 NullPalette_84A55D8[16] = {}; -const u16 NullPalette_84A55F8[16] = {}; -const u16 NullPalette_84A5618[16] = {}; -const u16 NullPalette_84A5638[16] = {}; -const u16 NullPalette_84A5658[16] = {}; -const u16 NullPalette_84A5678[16] = {}; -const u16 NullPalette_84A5698[16] = {}; -const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); -const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); -const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); -const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); -const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); -const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); -const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); -const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); -const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); -const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); -const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); -const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); -const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); -const u32 gEventObjectPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); -const u32 gEventObjectPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); -const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); -const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); -const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); -const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); -const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); -const u32 gEventObjectPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); -const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); -const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); -const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); -const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); -const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); -const u32 gEventObjectPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); -const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); -const u32 gEventObjectPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); -const u32 gEventObjectPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); -const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); -const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gEventObjectPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); -const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); -const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gEventObjectPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); -const u32 gEventObjectPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); -const u32 gEventObjectPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); -const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); -const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); -const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); -const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); -const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); -const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); -const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); -const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); -const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); -const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); -const u32 gEventObjectPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); -const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); -const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); -const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); -const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); -const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); -const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); -const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); -const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); -const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); -const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); -const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); -const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); -const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); -const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); -const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); -const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); -const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); -const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); -const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); -const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); -const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); -const u32 gEventObjectPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); -const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); -const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); -const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); -const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); -const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); -const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); -const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); -const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); -const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); -const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); -const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); -const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); -const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); -const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); -const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); -const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); -const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); -const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); -const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); -const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); -const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); -const u32 gEventObjectPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); -const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); -const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); -const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); -const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); -const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); -const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); -const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); -const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); -const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); -const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); -const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); -const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); -const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); -const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); -const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); -const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); -const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); -const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); -const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); -const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); -const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); -const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); -const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); -const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); -const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); -const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); -const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); -const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); -const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); -const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); -const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); -const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); -const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); -const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); -const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); -const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); -const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); -const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); -const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); -const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); -const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); -const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); -const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); -const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); -const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); -const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); -const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); -const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); -const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); -const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); -const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); -const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); -const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); -const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); -const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); -const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); -const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); -const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); -const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); -const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); -const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); -const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); -const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); -const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); -const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); -const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); -const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); -const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); -const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); -const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); -const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); -const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); -const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); -const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); -const u32 gEventObjectPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); -const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); -const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); -const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); -const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); -const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); -const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); -const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); -const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); -const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); -const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); -const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); -const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); -const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); -const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); -const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); -const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); -const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); -const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); -const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); -const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); -const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); -const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); -const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); -const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); -const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); -const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); -const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); -const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); -const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); -const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); -const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_extra_large.4bpp"); -const u32 filler_8368A08[0x48] = {}; -const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/event_objects/pics/effects/cut_grass.4bpp"); -const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/event_objects/pics/effects/cut_grass.4bpp"); -const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal"); -const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple.4bpp"); -const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/event_objects/pics/effects/ash.4bpp"); -const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow.4bpp"); -const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal"); -const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp"); -const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19.4bpp"); -const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash.4bpp"); -const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/event_objects/pics/effects/splash.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder.4bpp"); -const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp"); -const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp"); -const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); -const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); -const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); -const u32 gEventObjectPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); -const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); -const u32 gEventObjectPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); -const u32 gEventObjectPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); -const u32 gEventObjectPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); -const u32 gEventObjectPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); -const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); -const u32 gEventObjectPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); -const u32 gEventObjectPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); -const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); -const u32 gEventObjectPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); -const u32 gEventObjectPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); -const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); -const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); -const u32 gEventObjectPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); -const u32 gEventObjectPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); -const u32 gEventObjectPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); -const u32 gEventObjectPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); -const u32 gEventObjectPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); -const u32 gEventObjectPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); -const u32 gEventObjectPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); -const u32 gEventObjectPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); -const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); -const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); -const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); -const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h deleted file mode 100755 index 1f89cc98d..000000000 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ /dev/null @@ -1,245 +0,0 @@ -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Twin, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GameboyKid, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreSide, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Groudon3, gEventObjectPicTable_GroudonSide, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Rayquaza2, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Juan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scott, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Statue, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kirlia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Dusclops, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Red, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Leaf, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Deoxys, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Anabel, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tucker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Greta, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Spenser, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Noland, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lucy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brandon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h deleted file mode 100755 index 661539d57..000000000 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ /dev/null @@ -1,499 +0,0 @@ -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2; - - -const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { - [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_BrendanNormal, - [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_BrendanMachBike, - [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_BrendanSurfing, - [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_BrendanFieldMove, - [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gEventObjectGraphicsInfo_QuintyPlump, - [EVENT_OBJ_GFX_NINJA_BOY] = &gEventObjectGraphicsInfo_NinjaBoy, - [EVENT_OBJ_GFX_TWIN] = &gEventObjectGraphicsInfo_Twin, - [EVENT_OBJ_GFX_BOY_1] = &gEventObjectGraphicsInfo_Boy1, - [EVENT_OBJ_GFX_GIRL_1] = &gEventObjectGraphicsInfo_Girl1, - [EVENT_OBJ_GFX_BOY_2] = &gEventObjectGraphicsInfo_Boy2, - [EVENT_OBJ_GFX_GIRL_2] = &gEventObjectGraphicsInfo_Girl2, - [EVENT_OBJ_GFX_LITTLE_BOY] = &gEventObjectGraphicsInfo_LittleBoy, - [EVENT_OBJ_GFX_LITTLE_GIRL] = &gEventObjectGraphicsInfo_LittleGirl, - [EVENT_OBJ_GFX_BOY_3] = &gEventObjectGraphicsInfo_Boy3, - [EVENT_OBJ_GFX_GIRL_3] = &gEventObjectGraphicsInfo_Girl3, - [EVENT_OBJ_GFX_RICH_BOY] = &gEventObjectGraphicsInfo_RichBoy, - [EVENT_OBJ_GFX_WOMAN_1] = &gEventObjectGraphicsInfo_Woman1, - [EVENT_OBJ_GFX_FAT_MAN] = &gEventObjectGraphicsInfo_FatMan, - [EVENT_OBJ_GFX_POKEFAN_F] = &gEventObjectGraphicsInfo_PokefanF, - [EVENT_OBJ_GFX_MAN_1] = &gEventObjectGraphicsInfo_Man1, - [EVENT_OBJ_GFX_WOMAN_2] = &gEventObjectGraphicsInfo_Woman2, - [EVENT_OBJ_GFX_EXPERT_M] = &gEventObjectGraphicsInfo_ExpertM, - [EVENT_OBJ_GFX_EXPERT_F] = &gEventObjectGraphicsInfo_ExpertF, - [EVENT_OBJ_GFX_MAN_2] = &gEventObjectGraphicsInfo_Man2, - [EVENT_OBJ_GFX_WOMAN_3] = &gEventObjectGraphicsInfo_Woman3, - [EVENT_OBJ_GFX_POKEFAN_M] = &gEventObjectGraphicsInfo_PokefanM, - [EVENT_OBJ_GFX_WOMAN_4] = &gEventObjectGraphicsInfo_Woman4, - [EVENT_OBJ_GFX_COOK] = &gEventObjectGraphicsInfo_Cook, - [EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gEventObjectGraphicsInfo_LinkReceptionist, - [EVENT_OBJ_GFX_OLD_MAN] = &gEventObjectGraphicsInfo_OldMan, - [EVENT_OBJ_GFX_OLD_WOMAN] = &gEventObjectGraphicsInfo_OldWoman, - [EVENT_OBJ_GFX_CAMPER] = &gEventObjectGraphicsInfo_Camper, - [EVENT_OBJ_GFX_PICNICKER] = &gEventObjectGraphicsInfo_Picnicker, - [EVENT_OBJ_GFX_MAN_3] = &gEventObjectGraphicsInfo_Man3, - [EVENT_OBJ_GFX_WOMAN_5] = &gEventObjectGraphicsInfo_Woman5, - [EVENT_OBJ_GFX_YOUNGSTER] = &gEventObjectGraphicsInfo_Youngster, - [EVENT_OBJ_GFX_BUG_CATCHER] = &gEventObjectGraphicsInfo_BugCatcher, - [EVENT_OBJ_GFX_PSYCHIC_M] = &gEventObjectGraphicsInfo_PsychicM, - [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gEventObjectGraphicsInfo_SchoolKidM, - [EVENT_OBJ_GFX_MANIAC] = &gEventObjectGraphicsInfo_Maniac, - [EVENT_OBJ_GFX_HEX_MANIAC] = &gEventObjectGraphicsInfo_HexManiac, - [EVENT_OBJ_GFX_RAYQUAZA_1] = &gEventObjectGraphicsInfo_Rayquaza1, - [EVENT_OBJ_GFX_SWIMMER_M] = &gEventObjectGraphicsInfo_SwimmerM, - [EVENT_OBJ_GFX_SWIMMER_F] = &gEventObjectGraphicsInfo_SwimmerF, - [EVENT_OBJ_GFX_BLACK_BELT] = &gEventObjectGraphicsInfo_BlackBelt, - [EVENT_OBJ_GFX_BEAUTY] = &gEventObjectGraphicsInfo_Beauty, - [EVENT_OBJ_GFX_SCIENTIST_1] = &gEventObjectGraphicsInfo_Scientist1, - [EVENT_OBJ_GFX_LASS] = &gEventObjectGraphicsInfo_Lass, - [EVENT_OBJ_GFX_GENTLEMAN] = &gEventObjectGraphicsInfo_Gentleman, - [EVENT_OBJ_GFX_SAILOR] = &gEventObjectGraphicsInfo_Sailor, - [EVENT_OBJ_GFX_FISHERMAN] = &gEventObjectGraphicsInfo_Fisherman, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_RunningTriathleteM, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_RunningTriathleteF, - [EVENT_OBJ_GFX_TUBER_F] = &gEventObjectGraphicsInfo_TuberF, - [EVENT_OBJ_GFX_TUBER_M] = &gEventObjectGraphicsInfo_TuberM, - [EVENT_OBJ_GFX_HIKER] = &gEventObjectGraphicsInfo_Hiker, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_CyclingTriathleteM, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_CyclingTriathleteF, - [EVENT_OBJ_GFX_NURSE] = &gEventObjectGraphicsInfo_Nurse, - [EVENT_OBJ_GFX_ITEM_BALL] = &gEventObjectGraphicsInfo_ItemBall, - [EVENT_OBJ_GFX_BERRY_TREE] = &gEventObjectGraphicsInfo_BerryTree, - [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gEventObjectGraphicsInfo_BerryTreeEarlyStages, - [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gEventObjectGraphicsInfo_BerryTreeLateStages, - [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_BrendanAcroBike, - [EVENT_OBJ_GFX_PROF_BIRCH] = &gEventObjectGraphicsInfo_ProfBirch, - [EVENT_OBJ_GFX_MAN_4] = &gEventObjectGraphicsInfo_Man4, - [EVENT_OBJ_GFX_MAN_5] = &gEventObjectGraphicsInfo_Man5, - [EVENT_OBJ_GFX_REPORTER_M] = &gEventObjectGraphicsInfo_ReporterM, - [EVENT_OBJ_GFX_REPORTER_F] = &gEventObjectGraphicsInfo_ReporterF, - [EVENT_OBJ_GFX_BARD] = &gEventObjectGraphicsInfo_Bard, - [EVENT_OBJ_GFX_ANABEL] = &gEventObjectGraphicsInfo_Anabel, - [EVENT_OBJ_GFX_TUCKER] = &gEventObjectGraphicsInfo_Tucker, - [EVENT_OBJ_GFX_GRETA] = &gEventObjectGraphicsInfo_Greta, - [EVENT_OBJ_GFX_SPENSER] = &gEventObjectGraphicsInfo_Spenser, - [EVENT_OBJ_GFX_NOLAND] = &gEventObjectGraphicsInfo_Noland, - [EVENT_OBJ_GFX_LUCY] = &gEventObjectGraphicsInfo_Lucy, - [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gEventObjectGraphicsInfo_UnusedNatuDoll, - [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, - [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gEventObjectGraphicsInfo_UnusedSquirtleDoll, - [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gEventObjectGraphicsInfo_UnusedWooperDoll, - [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_UnusedPikachuDoll, - [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gEventObjectGraphicsInfo_UnusedPorygon2Doll, - [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gEventObjectGraphicsInfo_CuttableTree, - [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gEventObjectGraphicsInfo_MartEmployee, - [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gEventObjectGraphicsInfo_RooftopSaleWoman, - [EVENT_OBJ_GFX_TEALA] = &gEventObjectGraphicsInfo_Teala, - [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gEventObjectGraphicsInfo_BreakableRock, - [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gEventObjectGraphicsInfo_PushableBoulder, - [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gEventObjectGraphicsInfo_MrBrineysBoat, - [EVENT_OBJ_GFX_MAY_NORMAL] = &gEventObjectGraphicsInfo_MayNormal, - [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_MayMachBike, - [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_MayAcroBike, - [EVENT_OBJ_GFX_MAY_SURFING] = &gEventObjectGraphicsInfo_MaySurfing, - [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_MayFieldMove, - [EVENT_OBJ_GFX_TRUCK] = &gEventObjectGraphicsInfo_Truck, - [EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gEventObjectGraphicsInfo_VigorothCarryingBox, - [EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gEventObjectGraphicsInfo_VigorothFacingAway, - [EVENT_OBJ_GFX_BIRCHS_BAG] = &gEventObjectGraphicsInfo_BirchsBag, - [EVENT_OBJ_GFX_ZIGZAGOON_1] = &gEventObjectGraphicsInfo_EnemyZigzagoon, - [EVENT_OBJ_GFX_ARTIST] = &gEventObjectGraphicsInfo_Artist, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_RivalBrendanNormal, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanMachBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanAcroBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_RivalBrendanSurfing, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalBrendanFieldMove, - [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gEventObjectGraphicsInfo_RivalMayNormal, - [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalMayMachBike, - [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalMayAcroBike, - [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gEventObjectGraphicsInfo_RivalMaySurfing, - [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalMayFieldMove, - [EVENT_OBJ_GFX_CAMERAMAN] = &gEventObjectGraphicsInfo_Cameraman, - [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gEventObjectGraphicsInfo_BrendanUnderwater, - [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gEventObjectGraphicsInfo_MayUnderwater, - [EVENT_OBJ_GFX_MOVING_BOX] = &gEventObjectGraphicsInfo_MovingBox, - [EVENT_OBJ_GFX_CABLE_CAR] = &gEventObjectGraphicsInfo_CableCar, - [EVENT_OBJ_GFX_SCIENTIST_2] = &gEventObjectGraphicsInfo_Scientist2, - [EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gEventObjectGraphicsInfo_DevonEmployee, - [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gEventObjectGraphicsInfo_AquaMemberM, - [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gEventObjectGraphicsInfo_AquaMemberF, - [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gEventObjectGraphicsInfo_MagmaMemberM, - [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gEventObjectGraphicsInfo_MagmaMemberF, - [EVENT_OBJ_GFX_SIDNEY] = &gEventObjectGraphicsInfo_Sidney, - [EVENT_OBJ_GFX_PHOEBE] = &gEventObjectGraphicsInfo_Phoebe, - [EVENT_OBJ_GFX_GLACIA] = &gEventObjectGraphicsInfo_Glacia, - [EVENT_OBJ_GFX_DRAKE] = &gEventObjectGraphicsInfo_Drake, - [EVENT_OBJ_GFX_ROXANNE] = &gEventObjectGraphicsInfo_Roxanne, - [EVENT_OBJ_GFX_BRAWLY] = &gEventObjectGraphicsInfo_Brawly, - [EVENT_OBJ_GFX_WATTSON] = &gEventObjectGraphicsInfo_Wattson, - [EVENT_OBJ_GFX_FLANNERY] = &gEventObjectGraphicsInfo_Flannery, - [EVENT_OBJ_GFX_NORMAN] = &gEventObjectGraphicsInfo_Norman, - [EVENT_OBJ_GFX_WINONA] = &gEventObjectGraphicsInfo_Winona, - [EVENT_OBJ_GFX_LIZA] = &gEventObjectGraphicsInfo_Liza, - [EVENT_OBJ_GFX_TATE] = &gEventObjectGraphicsInfo_Tate, - [EVENT_OBJ_GFX_WALLACE] = &gEventObjectGraphicsInfo_Wallace, - [EVENT_OBJ_GFX_STEVEN] = &gEventObjectGraphicsInfo_Steven, - [EVENT_OBJ_GFX_WALLY] = &gEventObjectGraphicsInfo_Wally, - [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gEventObjectGraphicsInfo_RubySapphireLittleBoy, - [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gEventObjectGraphicsInfo_BrendanFishing, - [EVENT_OBJ_GFX_MAY_FISHING] = &gEventObjectGraphicsInfo_MayFishing, - [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gEventObjectGraphicsInfo_HotSpringsOldWoman, - [EVENT_OBJ_GFX_SS_TIDAL] = &gEventObjectGraphicsInfo_SSTidal, - [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gEventObjectGraphicsInfo_SubmarineShadow, - [EVENT_OBJ_GFX_PICHU_DOLL] = &gEventObjectGraphicsInfo_PichuDoll, - [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_PikachuDoll, - [EVENT_OBJ_GFX_MARILL_DOLL] = &gEventObjectGraphicsInfo_MarillDoll, - [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gEventObjectGraphicsInfo_TogepiDoll, - [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gEventObjectGraphicsInfo_CyndaquilDoll, - [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gEventObjectGraphicsInfo_ChikoritaDoll, - [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gEventObjectGraphicsInfo_TotodileDoll, - [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gEventObjectGraphicsInfo_JigglypuffDoll, - [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gEventObjectGraphicsInfo_MeowthDoll, - [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gEventObjectGraphicsInfo_ClefairyDoll, - [EVENT_OBJ_GFX_DITTO_DOLL] = &gEventObjectGraphicsInfo_DittoDoll, - [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gEventObjectGraphicsInfo_SmoochumDoll, - [EVENT_OBJ_GFX_TREECKO_DOLL] = &gEventObjectGraphicsInfo_TreeckoDoll, - [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gEventObjectGraphicsInfo_TorchicDoll, - [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gEventObjectGraphicsInfo_MudkipDoll, - [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gEventObjectGraphicsInfo_DuskullDoll, - [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gEventObjectGraphicsInfo_WynautDoll, - [EVENT_OBJ_GFX_BALTOY_DOLL] = &gEventObjectGraphicsInfo_BaltoyDoll, - [EVENT_OBJ_GFX_KECLEON_DOLL] = &gEventObjectGraphicsInfo_KecleonDoll, - [EVENT_OBJ_GFX_AZURILL_DOLL] = &gEventObjectGraphicsInfo_AzurillDoll, - [EVENT_OBJ_GFX_SKITTY_DOLL] = &gEventObjectGraphicsInfo_SkittyDoll, - [EVENT_OBJ_GFX_SWABLU_DOLL] = &gEventObjectGraphicsInfo_SwabluDoll, - [EVENT_OBJ_GFX_GULPIN_DOLL] = &gEventObjectGraphicsInfo_GulpinDoll, - [EVENT_OBJ_GFX_LOTAD_DOLL] = &gEventObjectGraphicsInfo_LotadDoll, - [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gEventObjectGraphicsInfo_SeedotDoll, - [EVENT_OBJ_GFX_PIKA_CUSHION] = &gEventObjectGraphicsInfo_PikaCushion, - [EVENT_OBJ_GFX_ROUND_CUSHION] = &gEventObjectGraphicsInfo_RoundCushion, - [EVENT_OBJ_GFX_KISS_CUSHION] = &gEventObjectGraphicsInfo_KissCushion, - [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gEventObjectGraphicsInfo_ZigzagCushion, - [EVENT_OBJ_GFX_SPIN_CUSHION] = &gEventObjectGraphicsInfo_SpinCushion, - [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gEventObjectGraphicsInfo_DiamondCushion, - [EVENT_OBJ_GFX_BALL_CUSHION] = &gEventObjectGraphicsInfo_BallCushion, - [EVENT_OBJ_GFX_GRASS_CUSHION] = &gEventObjectGraphicsInfo_GrassCushion, - [EVENT_OBJ_GFX_FIRE_CUSHION] = &gEventObjectGraphicsInfo_FireCushion, - [EVENT_OBJ_GFX_WATER_CUSHION] = &gEventObjectGraphicsInfo_WaterCushion, - [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gEventObjectGraphicsInfo_BigSnorlaxDoll, - [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gEventObjectGraphicsInfo_BigRhydonDoll, - [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gEventObjectGraphicsInfo_BigLaprasDoll, - [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gEventObjectGraphicsInfo_BigVenusaurDoll, - [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gEventObjectGraphicsInfo_BigCharizardDoll, - [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gEventObjectGraphicsInfo_BigBlastoiseDoll, - [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gEventObjectGraphicsInfo_BigWailmerDoll, - [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gEventObjectGraphicsInfo_BigRegirockDoll, - [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gEventObjectGraphicsInfo_BigRegiceDoll, - [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gEventObjectGraphicsInfo_BigRegisteelDoll, - [EVENT_OBJ_GFX_LATIAS] = &gEventObjectGraphicsInfo_Latias, - [EVENT_OBJ_GFX_LATIOS] = &gEventObjectGraphicsInfo_Latios, - [EVENT_OBJ_GFX_GAMEBOY_KID] = &gEventObjectGraphicsInfo_GameboyKid, - [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gEventObjectGraphicsInfo_ContestJudge, - [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gEventObjectGraphicsInfo_BrendanWatering, - [EVENT_OBJ_GFX_MAY_WATERING] = &gEventObjectGraphicsInfo_MayWatering, - [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gEventObjectGraphicsInfo_BrendanDecorating, - [EVENT_OBJ_GFX_MAY_DECORATING] = &gEventObjectGraphicsInfo_MayDecorating, - [EVENT_OBJ_GFX_ARCHIE] = &gEventObjectGraphicsInfo_Archie, - [EVENT_OBJ_GFX_MAXIE] = &gEventObjectGraphicsInfo_Maxie, - [EVENT_OBJ_GFX_KYOGRE_1] = &gEventObjectGraphicsInfo_Kyogre1, - [EVENT_OBJ_GFX_GROUDON_1] = &gEventObjectGraphicsInfo_Groudon1, - [EVENT_OBJ_GFX_FOSSIL] = &gEventObjectGraphicsInfo_Fossil, - [EVENT_OBJ_GFX_REGIROCK] = &gEventObjectGraphicsInfo_Regirock, - [EVENT_OBJ_GFX_REGICE] = &gEventObjectGraphicsInfo_Regice, - [EVENT_OBJ_GFX_REGISTEEL] = &gEventObjectGraphicsInfo_Registeel, - [EVENT_OBJ_GFX_SKITTY] = &gEventObjectGraphicsInfo_Skitty, - [EVENT_OBJ_GFX_KECLEON_1] = &gEventObjectGraphicsInfo_Kecleon1, - [EVENT_OBJ_GFX_KYOGRE_2] = &gEventObjectGraphicsInfo_Kyogre2, - [EVENT_OBJ_GFX_GROUDON_2] = &gEventObjectGraphicsInfo_Groudon2, - [EVENT_OBJ_GFX_RAYQUAZA_2] = &gEventObjectGraphicsInfo_Rayquaza2, - [EVENT_OBJ_GFX_ZIGZAGOON_2] = &gEventObjectGraphicsInfo_Zigzagoon, - [EVENT_OBJ_GFX_PIKACHU] = &gEventObjectGraphicsInfo_Pikachu, - [EVENT_OBJ_GFX_AZUMARILL] = &gEventObjectGraphicsInfo_Azumarill, - [EVENT_OBJ_GFX_WINGULL] = &gEventObjectGraphicsInfo_Wingull, - [EVENT_OBJ_GFX_KECLEON_2] = &gEventObjectGraphicsInfo_Kecleon2, - [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gEventObjectGraphicsInfo_TuberMSwimming, - [EVENT_OBJ_GFX_AZURILL] = &gEventObjectGraphicsInfo_Azurill, - [EVENT_OBJ_GFX_MOM] = &gEventObjectGraphicsInfo_Mom, - [EVENT_OBJ_GFX_LINK_BRENDAN] = &gEventObjectGraphicsInfo_LinkBrendan, - [EVENT_OBJ_GFX_LINK_MAY] = &gEventObjectGraphicsInfo_LinkMay, - [EVENT_OBJ_GFX_JUAN] = &gEventObjectGraphicsInfo_Juan, - [EVENT_OBJ_GFX_SCOTT] = &gEventObjectGraphicsInfo_Scott, - [EVENT_OBJ_GFX_POOCHYENA] = &gEventObjectGraphicsInfo_Poochyena, - [EVENT_OBJ_GFX_KYOGRE_3] = &gEventObjectGraphicsInfo_Kyogre3, - [EVENT_OBJ_GFX_GROUDON_3] = &gEventObjectGraphicsInfo_Groudon3, - [EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gEventObjectGraphicsInfo_MysteryEventDeliveryman, - [EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gEventObjectGraphicsInfo_Statue, - [EVENT_OBJ_GFX_KIRLIA] = &gEventObjectGraphicsInfo_Kirlia, - [EVENT_OBJ_GFX_DUSCLOPS] = &gEventObjectGraphicsInfo_Dusclops, - [EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gEventObjectGraphicsInfo_UnionRoomAttendant, - [EVENT_OBJ_GFX_SUDOWOODO] = &gEventObjectGraphicsInfo_Sudowoodo, - [EVENT_OBJ_GFX_MEW] = &gEventObjectGraphicsInfo_Mew, - [EVENT_OBJ_GFX_RED] = &gEventObjectGraphicsInfo_Red, - [EVENT_OBJ_GFX_LEAF] = &gEventObjectGraphicsInfo_Leaf, - [EVENT_OBJ_GFX_DEOXYS] = &gEventObjectGraphicsInfo_Deoxys, - [EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gEventObjectGraphicsInfo_BirthIslandStone, - [EVENT_OBJ_GFX_BRANDON] = &gEventObjectGraphicsInfo_Brandon, - [EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gEventObjectGraphicsInfo_RubySapphireBrendan, - [EVENT_OBJ_GFX_LINK_RS_MAY] = &gEventObjectGraphicsInfo_RubySapphireMay, - [EVENT_OBJ_GFX_LUGIA] = &gEventObjectGraphicsInfo_Lugia, - [EVENT_OBJ_GFX_HOOH] = &gEventObjectGraphicsInfo_HoOh, -}; - -const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - [MAUVILLE_MAN_BARD] = &gEventObjectGraphicsInfo_Bard, - [MAUVILLE_MAN_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, - [MAUVILLE_MAN_TRADER] = &gEventObjectGraphicsInfo_Trader, - [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, - [MAUVILLE_MAN_GIDDY] = &gEventObjectGraphicsInfo_Giddy, - [MAUVILLE_MAN_UNUSED1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - [MAUVILLE_MAN_UNUSED2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, -}; diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h deleted file mode 100755 index 5c8be195d..000000000 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ /dev/null @@ -1,2174 +0,0 @@ -const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6), -}; - -const struct SpriteFrameImage gEventObjectPicTable_NinjaBoy[] = { - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Twin[] = { - overworld_frame(gEventObjectPic_Twin, 2, 4, 0), - overworld_frame(gEventObjectPic_Twin, 2, 4, 1), - overworld_frame(gEventObjectPic_Twin, 2, 4, 2), - overworld_frame(gEventObjectPic_Twin, 2, 4, 3), - overworld_frame(gEventObjectPic_Twin, 2, 4, 4), - overworld_frame(gEventObjectPic_Twin, 2, 4, 5), - overworld_frame(gEventObjectPic_Twin, 2, 4, 6), - overworld_frame(gEventObjectPic_Twin, 2, 4, 7), - overworld_frame(gEventObjectPic_Twin, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = { - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl[] = { - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RichBoy[] = { - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 0), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 1), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 2), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 3), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 4), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 5), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 6), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 7), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PokefanF[] = { - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 0), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 1), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 2), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 3), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 4), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 5), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 6), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 7), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - overworld_frame(gEventObjectPic_Man1, 2, 4, 0), - overworld_frame(gEventObjectPic_Man1, 2, 4, 1), - overworld_frame(gEventObjectPic_Man1, 2, 4, 2), - overworld_frame(gEventObjectPic_Man1, 2, 4, 3), - overworld_frame(gEventObjectPic_Man1, 2, 4, 4), - overworld_frame(gEventObjectPic_Man1, 2, 4, 5), - overworld_frame(gEventObjectPic_Man1, 2, 4, 6), - overworld_frame(gEventObjectPic_Man1, 2, 4, 7), - overworld_frame(gEventObjectPic_Man1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ExpertM[] = { - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 0), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 1), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 2), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 3), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 4), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 5), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 6), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 7), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ExpertF[] = { - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 0), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 1), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 2), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 3), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 4), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 5), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 6), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 7), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - overworld_frame(gEventObjectPic_Man2, 2, 4, 0), - overworld_frame(gEventObjectPic_Man2, 2, 4, 1), - overworld_frame(gEventObjectPic_Man2, 2, 4, 2), - overworld_frame(gEventObjectPic_Man2, 2, 4, 3), - overworld_frame(gEventObjectPic_Man2, 2, 4, 4), - overworld_frame(gEventObjectPic_Man2, 2, 4, 5), - overworld_frame(gEventObjectPic_Man2, 2, 4, 6), - overworld_frame(gEventObjectPic_Man2, 2, 4, 7), - overworld_frame(gEventObjectPic_Man2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PokefanM[] = { - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 0), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 1), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 2), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 3), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 4), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 5), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 6), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 7), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LinkReceptionist[] = { - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 0), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 1), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 2), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 3), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 4), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 5), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 6), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 7), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldMan[] = { - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman[] = { - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - overworld_frame(gEventObjectPic_Camper, 2, 4, 0), - overworld_frame(gEventObjectPic_Camper, 2, 4, 1), - overworld_frame(gEventObjectPic_Camper, 2, 4, 2), - overworld_frame(gEventObjectPic_Camper, 2, 4, 3), - overworld_frame(gEventObjectPic_Camper, 2, 4, 4), - overworld_frame(gEventObjectPic_Camper, 2, 4, 5), - overworld_frame(gEventObjectPic_Camper, 2, 4, 6), - overworld_frame(gEventObjectPic_Camper, 2, 4, 7), - overworld_frame(gEventObjectPic_Camper, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - overworld_frame(gEventObjectPic_Man3, 2, 4, 0), - overworld_frame(gEventObjectPic_Man3, 2, 4, 1), - overworld_frame(gEventObjectPic_Man3, 2, 4, 2), - overworld_frame(gEventObjectPic_Man3, 2, 4, 3), - overworld_frame(gEventObjectPic_Man3, 2, 4, 4), - overworld_frame(gEventObjectPic_Man3, 2, 4, 5), - overworld_frame(gEventObjectPic_Man3, 2, 4, 6), - overworld_frame(gEventObjectPic_Man3, 2, 4, 7), - overworld_frame(gEventObjectPic_Man3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - overworld_frame(gEventObjectPic_Lass, 2, 4, 0), - overworld_frame(gEventObjectPic_Lass, 2, 4, 1), - overworld_frame(gEventObjectPic_Lass, 2, 4, 2), - overworld_frame(gEventObjectPic_Lass, 2, 4, 3), - overworld_frame(gEventObjectPic_Lass, 2, 4, 4), - overworld_frame(gEventObjectPic_Lass, 2, 4, 5), - overworld_frame(gEventObjectPic_Lass, 2, 4, 6), - overworld_frame(gEventObjectPic_Lass, 2, 4, 7), - overworld_frame(gEventObjectPic_Lass, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - obj_frame_tiles(gEventObjectPic_ItemBall), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - overworld_frame(gEventObjectPic_Man4, 2, 4, 0), - overworld_frame(gEventObjectPic_Man4, 2, 4, 1), - overworld_frame(gEventObjectPic_Man4, 2, 4, 2), - overworld_frame(gEventObjectPic_Man4, 2, 4, 3), - overworld_frame(gEventObjectPic_Man4, 2, 4, 4), - overworld_frame(gEventObjectPic_Man4, 2, 4, 5), - overworld_frame(gEventObjectPic_Man4, 2, 4, 6), - overworld_frame(gEventObjectPic_Man4, 2, 4, 7), - overworld_frame(gEventObjectPic_Man4, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - overworld_frame(gEventObjectPic_Man5, 2, 4, 0), - overworld_frame(gEventObjectPic_Man5, 2, 4, 1), - overworld_frame(gEventObjectPic_Man5, 2, 4, 2), - overworld_frame(gEventObjectPic_Man5, 2, 4, 3), - overworld_frame(gEventObjectPic_Man5, 2, 4, 4), - overworld_frame(gEventObjectPic_Man5, 2, 4, 5), - overworld_frame(gEventObjectPic_Man5, 2, 4, 6), - overworld_frame(gEventObjectPic_Man5, 2, 4, 7), - overworld_frame(gEventObjectPic_Man5, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedNatuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedWooperDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - overworld_frame(gEventObjectPic_Teala, 2, 4, 0), - overworld_frame(gEventObjectPic_Teala, 2, 4, 1), - overworld_frame(gEventObjectPic_Teala, 2, 4, 2), - overworld_frame(gEventObjectPic_Teala, 2, 4, 3), - overworld_frame(gEventObjectPic_Teala, 2, 4, 4), - overworld_frame(gEventObjectPic_Teala, 2, 4, 5), - overworld_frame(gEventObjectPic_Teala, 2, 4, 6), - overworld_frame(gEventObjectPic_Teala, 2, 4, 7), - overworld_frame(gEventObjectPic_Teala, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { - obj_frame_tiles(gEventObjectPic_PushableBoulder), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { - obj_frame_tiles(gEventObjectPic_Truck), -}; - -const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = { - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = { - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - obj_frame_tiles(gEventObjectPic_BirchsBag), -}; - -const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = { - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 0), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 1), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 2), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 3), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 4), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 5), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 6), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 7), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - overworld_frame(gEventObjectPic_Artist, 2, 4, 0), - overworld_frame(gEventObjectPic_Artist, 2, 4, 1), - overworld_frame(gEventObjectPic_Artist, 2, 4, 2), - overworld_frame(gEventObjectPic_Artist, 2, 4, 3), - overworld_frame(gEventObjectPic_Artist, 2, 4, 4), - overworld_frame(gEventObjectPic_Artist, 2, 4, 5), - overworld_frame(gEventObjectPic_Artist, 2, 4, 6), - overworld_frame(gEventObjectPic_Artist, 2, 4, 7), - overworld_frame(gEventObjectPic_Artist, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 0), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 1), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 2), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 3), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 4), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 5), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 6), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 7), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { - obj_frame_tiles(gEventObjectPic_MovingBox), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - obj_frame_tiles(gEventObjectPic_CableCar), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DevonEmployee[] = { - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - overworld_frame(gEventObjectPic_Norman, 2, 4, 0), - overworld_frame(gEventObjectPic_Norman, 2, 4, 1), - overworld_frame(gEventObjectPic_Norman, 2, 4, 2), - overworld_frame(gEventObjectPic_Norman, 2, 4, 3), - overworld_frame(gEventObjectPic_Norman, 2, 4, 4), - overworld_frame(gEventObjectPic_Norman, 2, 4, 5), - overworld_frame(gEventObjectPic_Norman, 2, 4, 6), - overworld_frame(gEventObjectPic_Norman, 2, 4, 7), - overworld_frame(gEventObjectPic_Norman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - overworld_frame(gEventObjectPic_Steven, 2, 4, 0), - overworld_frame(gEventObjectPic_Steven, 2, 4, 1), - overworld_frame(gEventObjectPic_Steven, 2, 4, 2), - overworld_frame(gEventObjectPic_Steven, 2, 4, 3), - overworld_frame(gEventObjectPic_Steven, 2, 4, 4), - overworld_frame(gEventObjectPic_Steven, 2, 4, 5), - overworld_frame(gEventObjectPic_Steven, 2, 4, 6), - overworld_frame(gEventObjectPic_Steven, 2, 4, 7), - overworld_frame(gEventObjectPic_Steven, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - overworld_frame(gEventObjectPic_Wally, 2, 4, 0), - overworld_frame(gEventObjectPic_Wally, 2, 4, 1), - overworld_frame(gEventObjectPic_Wally, 2, 4, 2), - overworld_frame(gEventObjectPic_Wally, 2, 4, 3), - overworld_frame(gEventObjectPic_Wally, 2, 4, 4), - overworld_frame(gEventObjectPic_Wally, 2, 4, 5), - overworld_frame(gEventObjectPic_Wally, 2, 4, 6), - overworld_frame(gEventObjectPic_Wally, 2, 4, 7), - overworld_frame(gEventObjectPic_Wally, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = { - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - obj_frame_tiles(gEventObjectPic_PichuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_PikachuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - obj_frame_tiles(gEventObjectPic_MarillDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - obj_frame_tiles(gEventObjectPic_TogepiDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - obj_frame_tiles(gEventObjectPic_CyndaquilDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - obj_frame_tiles(gEventObjectPic_ChikoritaDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - obj_frame_tiles(gEventObjectPic_TotodileDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - obj_frame_tiles(gEventObjectPic_JigglypuffDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - obj_frame_tiles(gEventObjectPic_MeowthDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - obj_frame_tiles(gEventObjectPic_ClefairyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - obj_frame_tiles(gEventObjectPic_DittoDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - obj_frame_tiles(gEventObjectPic_SmoochumDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - obj_frame_tiles(gEventObjectPic_TreeckoDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - obj_frame_tiles(gEventObjectPic_TorchicDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - obj_frame_tiles(gEventObjectPic_MudkipDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - obj_frame_tiles(gEventObjectPic_DuskullDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - obj_frame_tiles(gEventObjectPic_WynautDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - obj_frame_tiles(gEventObjectPic_BaltoyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - obj_frame_tiles(gEventObjectPic_KecleonDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - obj_frame_tiles(gEventObjectPic_AzurillDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - obj_frame_tiles(gEventObjectPic_SkittyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - obj_frame_tiles(gEventObjectPic_SwabluDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - obj_frame_tiles(gEventObjectPic_GulpinDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - obj_frame_tiles(gEventObjectPic_LotadDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - obj_frame_tiles(gEventObjectPic_SeedotDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - obj_frame_tiles(gEventObjectPic_PikaCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - obj_frame_tiles(gEventObjectPic_RoundCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - obj_frame_tiles(gEventObjectPic_KissCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - obj_frame_tiles(gEventObjectPic_ZigzagCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - obj_frame_tiles(gEventObjectPic_SpinCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - obj_frame_tiles(gEventObjectPic_DiamondCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - obj_frame_tiles(gEventObjectPic_BallCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - obj_frame_tiles(gEventObjectPic_GrassCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - obj_frame_tiles(gEventObjectPic_FireCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - obj_frame_tiles(gEventObjectPic_WaterCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRhydonDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - obj_frame_tiles(gEventObjectPic_BigLaprasDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - obj_frame_tiles(gEventObjectPic_BigVenusaurDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - obj_frame_tiles(gEventObjectPic_BigCharizardDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - obj_frame_tiles(gEventObjectPic_BigWailmerDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegirockDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegiceDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegisteelDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GameboyKid[] = { - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { - obj_frame_tiles(gEventObjectPic_BrendanDecorating), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - obj_frame_tiles(gEventObjectPic_MayDecorating), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - overworld_frame(gEventObjectPic_Archie, 2, 4, 0), - overworld_frame(gEventObjectPic_Archie, 2, 4, 1), - overworld_frame(gEventObjectPic_Archie, 2, 4, 2), - overworld_frame(gEventObjectPic_Archie, 2, 4, 3), - overworld_frame(gEventObjectPic_Archie, 2, 4, 4), - overworld_frame(gEventObjectPic_Archie, 2, 4, 5), - overworld_frame(gEventObjectPic_Archie, 2, 4, 6), - overworld_frame(gEventObjectPic_Archie, 2, 4, 7), - overworld_frame(gEventObjectPic_Archie, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { - obj_frame_tiles(gEventObjectPic_Fossil), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 0), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 1), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 2), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 3), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - overworld_frame(gEventObjectPic_Mom, 2, 4, 0), - overworld_frame(gEventObjectPic_Mom, 2, 4, 1), - overworld_frame(gEventObjectPic_Mom, 2, 4, 2), - overworld_frame(gEventObjectPic_Mom, 2, 4, 3), - overworld_frame(gEventObjectPic_Mom, 2, 4, 4), - overworld_frame(gEventObjectPic_Mom, 2, 4, 5), - overworld_frame(gEventObjectPic_Mom, 2, 4, 6), - overworld_frame(gEventObjectPic_Mom, 2, 4, 7), - overworld_frame(gEventObjectPic_Mom, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scott[] = { - overworld_frame(gEventObjectPic_Scott, 2, 4, 0), - overworld_frame(gEventObjectPic_Scott, 2, 4, 1), - overworld_frame(gEventObjectPic_Scott, 2, 4, 2), - overworld_frame(gEventObjectPic_Scott, 2, 4, 3), - overworld_frame(gEventObjectPic_Scott, 2, 4, 4), - overworld_frame(gEventObjectPic_Scott, 2, 4, 5), - overworld_frame(gEventObjectPic_Scott, 2, 4, 6), - overworld_frame(gEventObjectPic_Scott, 2, 4, 7), - overworld_frame(gEventObjectPic_Scott, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Juan[] = { - overworld_frame(gEventObjectPic_Juan, 2, 4, 0), - overworld_frame(gEventObjectPic_Juan, 2, 4, 1), - overworld_frame(gEventObjectPic_Juan, 2, 4, 2), - overworld_frame(gEventObjectPic_Juan, 2, 4, 3), - overworld_frame(gEventObjectPic_Juan, 2, 4, 4), - overworld_frame(gEventObjectPic_Juan, 2, 4, 5), - overworld_frame(gEventObjectPic_Juan, 2, 4, 6), - overworld_frame(gEventObjectPic_Juan, 2, 4, 7), - overworld_frame(gEventObjectPic_Juan, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = { - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { - obj_frame_tiles(gEventObjectPic_Statue), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = { - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 0), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 1), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 2), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 3), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 4), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 5), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 6), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 7), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = { - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 0), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 1), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 2), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 3), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 4), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 5), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 6), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 7), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = { - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = { - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mew[] = { - overworld_frame(gEventObjectPic_Mew, 2, 4, 0), - overworld_frame(gEventObjectPic_Mew, 2, 4, 1), - overworld_frame(gEventObjectPic_Mew, 2, 4, 2), - overworld_frame(gEventObjectPic_Mew, 2, 4, 3), - overworld_frame(gEventObjectPic_Mew, 2, 4, 4), - overworld_frame(gEventObjectPic_Mew, 2, 4, 5), - overworld_frame(gEventObjectPic_Mew, 2, 4, 6), - overworld_frame(gEventObjectPic_Mew, 2, 4, 7), - overworld_frame(gEventObjectPic_Mew, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Red[] = { - overworld_frame(gEventObjectPic_Red, 2, 4, 0), - overworld_frame(gEventObjectPic_Red, 2, 4, 1), - overworld_frame(gEventObjectPic_Red, 2, 4, 2), - overworld_frame(gEventObjectPic_Red, 2, 4, 3), - overworld_frame(gEventObjectPic_Red, 2, 4, 4), - overworld_frame(gEventObjectPic_Red, 2, 4, 5), - overworld_frame(gEventObjectPic_Red, 2, 4, 6), - overworld_frame(gEventObjectPic_Red, 2, 4, 7), - overworld_frame(gEventObjectPic_Red, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = { - overworld_frame(gEventObjectPic_Leaf, 2, 4, 0), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 1), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 2), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 3), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 4), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 5), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 6), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 7), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = { - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { - obj_frame_tiles(gEventObjectPic_BirthIslandStone), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = { - overworld_frame(gEventObjectPic_Anabel, 2, 4, 0), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 1), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 2), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 3), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 4), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 5), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 6), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 7), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = { - overworld_frame(gEventObjectPic_Tucker, 2, 4, 0), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 1), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 2), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 3), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 4), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 5), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 6), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 7), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = { - overworld_frame(gEventObjectPic_Spenser, 2, 4, 0), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 1), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 2), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 3), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 4), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 5), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 6), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 7), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Greta[] = { - overworld_frame(gEventObjectPic_Greta, 2, 4, 0), - overworld_frame(gEventObjectPic_Greta, 2, 4, 1), - overworld_frame(gEventObjectPic_Greta, 2, 4, 2), - overworld_frame(gEventObjectPic_Greta, 2, 4, 3), - overworld_frame(gEventObjectPic_Greta, 2, 4, 4), - overworld_frame(gEventObjectPic_Greta, 2, 4, 5), - overworld_frame(gEventObjectPic_Greta, 2, 4, 6), - overworld_frame(gEventObjectPic_Greta, 2, 4, 7), - overworld_frame(gEventObjectPic_Greta, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Noland[] = { - overworld_frame(gEventObjectPic_Noland, 2, 4, 0), - overworld_frame(gEventObjectPic_Noland, 2, 4, 1), - overworld_frame(gEventObjectPic_Noland, 2, 4, 2), - overworld_frame(gEventObjectPic_Noland, 2, 4, 3), - overworld_frame(gEventObjectPic_Noland, 2, 4, 4), - overworld_frame(gEventObjectPic_Noland, 2, 4, 5), - overworld_frame(gEventObjectPic_Noland, 2, 4, 6), - overworld_frame(gEventObjectPic_Noland, 2, 4, 7), - overworld_frame(gEventObjectPic_Noland, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = { - overworld_frame(gEventObjectPic_Lucy, 2, 4, 0), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 1), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 2), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 3), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 4), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 5), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 6), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 7), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = { - overworld_frame(gEventObjectPic_Brandon, 2, 4, 0), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 1), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 2), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 3), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 4), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 5), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 6), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 7), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = { - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = { - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = { - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8), -}; diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h index f60e527a5..738a6dc12 100644 --- a/src/data/lilycove_lady.h +++ b/src/data/lilycove_lady.h @@ -6,18 +6,18 @@ static const u16 sContestLadyMonGfxId[] = { - EVENT_OBJ_GFX_ZIGZAGOON_1, - EVENT_OBJ_GFX_SKITTY, - EVENT_OBJ_GFX_POOCHYENA, - EVENT_OBJ_GFX_KECLEON_1, - EVENT_OBJ_GFX_PIKACHU + OBJ_EVENT_GFX_ZIGZAGOON_1, + OBJ_EVENT_GFX_SKITTY, + OBJ_EVENT_GFX_POOCHYENA, + OBJ_EVENT_GFX_KECLEON_1, + OBJ_EVENT_GFX_PIKACHU }; static const u16 sLilycoveLadyGfxId[] = { - EVENT_OBJ_GFX_WOMAN_4, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_GIRL_2 + OBJ_EVENT_GFX_WOMAN_4, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_GIRL_2 }; // Quiz Lady data diff --git a/src/data/field_event_obj/base_oam.h b/src/data/object_event/base_oam.h index af961f492..f74feca32 100755 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/object_event/base_oam.h @@ -1,46 +1,46 @@ -const struct OamData gEventObjectBaseOam_8x8 = { +const struct OamData gObjectEventBaseOam_8x8 = { .shape = SPRITE_SHAPE(8x8), .size = SPRITE_SIZE(8x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x8 = { +const struct OamData gObjectEventBaseOam_16x8 = { .shape = SPRITE_SHAPE(16x8), .size = SPRITE_SIZE(16x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x16 = { +const struct OamData gObjectEventBaseOam_16x16 = { .shape = SPRITE_SHAPE(16x16), .size = SPRITE_SIZE(16x16), .priority = 2 }; -const struct OamData gEventObjectBaseOam_32x8 = { +const struct OamData gObjectEventBaseOam_32x8 = { .shape = SPRITE_SHAPE(32x8), .size = SPRITE_SIZE(32x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_64x32 = { +const struct OamData gObjectEventBaseOam_64x32 = { .shape = SPRITE_SHAPE(64x32), .size = SPRITE_SIZE(64x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x32 = { +const struct OamData gObjectEventBaseOam_16x32 = { .shape = SPRITE_SHAPE(16x32), .size = SPRITE_SIZE(16x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_32x32 = { +const struct OamData gObjectEventBaseOam_32x32 = { .shape = SPRITE_SHAPE(32x32), .size = SPRITE_SIZE(32x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_64x64 = { +const struct OamData gObjectEventBaseOam_64x64 = { .shape = SPRITE_SHAPE(64x64), .size = SPRITE_SIZE(64x64), .priority = 2 diff --git a/src/data/object_event/berry_tree_graphics_tables.h b/src/data/object_event/berry_tree_graphics_tables.h new file mode 100755 index 000000000..d558b583f --- /dev/null +++ b/src/data/object_event/berry_tree_graphics_tables.h @@ -0,0 +1,565 @@ +const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_KelpsyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_WepearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_IapapaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_CheriBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_FigyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_MagoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LumBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_RazzBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_GrepaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RabutaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_NomelBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LeppaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LiechiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_HondewBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_AguavBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_WikiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PomegBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RawstBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_SpelonBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_ChestoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_OranBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_PersimBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_SitrusBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_AspearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PamtreBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_CornnBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_LansatBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_DurinBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; + +const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES}; + +const u8 gBerryTreeObjectEventGraphicsIdTable[] = {OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES, OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES}; + +const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CheriBerryTree, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ChestoBerryTree, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PechaBerryTree, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RawstBerryTree, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AspearBerryTree, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LeppaBerryTree, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_OranBerryTree, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PersimBerryTree, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LumBerryTree, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SitrusBerryTree, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_FigyBerryTree, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WikiBerryTree, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_KelpsyBerryTree, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_TamatoBerryTree, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_NomelBerryTree, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SpelonBerryTree, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PamtreBerryTree, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LiechiBerryTree, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LansatBerryTree, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, +}; + +const u8 *const gBerryTreePaletteSlotTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, +}; + +const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + // 3 unused berries. + [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, +}; diff --git a/src/data/object_event/event_object_anims.h b/src/data/object_event/event_object_anims.h new file mode 100755 index 000000000..b319c2845 --- /dev/null +++ b/src/data/object_event/event_object_anims.h @@ -0,0 +1,1171 @@ +const union AnimCmd gObjectEventImageAnim_StayStill[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(3, 8, .hFlip = TRUE), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoNorth[] = +{ + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(4, 8, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoWest[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoEast[] = +{ + ANIMCMD_FRAME(5, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(6, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(4, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastWest[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastEast[] = +{ + ANIMCMD_FRAME(5, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(6, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(3, 2, .hFlip = TRUE), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterNorth[] = +{ + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(4, 2, .hFlip = TRUE), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterWest[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterEast[] = +{ + ANIMCMD_FRAME(5, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(6, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(3, 1, .hFlip = TRUE), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestNorth[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(4, 1, .hFlip = TRUE), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestWest[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestEast[] = +{ + ANIMCMD_FRAME(5, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(6, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoNorth[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoWest[] = +{ + ANIMCMD_FRAME(7, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoEast[] = +{ + ANIMCMD_FRAME(7, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(8, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastNorth[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastWest[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastEast[] = +{ + ANIMCMD_FRAME(7, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(8, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterNorth[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterWest[] = +{ + ANIMCMD_FRAME(7, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(8, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterEast[] = +{ + ANIMCMD_FRAME(7, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(8, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestNorth[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestWest[] = +{ + ANIMCMD_FRAME(7, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(8, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestEast[] = +{ + ANIMCMD_FRAME(7, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(8, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunSouth[] = +{ + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_FRAME(13, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunNorth[] = +{ + ANIMCMD_FRAME(14, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_FRAME(15, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunWest[] = +{ + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_FRAME(17, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunEast[] = +{ + ANIMCMD_FRAME(16, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_FRAME(17, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FieldMove[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobSouth[] = +{ + ANIMCMD_FRAME(9, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobNorth[] = +{ + ANIMCMD_FRAME(10, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobWest[] = +{ + ANIMCMD_FRAME(11, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobEast[] = +{ + ANIMCMD_FRAME(11, 32, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(20, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(20, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieSouth[] = +{ + ANIMCMD_FRAME(21, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(22, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieNorth[] = +{ + ANIMCMD_FRAME(23, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieWest[] = +{ + ANIMCMD_FRAME(25, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_FRAME(26, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieEast[] = +{ + ANIMCMD_FRAME(25, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_FRAME(26, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage0[] = +{ + ANIMCMD_FRAME(0, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage1[] = +{ + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(2, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage2[] = +{ + ANIMCMD_FRAME(3, 48), + ANIMCMD_FRAME(4, 48), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage3[] = +{ + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage4[] = +{ + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_NurseBow[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(9, 32), + ANIMCMD_FRAME(0, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_RockBreak[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TreeCut[] = +{ + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodSouth[] = +{ + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(11, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodWest[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodEast[] = +{ + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(9, 6), + ANIMCMD_FRAME(8, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodNorth[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(5, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodWest[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodEast[] = +{ + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonSouth[] = +{ + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(11, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(11, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonNorth[] = +{ + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(7, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(7, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonWest[] = +{ + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonEast[] = +{ + ANIMCMD_FRAME(2, 6, .hFlip = TRUE), + ANIMCMD_FRAME(3, 6, .hFlip = TRUE), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8508FD8[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(7), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509008[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509040[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509050[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509060[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509078[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_HoOhFlapWings[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HoOhStayStill[] = +{ + ANIMCMD_FRAME(3, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Inanimate[] = { + gObjectEventImageAnim_StayStill, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_QuintyPlump[] = { + gObjectEventImageAnim_QuintyPlumpFaceSouth, + gObjectEventImageAnim_QuintyPlumpFaceNorth, + gObjectEventImageAnim_QuintyPlumpFaceWest, + gObjectEventImageAnim_QuintyPlumpFaceEast, + gObjectEventImageAnim_QuintyPlumpGoSouth, + gObjectEventImageAnim_QuintyPlumpGoNorth, + gObjectEventImageAnim_QuintyPlumpGoWest, + gObjectEventImageAnim_QuintyPlumpGoEast, + gObjectEventImageAnim_QuintyPlumpGoFastSouth, + gObjectEventImageAnim_QuintyPlumpGoFastNorth, + gObjectEventImageAnim_QuintyPlumpGoFastWest, + gObjectEventImageAnim_QuintyPlumpGoFastEast, + gObjectEventImageAnim_QuintyPlumpGoFasterSouth, + gObjectEventImageAnim_QuintyPlumpGoFasterNorth, + gObjectEventImageAnim_QuintyPlumpGoFasterWest, + gObjectEventImageAnim_QuintyPlumpGoFasterEast, + gObjectEventImageAnim_QuintyPlumpGoFastestSouth, + gObjectEventImageAnim_QuintyPlumpGoFastestNorth, + gObjectEventImageAnim_QuintyPlumpGoFastestWest, + gObjectEventImageAnim_QuintyPlumpGoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Standard[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_HoOh[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_HoOhFlapWings, + gObjectEventImageAnim_HoOhStayStill, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Groudon3[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd gObjectEventImageAnim_85091F0[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_85091F8[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509200[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509208[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509210[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509218[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509220[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509228[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509230[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Rayquaza2[] = { + gObjectEventImageAnim_8509218, + gObjectEventImageAnim_8509220, + gObjectEventImageAnim_8509228, + gObjectEventImageAnim_8509230, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_85091F0, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BrendanMayNormal[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_RunSouth, + gObjectEventImageAnim_RunNorth, + gObjectEventImageAnim_RunWest, + gObjectEventImageAnim_RunEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_AcroBike[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_BunnyHoppyBackWheelSouth, + gObjectEventImageAnim_BunnyHoppyBackWheelNorth, + gObjectEventImageAnim_BunnyHoppyBackWheelWest, + gObjectEventImageAnim_BunnyHoppyBackWheelEast, + gObjectEventImageAnim_BunnyHoppyFrontWheelSouth, + gObjectEventImageAnim_BunnyHoppyFrontWheelNorth, + gObjectEventImageAnim_BunnyHoppyFrontWheelWest, + gObjectEventImageAnim_BunnyHoppyFrontWheelEast, + gObjectEventImageAnim_StandingWheelieBackWheelSouth, + gObjectEventImageAnim_StandingWheelieBackWheelNorth, + gObjectEventImageAnim_StandingWheelieBackWheelWest, + gObjectEventImageAnim_StandingWheelieBackWheelEast, + gObjectEventImageAnim_StandingWheelieFrontWheelSouth, + gObjectEventImageAnim_StandingWheelieFrontWheelNorth, + gObjectEventImageAnim_StandingWheelieFrontWheelWest, + gObjectEventImageAnim_StandingWheelieFrontWheelEast, + gObjectEventImageAnim_MovingWheelieSouth, + gObjectEventImageAnim_MovingWheelieNorth, + gObjectEventImageAnim_MovingWheelieWest, + gObjectEventImageAnim_MovingWheelieEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Surfing[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_GetOnOffSurfBlobSouth, + gObjectEventImageAnim_GetOnOffSurfBlobNorth, + gObjectEventImageAnim_GetOnOffSurfBlobWest, + gObjectEventImageAnim_GetOnOffSurfBlobEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Nurse[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_NurseBow, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_FieldMove[] = { + gObjectEventImageAnim_FieldMove, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BerryTree[] = { + gObjectEventImageAnim_BerryTreeStage0, + gObjectEventImageAnim_BerryTreeStage1, + gObjectEventImageAnim_BerryTreeStage2, + gObjectEventImageAnim_BerryTreeStage3, + gObjectEventImageAnim_BerryTreeStage4, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BreakableRock[] = { + gObjectEventImageAnim_StayStill, + gObjectEventImageAnim_RockBreak, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_CuttableTree[] = { + gObjectEventImageAnim_StayStill, + gObjectEventImageAnim_TreeCut, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Fishing[] = { + gObjectEventImageAnim_TakeOutRodSouth, + gObjectEventImageAnim_TakeOutRodNorth, + gObjectEventImageAnim_TakeOutRodWest, + gObjectEventImageAnim_TakeOutRodEast, + gObjectEventImageAnim_PutAwayRodSouth, + gObjectEventImageAnim_PutAwayRodNorth, + gObjectEventImageAnim_PutAwayRodWest, + gObjectEventImageAnim_PutAwayRodEast, + gObjectEventImageAnim_HookedPokemonSouth, + gObjectEventImageAnim_HookedPokemonNorth, + gObjectEventImageAnim_HookedPokemonWest, + gObjectEventImageAnim_HookedPokemonEast, +}; + +const union AffineAnimCmd *const gObjectEventRotScalAnimTable_KyogreGroudon[] = { + gObjectEventRotScalAnim_8508FD8, + gObjectEventRotScalAnim_8509008, + gObjectEventRotScalAnim_8509050, + gObjectEventRotScalAnim_8509040, + gObjectEventRotScalAnim_8509078, + gObjectEventRotScalAnim_8509060, +}; + +const struct UnkStruct_085094AC gUnknown_085094AC[] = { + { + .anims = gObjectEventImageAnimTable_QuintyPlump, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Standard, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_BrendanMayNormal, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_AcroBike, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Surfing, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Nurse, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Fishing, + .animPos = {1, 3, 0, 2}, + }, + { + NULL, + {0, 0, 0, 0}, + }, +}; diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_event/event_object_graphics.h new file mode 100755 index 000000000..764c00ea2 --- /dev/null +++ b/src/data/object_event/event_object_graphics.h @@ -0,0 +1,362 @@ +const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp"); +const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_08.gbapal"); +const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal"); +const u16 NullPalette_8499A38[16] = {}; +const u16 NullPalette_8499A58[16] = {}; +const u16 NullPalette_8499A78[16] = {}; +const u16 NullPalette_8499A98[16] = {}; +const u16 NullPalette_8499AB8[16] = {}; +const u16 NullPalette_8499AD8[16] = {}; +const u16 NullPalette_8499AF8[16] = {}; +const u16 NullPalette_8499B18[16] = {}; +const u16 NullPalette_8499B38[16] = {}; +const u16 NullPalette_8499B58[16] = {}; +const u16 NullPalette_8499B78[16] = {}; +const u16 NullPalette_8499B98[16] = {}; +const u16 NullPalette_8499BB8[16] = {}; +const u16 NullPalette_8499BD8[16] = {}; +const u16 NullPalette_8499BF8[16] = {}; +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal"); +const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp"); +const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp"); +const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp"); +const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/acro_bike.4bpp"); +const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/fishing.4bpp"); +const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/object_events/pics/people/brendan/watering.4bpp"); +const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_events/pics/people/brendan/decorating.4bpp"); +const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp"); +const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp"); +const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_11.gbapal"); +const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp"); +const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_18.gbapal"); +const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal"); +const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal"); +const u16 NullPalette_84A54F8[16] = {}; +const u16 NullPalette_84A5518[16] = {}; +const u16 NullPalette_84A5538[16] = {}; +const u16 NullPalette_84A5558[16] = {}; +const u16 NullPalette_84A5578[16] = {}; +const u16 NullPalette_84A5598[16] = {}; +const u16 NullPalette_84A55B8[16] = {}; +const u16 NullPalette_84A55D8[16] = {}; +const u16 NullPalette_84A55F8[16] = {}; +const u16 NullPalette_84A5618[16] = {}; +const u16 NullPalette_84A5638[16] = {}; +const u16 NullPalette_84A5658[16] = {}; +const u16 NullPalette_84A5678[16] = {}; +const u16 NullPalette_84A5698[16] = {}; +const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp"); +const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp"); +const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp"); +const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp"); +const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp"); +const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_07.gbapal"); +const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/object_events/pics/people/ninja_boy.4bpp"); +const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/object_events/pics/people/twin.4bpp"); +const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp"); +const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/object_events/pics/people/girl_1.4bpp"); +const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/object_events/pics/people/boy_2.4bpp"); +const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/object_events/pics/people/girl_2.4bpp"); +const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/little_boy.4bpp"); +const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/object_events/pics/people/little_girl.4bpp"); +const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/object_events/pics/people/boy_3.4bpp"); +const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/object_events/pics/people/girl_3.4bpp"); +const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/object_events/pics/people/rich_boy.4bpp"); +const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/object_events/pics/people/woman_1.4bpp"); +const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/object_events/pics/people/fat_man.4bpp"); +const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/object_events/pics/people/pokefan_f.4bpp"); +const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/object_events/pics/people/man_1.4bpp"); +const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp"); +const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/object_events/pics/people/expert_m.4bpp"); +const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/object_events/pics/people/expert_f.4bpp"); +const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/object_events/pics/people/man_2.4bpp"); +const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp"); +const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/object_events/pics/people/pokefan_m.4bpp"); +const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/object_events/pics/people/woman_4.4bpp"); +const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/object_events/pics/people/cook.4bpp"); +const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/link_receptionist.4bpp"); +const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/object_events/pics/people/old_man.4bpp"); +const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/object_events/pics/people/old_woman.4bpp"); +const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/object_events/pics/people/camper.4bpp"); +const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/object_events/pics/people/picnicker.4bpp"); +const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/object_events/pics/people/man_3.4bpp"); +const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/object_events/pics/people/woman_5.4bpp"); +const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/object_events/pics/people/youngster.4bpp"); +const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/object_events/pics/people/bug_catcher.4bpp"); +const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/object_events/pics/people/psychic_m.4bpp"); +const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/object_events/pics/people/school_kid_m.4bpp"); +const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/object_events/pics/people/maniac.4bpp"); +const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/object_events/pics/people/hex_maniac.4bpp"); +const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/object_events/pics/people/unused_woman.4bpp"); +const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m.4bpp"); +const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f.4bpp"); +const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/object_events/pics/people/black_belt.4bpp"); +const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/object_events/pics/people/beauty.4bpp"); +const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/object_events/pics/people/scientist_1.4bpp"); +const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/object_events/pics/people/lass.4bpp"); +const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/object_events/pics/people/gentleman.4bpp"); +const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/object_events/pics/people/sailor.4bpp"); +const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/object_events/pics/people/fisherman.4bpp"); +const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_m.4bpp"); +const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_f.4bpp"); +const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/object_events/pics/people/tuber_f.4bpp"); +const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m.4bpp"); +const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/object_events/pics/people/hiker.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_m.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_f.4bpp"); +const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/object_events/pics/people/man_4.4bpp"); +const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/object_events/pics/people/man_5.4bpp"); +const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/object_events/pics/people/nurse.4bpp"); +const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/object_events/pics/misc/item_ball.4bpp"); +const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/object_events/pics/people/prof_birch.4bpp"); +const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/object_events/pics/people/reporter_m.4bpp"); +const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/object_events/pics/people/reporter_f.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_1.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_2.4bpp"); +const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/object_events/pics/people/mart_employee.4bpp"); +const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/object_events/pics/people/rooftop_sale_woman.4bpp"); +const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/object_events/pics/people/teala.4bpp"); +const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/object_events/pics/people/artist.4bpp"); +const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/object_events/pics/people/cameraman.4bpp"); +const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/object_events/pics/people/scientist_2.4bpp"); +const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/object_events/pics/people/devon_employee.4bpp"); +const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/aqua_member_m.4bpp"); +const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/aqua_member_f.4bpp"); +const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/magma_member_m.4bpp"); +const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/magma_member_f.4bpp"); +const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/sidney.4bpp"); +const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/phoebe.4bpp"); +const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/glacia.4bpp"); +const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/drake.4bpp"); +const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/roxanne.4bpp"); +const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/brawly.4bpp"); +const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/wattson.4bpp"); +const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/flannery.4bpp"); +const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/norman.4bpp"); +const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/winona.4bpp"); +const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/liza.4bpp"); +const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/tate.4bpp"); +const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/object_events/pics/people/wallace.4bpp"); +const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/object_events/pics/people/steven.4bpp"); +const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/object_events/pics/people/wally.4bpp"); +const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/rs_little_boy.4bpp"); +const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/object_events/pics/people/hot_springs_old_woman.4bpp"); +const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/object_events/pics/pokemon/latias_latios.4bpp"); +const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/object_events/pics/people/gameboy_kid.4bpp"); +const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/object_events/pics/people/contest_judge.4bpp"); +const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/archie.4bpp"); +const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/maxie.4bpp"); +const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/object_events/pics/pokemon/kyogre.4bpp"); +const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/object_events/pics/pokemon/groudon.4bpp"); +const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/object_events/pics/pokemon/regi.4bpp"); +const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/object_events/pics/pokemon/skitty.4bpp"); +const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/object_events/pics/pokemon/kecleon.4bpp"); +const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza.4bpp"); +const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza_still.4bpp"); +const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/zigzagoon.4bpp"); +const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu.4bpp"); +const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azumarill.4bpp"); +const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/pokemon/wingull.4bpp"); +const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp"); +const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp"); +const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_25.gbapal"); +const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp"); +const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pichu_doll.4bpp"); +const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pikachu_doll.4bpp"); +const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/marill_doll.4bpp"); +const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/togepi_doll.4bpp"); +const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/chikorita_doll.4bpp"); +const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/totodile_doll.4bpp"); +const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/meowth_doll.4bpp"); +const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/clefairy_doll.4bpp"); +const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/ditto_doll.4bpp"); +const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/smoochum_doll.4bpp"); +const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/treecko_doll.4bpp"); +const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/torchic_doll.4bpp"); +const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/mudkip_doll.4bpp"); +const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/duskull_doll.4bpp"); +const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/wynaut_doll.4bpp"); +const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/baltoy_doll.4bpp"); +const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/kecleon_doll.4bpp"); +const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/azurill_doll.4bpp"); +const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/skitty_doll.4bpp"); +const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/swablu_doll.4bpp"); +const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/gulpin_doll.4bpp"); +const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/lotad_doll.4bpp"); +const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/seedot_doll.4bpp"); +const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/pika_cushion.4bpp"); +const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/round_cushion.4bpp"); +const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/kiss_cushion.4bpp"); +const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/zigzag_cushion.4bpp"); +const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/spin_cushion.4bpp"); +const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/diamond_cushion.4bpp"); +const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/ball_cushion.4bpp"); +const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/grass_cushion.4bpp"); +const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/fire_cushion.4bpp"); +const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/water_cushion.4bpp"); +const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_lapras_doll.4bpp"); +const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_charizard_doll.4bpp"); +const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regirock_doll.4bpp"); +const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regice_doll.4bpp"); +const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_registeel_doll.4bpp"); +const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/object_events/pics/misc/cuttable_tree.4bpp"); +const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/object_events/pics/misc/breakable_rock.4bpp"); +const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events/pics/misc/pushable_boulder.4bpp"); +const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp"); +const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp"); +const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_26.gbapal"); +const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_14.gbapal"); +const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/object_events/pics/pokemon/vigoroth.4bpp"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_15.gbapal"); +const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp"); +const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_16.gbapal"); +const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_27.gbapal"); +const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_20.gbapal"); +const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_21.gbapal"); +const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/object_events/pics/effects/berry_tree_growth_sparkle.4bpp"); +const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp"); +const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp"); +const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp"); +const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kelpsy.4bpp"); +const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wepear.4bpp"); +const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/iapapa.4bpp"); +const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cheri.4bpp"); +const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/figy.4bpp"); +const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/mago.4bpp"); +const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lum.4bpp"); +const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/razz.4bpp"); +const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/grepa.4bpp"); +const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rabuta.4bpp"); +const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/nomel.4bpp"); +const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/leppa.4bpp"); +const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/liechi.4bpp"); +const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/hondew.4bpp"); +const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aguav.4bpp"); +const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wiki.4bpp"); +const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pomeg.4bpp"); +const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rawst.4bpp"); +const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/spelon.4bpp"); +const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chesto.4bpp"); +const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/oran.4bpp"); +const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/persim.4bpp"); +const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sitrus.4bpp"); +const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aspear.4bpp"); +const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pamtre.4bpp"); +const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cornn.4bpp"); +const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp"); +const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp"); +const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/effects/surf_blob.4bpp"); +const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_13.gbapal"); +const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp"); +const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp"); +const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); +const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u32 filler_8368A08[0x48] = {}; +const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/object_events/pics/effects/cut_grass.4bpp"); +const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/object_events/pics/effects/cut_grass.4bpp"); +const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_06.gbapal"); +const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/object_events/pics/effects/ripple.4bpp"); +const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/object_events/pics/effects/ash.4bpp"); +const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/object_events/pics/effects/arrow.4bpp"); +const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_00.gbapal"); +const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_01.gbapal"); +const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/object_events/pics/effects/ground_impact_dust.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_tall_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/object_events/pics/effects/unused_grass.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_16.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_17.4bpp"); +const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_18.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/object_events/pics/effects/long_grass.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/tall_grass.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/object_events/pics/effects/short_grass.4bpp"); +const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/deep_sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/object_events/pics/effects/bike_tire_tracks.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_19.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_29.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/object_events/pics/effects/splash.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_small_splash.4bpp"); +const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_20.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/tree_disguise.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/mountain_disguise.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/object_events/pics/effects/sand_disguise_placeholder.4bpp"); +const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/object_events/pics/effects/hot_springs_water.4bpp"); +const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_02.gbapal"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/object_events/pics/effects/jump_out_of_ash.4bpp"); +const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_33.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/object_events/pics/effects/bubbles.4bpp"); +const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_35.4bpp"); +const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_03.gbapal"); +const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/object_events/pics/effects/bird.4bpp"); +const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp"); +const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp"); +const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/object_events/pics/misc/statue.4bpp"); +const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/object_events/pics/pokemon/kirlia.4bpp"); +const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/object_events/pics/pokemon/dusclops.4bpp"); +const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mystery_event_deliveryman.4bpp"); +const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/object_events/pics/people/union_room_attendant.4bpp"); +const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_19.gbapal"); +const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/object_events/pics/pokemon/sudowoodo.4bpp"); +const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_28.gbapal"); +const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/object_events/pics/people/red.4bpp"); +const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/object_events/pics/people/leaf.4bpp"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_30.gbapal"); +const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_29.gbapal"); +const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp"); +const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/anabel.4bpp"); +const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/tucker.4bpp"); +const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/spenser.4bpp"); +const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/greta.4bpp"); +const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/noland.4bpp"); +const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/lucy.4bpp"); +const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/brandon.4bpp"); +const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_32.gbapal"); +const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_31.gbapal"); diff --git a/src/data/object_event/event_object_graphics_info.h b/src/data/object_event/event_object_graphics_info.h new file mode 100755 index 000000000..cb221a30b --- /dev/null +++ b/src/data/object_event/event_object_graphics_info.h @@ -0,0 +1,245 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, OBJ_EVENT_PAL_TAG_12, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Twin, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RichBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_15, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, OBJ_EVENT_PAL_TAG_15, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_16, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, OBJ_EVENT_PAL_TAG_27, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_19, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, OBJ_EVENT_PAL_TAG_20, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_26, OBJ_EVENT_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GameboyKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3 = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Groudon3, gObjectEventPicTable_GroudonSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, OBJ_EVENT_PAL_TAG_22, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, OBJ_EVENT_PAL_TAG_24, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Juan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, OBJ_EVENT_PAL_TAG_28, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, OBJ_EVENT_PAL_TAG_28, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, OBJ_EVENT_PAL_TAG_29, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, OBJ_EVENT_PAL_TAG_30, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Greta, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spenser, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Noland, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lucy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, OBJ_EVENT_PAL_TAG_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_33, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, OBJ_EVENT_PAL_TAG_34, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, OBJ_EVENT_PAL_TAG_32, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, OBJ_EVENT_PAL_TAG_31, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/object_event/event_object_graphics_info_pointers.h b/src/data/object_event/event_object_graphics_info_pointers.h new file mode 100755 index 000000000..01c8cbde7 --- /dev/null +++ b/src/data/object_event/event_object_graphics_info_pointers.h @@ -0,0 +1,499 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2; + + +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = { + [OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, + [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, + [OBJ_EVENT_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, + [OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove, + [OBJ_EVENT_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump, + [OBJ_EVENT_GFX_NINJA_BOY] = &gObjectEventGraphicsInfo_NinjaBoy, + [OBJ_EVENT_GFX_TWIN] = &gObjectEventGraphicsInfo_Twin, + [OBJ_EVENT_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1, + [OBJ_EVENT_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1, + [OBJ_EVENT_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2, + [OBJ_EVENT_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2, + [OBJ_EVENT_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_LittleBoy, + [OBJ_EVENT_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_LittleGirl, + [OBJ_EVENT_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, + [OBJ_EVENT_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, + [OBJ_EVENT_GFX_RICH_BOY] = &gObjectEventGraphicsInfo_RichBoy, + [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, + [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, + [OBJ_EVENT_GFX_POKEFAN_F] = &gObjectEventGraphicsInfo_PokefanF, + [OBJ_EVENT_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, + [OBJ_EVENT_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, + [OBJ_EVENT_GFX_EXPERT_M] = &gObjectEventGraphicsInfo_ExpertM, + [OBJ_EVENT_GFX_EXPERT_F] = &gObjectEventGraphicsInfo_ExpertF, + [OBJ_EVENT_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, + [OBJ_EVENT_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, + [OBJ_EVENT_GFX_POKEFAN_M] = &gObjectEventGraphicsInfo_PokefanM, + [OBJ_EVENT_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, + [OBJ_EVENT_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, + [OBJ_EVENT_GFX_LINK_RECEPTIONIST] = &gObjectEventGraphicsInfo_LinkReceptionist, + [OBJ_EVENT_GFX_OLD_MAN] = &gObjectEventGraphicsInfo_OldMan, + [OBJ_EVENT_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_OldWoman, + [OBJ_EVENT_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, + [OBJ_EVENT_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, + [OBJ_EVENT_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, + [OBJ_EVENT_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, + [OBJ_EVENT_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster, + [OBJ_EVENT_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher, + [OBJ_EVENT_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM, + [OBJ_EVENT_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM, + [OBJ_EVENT_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac, + [OBJ_EVENT_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac, + [OBJ_EVENT_GFX_RAYQUAZA_1] = &gObjectEventGraphicsInfo_Rayquaza1, + [OBJ_EVENT_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM, + [OBJ_EVENT_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF, + [OBJ_EVENT_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, + [OBJ_EVENT_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty, + [OBJ_EVENT_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1, + [OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, + [OBJ_EVENT_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman, + [OBJ_EVENT_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor, + [OBJ_EVENT_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman, + [OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM, + [OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF, + [OBJ_EVENT_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF, + [OBJ_EVENT_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM, + [OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, + [OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM, + [OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF, + [OBJ_EVENT_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse, + [OBJ_EVENT_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall, + [OBJ_EVENT_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree, + [OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages, + [OBJ_EVENT_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages, + [OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike, + [OBJ_EVENT_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch, + [OBJ_EVENT_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, + [OBJ_EVENT_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5, + [OBJ_EVENT_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, + [OBJ_EVENT_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, + [OBJ_EVENT_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, + [OBJ_EVENT_GFX_ANABEL] = &gObjectEventGraphicsInfo_Anabel, + [OBJ_EVENT_GFX_TUCKER] = &gObjectEventGraphicsInfo_Tucker, + [OBJ_EVENT_GFX_GRETA] = &gObjectEventGraphicsInfo_Greta, + [OBJ_EVENT_GFX_SPENSER] = &gObjectEventGraphicsInfo_Spenser, + [OBJ_EVENT_GFX_NOLAND] = &gObjectEventGraphicsInfo_Noland, + [OBJ_EVENT_GFX_LUCY] = &gObjectEventGraphicsInfo_Lucy, + [OBJ_EVENT_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll, + [OBJ_EVENT_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll, + [OBJ_EVENT_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll, + [OBJ_EVENT_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll, + [OBJ_EVENT_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll, + [OBJ_EVENT_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll, + [OBJ_EVENT_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree, + [OBJ_EVENT_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee, + [OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman, + [OBJ_EVENT_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala, + [OBJ_EVENT_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock, + [OBJ_EVENT_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder, + [OBJ_EVENT_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat, + [OBJ_EVENT_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal, + [OBJ_EVENT_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike, + [OBJ_EVENT_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike, + [OBJ_EVENT_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing, + [OBJ_EVENT_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove, + [OBJ_EVENT_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck, + [OBJ_EVENT_GFX_VIGOROTH_CARRYING_BOX] = &gObjectEventGraphicsInfo_VigorothCarryingBox, + [OBJ_EVENT_GFX_VIGOROTH_FACING_AWAY] = &gObjectEventGraphicsInfo_VigorothFacingAway, + [OBJ_EVENT_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, + [OBJ_EVENT_GFX_ZIGZAGOON_1] = &gObjectEventGraphicsInfo_EnemyZigzagoon, + [OBJ_EVENT_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing, + [OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove, + [OBJ_EVENT_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal, + [OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike, + [OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike, + [OBJ_EVENT_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing, + [OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove, + [OBJ_EVENT_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman, + [OBJ_EVENT_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater, + [OBJ_EVENT_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater, + [OBJ_EVENT_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox, + [OBJ_EVENT_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar, + [OBJ_EVENT_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2, + [OBJ_EVENT_GFX_DEVON_EMPLOYEE] = &gObjectEventGraphicsInfo_DevonEmployee, + [OBJ_EVENT_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM, + [OBJ_EVENT_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF, + [OBJ_EVENT_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM, + [OBJ_EVENT_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF, + [OBJ_EVENT_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney, + [OBJ_EVENT_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe, + [OBJ_EVENT_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia, + [OBJ_EVENT_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake, + [OBJ_EVENT_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne, + [OBJ_EVENT_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly, + [OBJ_EVENT_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson, + [OBJ_EVENT_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery, + [OBJ_EVENT_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman, + [OBJ_EVENT_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona, + [OBJ_EVENT_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza, + [OBJ_EVENT_GFX_TATE] = &gObjectEventGraphicsInfo_Tate, + [OBJ_EVENT_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace, + [OBJ_EVENT_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven, + [OBJ_EVENT_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally, + [OBJ_EVENT_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_RubySapphireLittleBoy, + [OBJ_EVENT_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing, + [OBJ_EVENT_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing, + [OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman, + [OBJ_EVENT_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal, + [OBJ_EVENT_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow, + [OBJ_EVENT_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll, + [OBJ_EVENT_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll, + [OBJ_EVENT_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll, + [OBJ_EVENT_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll, + [OBJ_EVENT_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll, + [OBJ_EVENT_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll, + [OBJ_EVENT_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll, + [OBJ_EVENT_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll, + [OBJ_EVENT_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll, + [OBJ_EVENT_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll, + [OBJ_EVENT_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll, + [OBJ_EVENT_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll, + [OBJ_EVENT_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll, + [OBJ_EVENT_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll, + [OBJ_EVENT_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll, + [OBJ_EVENT_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll, + [OBJ_EVENT_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll, + [OBJ_EVENT_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll, + [OBJ_EVENT_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll, + [OBJ_EVENT_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll, + [OBJ_EVENT_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll, + [OBJ_EVENT_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll, + [OBJ_EVENT_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll, + [OBJ_EVENT_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll, + [OBJ_EVENT_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll, + [OBJ_EVENT_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion, + [OBJ_EVENT_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion, + [OBJ_EVENT_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion, + [OBJ_EVENT_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion, + [OBJ_EVENT_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion, + [OBJ_EVENT_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion, + [OBJ_EVENT_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion, + [OBJ_EVENT_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion, + [OBJ_EVENT_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion, + [OBJ_EVENT_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion, + [OBJ_EVENT_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll, + [OBJ_EVENT_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll, + [OBJ_EVENT_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll, + [OBJ_EVENT_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll, + [OBJ_EVENT_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll, + [OBJ_EVENT_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll, + [OBJ_EVENT_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll, + [OBJ_EVENT_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll, + [OBJ_EVENT_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll, + [OBJ_EVENT_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll, + [OBJ_EVENT_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias, + [OBJ_EVENT_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios, + [OBJ_EVENT_GFX_GAMEBOY_KID] = &gObjectEventGraphicsInfo_GameboyKid, + [OBJ_EVENT_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge, + [OBJ_EVENT_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering, + [OBJ_EVENT_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering, + [OBJ_EVENT_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating, + [OBJ_EVENT_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating, + [OBJ_EVENT_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie, + [OBJ_EVENT_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie, + [OBJ_EVENT_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1, + [OBJ_EVENT_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1, + [OBJ_EVENT_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil, + [OBJ_EVENT_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock, + [OBJ_EVENT_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice, + [OBJ_EVENT_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel, + [OBJ_EVENT_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty, + [OBJ_EVENT_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1, + [OBJ_EVENT_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2, + [OBJ_EVENT_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2, + [OBJ_EVENT_GFX_RAYQUAZA_2] = &gObjectEventGraphicsInfo_Rayquaza2, + [OBJ_EVENT_GFX_ZIGZAGOON_2] = &gObjectEventGraphicsInfo_Zigzagoon, + [OBJ_EVENT_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu, + [OBJ_EVENT_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill, + [OBJ_EVENT_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull, + [OBJ_EVENT_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2, + [OBJ_EVENT_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming, + [OBJ_EVENT_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill, + [OBJ_EVENT_GFX_MOM] = &gObjectEventGraphicsInfo_Mom, + [OBJ_EVENT_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan, + [OBJ_EVENT_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay, + [OBJ_EVENT_GFX_JUAN] = &gObjectEventGraphicsInfo_Juan, + [OBJ_EVENT_GFX_SCOTT] = &gObjectEventGraphicsInfo_Scott, + [OBJ_EVENT_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, + [OBJ_EVENT_GFX_KYOGRE_3] = &gObjectEventGraphicsInfo_Kyogre3, + [OBJ_EVENT_GFX_GROUDON_3] = &gObjectEventGraphicsInfo_Groudon3, + [OBJ_EVENT_GFX_MYSTERY_GIFT_MAN] = &gObjectEventGraphicsInfo_MysteryEventDeliveryman, + [OBJ_EVENT_GFX_TRICK_HOUSE_STATUE] = &gObjectEventGraphicsInfo_Statue, + [OBJ_EVENT_GFX_KIRLIA] = &gObjectEventGraphicsInfo_Kirlia, + [OBJ_EVENT_GFX_DUSCLOPS] = &gObjectEventGraphicsInfo_Dusclops, + [OBJ_EVENT_GFX_UNION_ROOM_NURSE] = &gObjectEventGraphicsInfo_UnionRoomAttendant, + [OBJ_EVENT_GFX_SUDOWOODO] = &gObjectEventGraphicsInfo_Sudowoodo, + [OBJ_EVENT_GFX_MEW] = &gObjectEventGraphicsInfo_Mew, + [OBJ_EVENT_GFX_RED] = &gObjectEventGraphicsInfo_Red, + [OBJ_EVENT_GFX_LEAF] = &gObjectEventGraphicsInfo_Leaf, + [OBJ_EVENT_GFX_DEOXYS] = &gObjectEventGraphicsInfo_Deoxys, + [OBJ_EVENT_GFX_DEOXYS_TRIANGLE] = &gObjectEventGraphicsInfo_BirthIslandStone, + [OBJ_EVENT_GFX_BRANDON] = &gObjectEventGraphicsInfo_Brandon, + [OBJ_EVENT_GFX_LINK_RS_BRENDAN] = &gObjectEventGraphicsInfo_RubySapphireBrendan, + [OBJ_EVENT_GFX_LINK_RS_MAY] = &gObjectEventGraphicsInfo_RubySapphireMay, + [OBJ_EVENT_GFX_LUGIA] = &gObjectEventGraphicsInfo_Lugia, + [OBJ_EVENT_GFX_HOOH] = &gObjectEventGraphicsInfo_HoOh, +}; + +const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { + [MAUVILLE_MAN_BARD] = &gObjectEventGraphicsInfo_Bard, + [MAUVILLE_MAN_HIPSTER] = &gObjectEventGraphicsInfo_Hipster, + [MAUVILLE_MAN_TRADER] = &gObjectEventGraphicsInfo_Trader, + [MAUVILLE_MAN_STORYTELLER] = &gObjectEventGraphicsInfo_Storyteller, + [MAUVILLE_MAN_GIDDY] = &gObjectEventGraphicsInfo_Giddy, + [MAUVILLE_MAN_UNUSED1] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan1, + [MAUVILLE_MAN_UNUSED2] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan2, +}; diff --git a/src/data/object_event/event_object_pic_tables.h b/src/data/object_event/event_object_pic_tables.h new file mode 100755 index 000000000..9cfdca7c1 --- /dev/null +++ b/src/data/object_event/event_object_pic_tables.h @@ -0,0 +1,2174 @@ +const struct SpriteFrameImage gObjectEventPicTable_BrendanNormal[] = { + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanMachBike[] = { + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanAcroBike[] = { + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 26), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanSurfing[] = { + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanUnderwater[] = { + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFieldMove[] = { + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_QuintyPlump[] = { + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 0), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 1), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 2), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 3), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 4), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 5), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 6), +}; + +const struct SpriteFrameImage gObjectEventPicTable_NinjaBoy[] = { + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Twin[] = { + overworld_frame(gObjectEventPic_Twin, 2, 4, 0), + overworld_frame(gObjectEventPic_Twin, 2, 4, 1), + overworld_frame(gObjectEventPic_Twin, 2, 4, 2), + overworld_frame(gObjectEventPic_Twin, 2, 4, 3), + overworld_frame(gObjectEventPic_Twin, 2, 4, 4), + overworld_frame(gObjectEventPic_Twin, 2, 4, 5), + overworld_frame(gObjectEventPic_Twin, 2, 4, 6), + overworld_frame(gObjectEventPic_Twin, 2, 4, 7), + overworld_frame(gObjectEventPic_Twin, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy1[] = { + overworld_frame(gObjectEventPic_Boy1, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl1[] = { + overworld_frame(gObjectEventPic_Girl1, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy2[] = { + overworld_frame(gObjectEventPic_Boy2, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl2[] = { + overworld_frame(gObjectEventPic_Girl2, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleBoy[] = { + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl[] = { + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy3[] = { + overworld_frame(gObjectEventPic_Boy3, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl3[] = { + overworld_frame(gObjectEventPic_Girl3, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RichBoy[] = { + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 0), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 1), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 2), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 3), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 4), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 5), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 6), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 7), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman1[] = { + overworld_frame(gObjectEventPic_Woman1, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_FatMan[] = { + overworld_frame(gObjectEventPic_FatMan, 2, 4, 0), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 1), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 2), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 3), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 4), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 5), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 6), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 7), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PokefanF[] = { + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 0), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 1), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 2), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 3), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 4), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 5), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 6), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 7), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man1[] = { + overworld_frame(gObjectEventPic_Man1, 2, 4, 0), + overworld_frame(gObjectEventPic_Man1, 2, 4, 1), + overworld_frame(gObjectEventPic_Man1, 2, 4, 2), + overworld_frame(gObjectEventPic_Man1, 2, 4, 3), + overworld_frame(gObjectEventPic_Man1, 2, 4, 4), + overworld_frame(gObjectEventPic_Man1, 2, 4, 5), + overworld_frame(gObjectEventPic_Man1, 2, 4, 6), + overworld_frame(gObjectEventPic_Man1, 2, 4, 7), + overworld_frame(gObjectEventPic_Man1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman2[] = { + overworld_frame(gObjectEventPic_Woman2, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ExpertM[] = { + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 0), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 1), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 2), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 3), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 4), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 5), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 6), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 7), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ExpertF[] = { + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 0), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 1), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 2), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 3), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 4), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 5), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 6), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 7), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man2[] = { + overworld_frame(gObjectEventPic_Man2, 2, 4, 0), + overworld_frame(gObjectEventPic_Man2, 2, 4, 1), + overworld_frame(gObjectEventPic_Man2, 2, 4, 2), + overworld_frame(gObjectEventPic_Man2, 2, 4, 3), + overworld_frame(gObjectEventPic_Man2, 2, 4, 4), + overworld_frame(gObjectEventPic_Man2, 2, 4, 5), + overworld_frame(gObjectEventPic_Man2, 2, 4, 6), + overworld_frame(gObjectEventPic_Man2, 2, 4, 7), + overworld_frame(gObjectEventPic_Man2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman3[] = { + overworld_frame(gObjectEventPic_Woman3, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PokefanM[] = { + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 0), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 1), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 2), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 3), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 4), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 5), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 6), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 7), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman4[] = { + overworld_frame(gObjectEventPic_Woman4, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cook[] = { + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LinkReceptionist[] = { + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 0), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 1), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 2), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 3), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 4), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 5), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 6), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 7), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldMan[] = { + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman[] = { + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Camper[] = { + overworld_frame(gObjectEventPic_Camper, 2, 4, 0), + overworld_frame(gObjectEventPic_Camper, 2, 4, 1), + overworld_frame(gObjectEventPic_Camper, 2, 4, 2), + overworld_frame(gObjectEventPic_Camper, 2, 4, 3), + overworld_frame(gObjectEventPic_Camper, 2, 4, 4), + overworld_frame(gObjectEventPic_Camper, 2, 4, 5), + overworld_frame(gObjectEventPic_Camper, 2, 4, 6), + overworld_frame(gObjectEventPic_Camper, 2, 4, 7), + overworld_frame(gObjectEventPic_Camper, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Picnicker[] = { + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 0), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 1), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 2), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 3), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 4), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 5), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 6), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 7), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man3[] = { + overworld_frame(gObjectEventPic_Man3, 2, 4, 0), + overworld_frame(gObjectEventPic_Man3, 2, 4, 1), + overworld_frame(gObjectEventPic_Man3, 2, 4, 2), + overworld_frame(gObjectEventPic_Man3, 2, 4, 3), + overworld_frame(gObjectEventPic_Man3, 2, 4, 4), + overworld_frame(gObjectEventPic_Man3, 2, 4, 5), + overworld_frame(gObjectEventPic_Man3, 2, 4, 6), + overworld_frame(gObjectEventPic_Man3, 2, 4, 7), + overworld_frame(gObjectEventPic_Man3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman5[] = { + overworld_frame(gObjectEventPic_Woman5, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Youngster[] = { + overworld_frame(gObjectEventPic_Youngster, 2, 4, 0), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 1), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 2), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 3), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 4), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 5), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 6), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 7), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BugCatcher[] = { + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 0), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 1), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 2), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 3), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 4), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 5), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 6), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 7), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PsychicM[] = { + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 0), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 1), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 2), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 3), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 4), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 5), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 6), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 7), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SchoolKidM[] = { + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 0), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 1), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 2), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 3), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 4), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 5), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 6), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 7), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maniac[] = { + overworld_frame(gObjectEventPic_Maniac, 2, 4, 0), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 1), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 2), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 3), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 4), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 5), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 6), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 7), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HexManiac[] = { + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 0), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 1), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 2), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 3), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 4), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 5), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 6), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 7), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerM[] = { + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerF[] = { + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BlackBelt[] = { + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Beauty[] = { + overworld_frame(gObjectEventPic_Beauty, 2, 4, 0), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 1), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 2), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 3), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 4), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 5), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 6), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 7), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist1[] = { + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lass[] = { + overworld_frame(gObjectEventPic_Lass, 2, 4, 0), + overworld_frame(gObjectEventPic_Lass, 2, 4, 1), + overworld_frame(gObjectEventPic_Lass, 2, 4, 2), + overworld_frame(gObjectEventPic_Lass, 2, 4, 3), + overworld_frame(gObjectEventPic_Lass, 2, 4, 4), + overworld_frame(gObjectEventPic_Lass, 2, 4, 5), + overworld_frame(gObjectEventPic_Lass, 2, 4, 6), + overworld_frame(gObjectEventPic_Lass, 2, 4, 7), + overworld_frame(gObjectEventPic_Lass, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Gentleman[] = { + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 0), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 1), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 2), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 3), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 4), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 5), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 6), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 7), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sailor[] = { + overworld_frame(gObjectEventPic_Sailor, 2, 4, 0), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 1), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 2), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 3), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 4), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 5), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 6), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 7), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fisherman[] = { + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 0), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 1), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 2), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 3), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 4), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 5), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 6), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 7), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteM[] = { + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteF[] = { + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberF[] = { + overworld_frame(gObjectEventPic_TuberF, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberM[] = { + overworld_frame(gObjectEventPic_TuberM, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Hiker[] = { + overworld_frame(gObjectEventPic_Hiker, 2, 4, 0), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 1), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 2), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 3), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 4), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 5), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 6), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 7), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteM[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteF[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Nurse[] = { + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ItemBall[] = { + obj_frame_tiles(gObjectEventPic_ItemBall), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ProfBirch[] = { + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 0), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 1), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 2), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 3), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 4), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 5), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 6), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 7), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man4[] = { + overworld_frame(gObjectEventPic_Man4, 2, 4, 0), + overworld_frame(gObjectEventPic_Man4, 2, 4, 1), + overworld_frame(gObjectEventPic_Man4, 2, 4, 2), + overworld_frame(gObjectEventPic_Man4, 2, 4, 3), + overworld_frame(gObjectEventPic_Man4, 2, 4, 4), + overworld_frame(gObjectEventPic_Man4, 2, 4, 5), + overworld_frame(gObjectEventPic_Man4, 2, 4, 6), + overworld_frame(gObjectEventPic_Man4, 2, 4, 7), + overworld_frame(gObjectEventPic_Man4, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man5[] = { + overworld_frame(gObjectEventPic_Man5, 2, 4, 0), + overworld_frame(gObjectEventPic_Man5, 2, 4, 1), + overworld_frame(gObjectEventPic_Man5, 2, 4, 2), + overworld_frame(gObjectEventPic_Man5, 2, 4, 3), + overworld_frame(gObjectEventPic_Man5, 2, 4, 4), + overworld_frame(gObjectEventPic_Man5, 2, 4, 5), + overworld_frame(gObjectEventPic_Man5, 2, 4, 6), + overworld_frame(gObjectEventPic_Man5, 2, 4, 7), + overworld_frame(gObjectEventPic_Man5, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterM[] = { + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterF[] = { + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan1[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan2[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedNatuDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedNatuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedMagnemiteDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedMagnemiteDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedSquirtleDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedSquirtleDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedWooperDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedWooperDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPikachuDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedPikachuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPorygon2Doll[] = { + obj_frame_tiles(gObjectEventPic_UnusedPorygon2Doll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CuttableTree[] = { + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 0), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 1), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 2), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MartEmployee[] = { + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RooftopSaleWoman[] = { + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Teala[] = { + overworld_frame(gObjectEventPic_Teala, 2, 4, 0), + overworld_frame(gObjectEventPic_Teala, 2, 4, 1), + overworld_frame(gObjectEventPic_Teala, 2, 4, 2), + overworld_frame(gObjectEventPic_Teala, 2, 4, 3), + overworld_frame(gObjectEventPic_Teala, 2, 4, 4), + overworld_frame(gObjectEventPic_Teala, 2, 4, 5), + overworld_frame(gObjectEventPic_Teala, 2, 4, 6), + overworld_frame(gObjectEventPic_Teala, 2, 4, 7), + overworld_frame(gObjectEventPic_Teala, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BreakableRock[] = { + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 0), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 1), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 2), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PushableBoulder[] = { + obj_frame_tiles(gObjectEventPic_PushableBoulder), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MrBrineysBoat[] = { + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Truck[] = { + obj_frame_tiles(gObjectEventPic_Truck), +}; + +const struct SpriteFrameImage gObjectEventPicTable_VigorothCarryingBox[] = { + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_VigorothFacingAway[] = { + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirchsBag[] = { + obj_frame_tiles(gObjectEventPic_BirchsBag), +}; + +const struct SpriteFrameImage gObjectEventPicTable_EnemyZigzagoon[] = { + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 0), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 1), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 2), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 3), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 4), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 5), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 6), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 7), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Poochyena[] = { + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 0), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 1), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 2), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 3), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 4), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 5), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 6), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 7), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Artist[] = { + overworld_frame(gObjectEventPic_Artist, 2, 4, 0), + overworld_frame(gObjectEventPic_Artist, 2, 4, 1), + overworld_frame(gObjectEventPic_Artist, 2, 4, 2), + overworld_frame(gObjectEventPic_Artist, 2, 4, 3), + overworld_frame(gObjectEventPic_Artist, 2, 4, 4), + overworld_frame(gObjectEventPic_Artist, 2, 4, 5), + overworld_frame(gObjectEventPic_Artist, 2, 4, 6), + overworld_frame(gObjectEventPic_Artist, 2, 4, 7), + overworld_frame(gObjectEventPic_Artist, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayNormal[] = { + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 0), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 1), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 2), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 3), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 4), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 5), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 6), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 7), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayMachBike[] = { + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayAcroBike[] = { + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 26), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MaySurfing[] = { + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayUnderwater[] = { + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFieldMove[] = { + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cameraman[] = { + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 0), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 1), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 2), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 3), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 4), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 5), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 6), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 7), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MovingBox[] = { + obj_frame_tiles(gObjectEventPic_MovingBox), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CableCar[] = { + obj_frame_tiles(gObjectEventPic_CableCar), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist2[] = { + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DevonEmployee[] = { + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberM[] = { + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberF[] = { + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberM[] = { + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberF[] = { + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sidney[] = { + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Phoebe[] = { + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Glacia[] = { + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Drake[] = { + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Roxanne[] = { + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brawly[] = { + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wattson[] = { + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Flannery[] = { + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Norman[] = { + overworld_frame(gObjectEventPic_Norman, 2, 4, 0), + overworld_frame(gObjectEventPic_Norman, 2, 4, 1), + overworld_frame(gObjectEventPic_Norman, 2, 4, 2), + overworld_frame(gObjectEventPic_Norman, 2, 4, 3), + overworld_frame(gObjectEventPic_Norman, 2, 4, 4), + overworld_frame(gObjectEventPic_Norman, 2, 4, 5), + overworld_frame(gObjectEventPic_Norman, 2, 4, 6), + overworld_frame(gObjectEventPic_Norman, 2, 4, 7), + overworld_frame(gObjectEventPic_Norman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Winona[] = { + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Liza[] = { + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tate[] = { + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wallace[] = { + overworld_frame(gObjectEventPic_Wallace, 2, 4, 0), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 1), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 2), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 3), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 4), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 5), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 6), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 7), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Steven[] = { + overworld_frame(gObjectEventPic_Steven, 2, 4, 0), + overworld_frame(gObjectEventPic_Steven, 2, 4, 1), + overworld_frame(gObjectEventPic_Steven, 2, 4, 2), + overworld_frame(gObjectEventPic_Steven, 2, 4, 3), + overworld_frame(gObjectEventPic_Steven, 2, 4, 4), + overworld_frame(gObjectEventPic_Steven, 2, 4, 5), + overworld_frame(gObjectEventPic_Steven, 2, 4, 6), + overworld_frame(gObjectEventPic_Steven, 2, 4, 7), + overworld_frame(gObjectEventPic_Steven, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wally[] = { + overworld_frame(gObjectEventPic_Wally, 2, 4, 0), + overworld_frame(gObjectEventPic_Wally, 2, 4, 1), + overworld_frame(gObjectEventPic_Wally, 2, 4, 2), + overworld_frame(gObjectEventPic_Wally, 2, 4, 3), + overworld_frame(gObjectEventPic_Wally, 2, 4, 4), + overworld_frame(gObjectEventPic_Wally, 2, 4, 5), + overworld_frame(gObjectEventPic_Wally, 2, 4, 6), + overworld_frame(gObjectEventPic_Wally, 2, 4, 7), + overworld_frame(gObjectEventPic_Wally, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireLittleBoy[] = { + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFishing[] = { + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 11), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFishing[] = { + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 11), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HotSpringsOldWoman[] = { + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SSTidal[] = { + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SubmarineShadow[] = { + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PichuDoll[] = { + obj_frame_tiles(gObjectEventPic_PichuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikachuDoll[] = { + obj_frame_tiles(gObjectEventPic_PikachuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MarillDoll[] = { + obj_frame_tiles(gObjectEventPic_MarillDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TogepiDoll[] = { + obj_frame_tiles(gObjectEventPic_TogepiDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyndaquilDoll[] = { + obj_frame_tiles(gObjectEventPic_CyndaquilDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ChikoritaDoll[] = { + obj_frame_tiles(gObjectEventPic_ChikoritaDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TotodileDoll[] = { + obj_frame_tiles(gObjectEventPic_TotodileDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_JigglypuffDoll[] = { + obj_frame_tiles(gObjectEventPic_JigglypuffDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MeowthDoll[] = { + obj_frame_tiles(gObjectEventPic_MeowthDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ClefairyDoll[] = { + obj_frame_tiles(gObjectEventPic_ClefairyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DittoDoll[] = { + obj_frame_tiles(gObjectEventPic_DittoDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SmoochumDoll[] = { + obj_frame_tiles(gObjectEventPic_SmoochumDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TreeckoDoll[] = { + obj_frame_tiles(gObjectEventPic_TreeckoDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TorchicDoll[] = { + obj_frame_tiles(gObjectEventPic_TorchicDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MudkipDoll[] = { + obj_frame_tiles(gObjectEventPic_MudkipDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DuskullDoll[] = { + obj_frame_tiles(gObjectEventPic_DuskullDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WynautDoll[] = { + obj_frame_tiles(gObjectEventPic_WynautDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BaltoyDoll[] = { + obj_frame_tiles(gObjectEventPic_BaltoyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KecleonDoll[] = { + obj_frame_tiles(gObjectEventPic_KecleonDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzurillDoll[] = { + obj_frame_tiles(gObjectEventPic_AzurillDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SkittyDoll[] = { + obj_frame_tiles(gObjectEventPic_SkittyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwabluDoll[] = { + obj_frame_tiles(gObjectEventPic_SwabluDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GulpinDoll[] = { + obj_frame_tiles(gObjectEventPic_GulpinDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LotadDoll[] = { + obj_frame_tiles(gObjectEventPic_LotadDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SeedotDoll[] = { + obj_frame_tiles(gObjectEventPic_SeedotDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikaCushion[] = { + obj_frame_tiles(gObjectEventPic_PikaCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RoundCushion[] = { + obj_frame_tiles(gObjectEventPic_RoundCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KissCushion[] = { + obj_frame_tiles(gObjectEventPic_KissCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ZigzagCushion[] = { + obj_frame_tiles(gObjectEventPic_ZigzagCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SpinCushion[] = { + obj_frame_tiles(gObjectEventPic_SpinCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DiamondCushion[] = { + obj_frame_tiles(gObjectEventPic_DiamondCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BallCushion[] = { + obj_frame_tiles(gObjectEventPic_BallCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GrassCushion[] = { + obj_frame_tiles(gObjectEventPic_GrassCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_FireCushion[] = { + obj_frame_tiles(gObjectEventPic_FireCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WaterCushion[] = { + obj_frame_tiles(gObjectEventPic_WaterCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigSnorlaxDoll[] = { + obj_frame_tiles(gObjectEventPic_BigSnorlaxDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRhydonDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRhydonDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigLaprasDoll[] = { + obj_frame_tiles(gObjectEventPic_BigLaprasDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigVenusaurDoll[] = { + obj_frame_tiles(gObjectEventPic_BigVenusaurDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigCharizardDoll[] = { + obj_frame_tiles(gObjectEventPic_BigCharizardDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigBlastoiseDoll[] = { + obj_frame_tiles(gObjectEventPic_BigBlastoiseDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigWailmerDoll[] = { + obj_frame_tiles(gObjectEventPic_BigWailmerDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegirockDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegirockDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegiceDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegiceDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegisteelDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegisteelDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LatiasLatios[] = { + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GameboyKid[] = { + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ContestJudge[] = { + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 0), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 1), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 2), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 3), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 4), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 5), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 6), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 7), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanWatering[] = { + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayWatering[] = { + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanDecorating[] = { + obj_frame_tiles(gObjectEventPic_BrendanDecorating), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayDecorating[] = { + obj_frame_tiles(gObjectEventPic_MayDecorating), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Archie[] = { + overworld_frame(gObjectEventPic_Archie, 2, 4, 0), + overworld_frame(gObjectEventPic_Archie, 2, 4, 1), + overworld_frame(gObjectEventPic_Archie, 2, 4, 2), + overworld_frame(gObjectEventPic_Archie, 2, 4, 3), + overworld_frame(gObjectEventPic_Archie, 2, 4, 4), + overworld_frame(gObjectEventPic_Archie, 2, 4, 5), + overworld_frame(gObjectEventPic_Archie, 2, 4, 6), + overworld_frame(gObjectEventPic_Archie, 2, 4, 7), + overworld_frame(gObjectEventPic_Archie, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maxie[] = { + overworld_frame(gObjectEventPic_Maxie, 2, 4, 0), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 1), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 2), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 3), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 4), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 5), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 6), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 7), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KyogreFront[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GroudonFront[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KyogreSide[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GroudonSide[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fossil[] = { + obj_frame_tiles(gObjectEventPic_Fossil), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Regi[] = { + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Skitty[] = { + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kecleon[] = { + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Rayquaza[] = { + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 0), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 1), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 2), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 3), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RayquazaStill[] = { + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Zigzagoon[] = { + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Pikachu[] = { + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azumarill[] = { + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wingull[] = { + overworld_frame(gObjectEventPic_Wingull, 2, 2, 0), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 2), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 4), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberMSwimming[] = { + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azurill[] = { + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mom[] = { + overworld_frame(gObjectEventPic_Mom, 2, 4, 0), + overworld_frame(gObjectEventPic_Mom, 2, 4, 1), + overworld_frame(gObjectEventPic_Mom, 2, 4, 2), + overworld_frame(gObjectEventPic_Mom, 2, 4, 3), + overworld_frame(gObjectEventPic_Mom, 2, 4, 4), + overworld_frame(gObjectEventPic_Mom, 2, 4, 5), + overworld_frame(gObjectEventPic_Mom, 2, 4, 6), + overworld_frame(gObjectEventPic_Mom, 2, 4, 7), + overworld_frame(gObjectEventPic_Mom, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scott[] = { + overworld_frame(gObjectEventPic_Scott, 2, 4, 0), + overworld_frame(gObjectEventPic_Scott, 2, 4, 1), + overworld_frame(gObjectEventPic_Scott, 2, 4, 2), + overworld_frame(gObjectEventPic_Scott, 2, 4, 3), + overworld_frame(gObjectEventPic_Scott, 2, 4, 4), + overworld_frame(gObjectEventPic_Scott, 2, 4, 5), + overworld_frame(gObjectEventPic_Scott, 2, 4, 6), + overworld_frame(gObjectEventPic_Scott, 2, 4, 7), + overworld_frame(gObjectEventPic_Scott, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Juan[] = { + overworld_frame(gObjectEventPic_Juan, 2, 4, 0), + overworld_frame(gObjectEventPic_Juan, 2, 4, 1), + overworld_frame(gObjectEventPic_Juan, 2, 4, 2), + overworld_frame(gObjectEventPic_Juan, 2, 4, 3), + overworld_frame(gObjectEventPic_Juan, 2, 4, 4), + overworld_frame(gObjectEventPic_Juan, 2, 4, 5), + overworld_frame(gObjectEventPic_Juan, 2, 4, 6), + overworld_frame(gObjectEventPic_Juan, 2, 4, 7), + overworld_frame(gObjectEventPic_Juan, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MysteryEventDeliveryman[] = { + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Statue[] = { + obj_frame_tiles(gObjectEventPic_Statue), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Dusclops[] = { + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 0), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 1), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 2), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 3), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 4), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 5), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 6), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 7), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kirlia[] = { + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 0), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 1), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 2), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 3), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 4), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 5), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 6), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 7), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnionRoomAttendant[] = { + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sudowoodo[] = { + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 1), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 1), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mew[] = { + overworld_frame(gObjectEventPic_Mew, 2, 4, 0), + overworld_frame(gObjectEventPic_Mew, 2, 4, 1), + overworld_frame(gObjectEventPic_Mew, 2, 4, 2), + overworld_frame(gObjectEventPic_Mew, 2, 4, 3), + overworld_frame(gObjectEventPic_Mew, 2, 4, 4), + overworld_frame(gObjectEventPic_Mew, 2, 4, 5), + overworld_frame(gObjectEventPic_Mew, 2, 4, 6), + overworld_frame(gObjectEventPic_Mew, 2, 4, 7), + overworld_frame(gObjectEventPic_Mew, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Red[] = { + overworld_frame(gObjectEventPic_Red, 2, 4, 0), + overworld_frame(gObjectEventPic_Red, 2, 4, 1), + overworld_frame(gObjectEventPic_Red, 2, 4, 2), + overworld_frame(gObjectEventPic_Red, 2, 4, 3), + overworld_frame(gObjectEventPic_Red, 2, 4, 4), + overworld_frame(gObjectEventPic_Red, 2, 4, 5), + overworld_frame(gObjectEventPic_Red, 2, 4, 6), + overworld_frame(gObjectEventPic_Red, 2, 4, 7), + overworld_frame(gObjectEventPic_Red, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Leaf[] = { + overworld_frame(gObjectEventPic_Leaf, 2, 4, 0), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 1), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 2), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 3), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 4), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 5), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 6), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 7), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Deoxys[] = { + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 1), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 1), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirthIslandStone[] = { + obj_frame_tiles(gObjectEventPic_BirthIslandStone), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Anabel[] = { + overworld_frame(gObjectEventPic_Anabel, 2, 4, 0), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 1), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 2), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 3), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 4), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 5), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 6), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 7), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tucker[] = { + overworld_frame(gObjectEventPic_Tucker, 2, 4, 0), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 1), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 2), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 3), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 4), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 5), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 6), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 7), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Spenser[] = { + overworld_frame(gObjectEventPic_Spenser, 2, 4, 0), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 1), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 2), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 3), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 4), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 5), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 6), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 7), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Greta[] = { + overworld_frame(gObjectEventPic_Greta, 2, 4, 0), + overworld_frame(gObjectEventPic_Greta, 2, 4, 1), + overworld_frame(gObjectEventPic_Greta, 2, 4, 2), + overworld_frame(gObjectEventPic_Greta, 2, 4, 3), + overworld_frame(gObjectEventPic_Greta, 2, 4, 4), + overworld_frame(gObjectEventPic_Greta, 2, 4, 5), + overworld_frame(gObjectEventPic_Greta, 2, 4, 6), + overworld_frame(gObjectEventPic_Greta, 2, 4, 7), + overworld_frame(gObjectEventPic_Greta, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Noland[] = { + overworld_frame(gObjectEventPic_Noland, 2, 4, 0), + overworld_frame(gObjectEventPic_Noland, 2, 4, 1), + overworld_frame(gObjectEventPic_Noland, 2, 4, 2), + overworld_frame(gObjectEventPic_Noland, 2, 4, 3), + overworld_frame(gObjectEventPic_Noland, 2, 4, 4), + overworld_frame(gObjectEventPic_Noland, 2, 4, 5), + overworld_frame(gObjectEventPic_Noland, 2, 4, 6), + overworld_frame(gObjectEventPic_Noland, 2, 4, 7), + overworld_frame(gObjectEventPic_Noland, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lucy[] = { + overworld_frame(gObjectEventPic_Lucy, 2, 4, 0), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 1), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 2), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 3), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 4), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 5), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 6), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 7), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brandon[] = { + overworld_frame(gObjectEventPic_Brandon, 2, 4, 0), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 1), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 2), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 3), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 4), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 5), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 6), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 7), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lugia[] = { + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HoOh[] = { + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireBrendan[] = { + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireMay[] = { + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 8), +}; diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/object_event/event_object_subsprites.h index 0b4a80f72..79e75f1e1 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/object_event/event_object_subsprites.h @@ -1,4 +1,4 @@ -const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = { { .x = -8, .y = -8, @@ -9,7 +9,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = { { .x = -8, .y = -8, @@ -20,7 +20,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = { { .x = -8, .y = -8, @@ -39,7 +39,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = { { .x = -8, .y = -8, @@ -58,7 +58,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = { { .x = -8, .y = -8, @@ -77,16 +77,16 @@ const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_16x16_0}, - {1, gEventObjectSpriteOamTable_16x16_1}, - {2, gEventObjectSpriteOamTable_16x16_2}, - {2, gEventObjectSpriteOamTable_16x16_3}, - {2, gEventObjectSpriteOamTable_16x16_4} + {1, gObjectEventSpriteOamTable_16x16_0}, + {1, gObjectEventSpriteOamTable_16x16_1}, + {2, gObjectEventSpriteOamTable_16x16_2}, + {2, gObjectEventSpriteOamTable_16x16_3}, + {2, gObjectEventSpriteOamTable_16x16_4} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = { { .x = -8, .y = -16, @@ -97,7 +97,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = { { .x = -8, .y = -16, @@ -108,7 +108,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = { { .x = -8, .y = -16, @@ -135,7 +135,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = { { .x = -8, .y = -16, @@ -154,7 +154,7 @@ const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = { { .x = -8, .y = -16, @@ -173,16 +173,16 @@ const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_16x32_0}, - {1, gEventObjectSpriteOamTable_16x32_1}, - {3, gEventObjectSpriteOamTable_16x32_2}, - {2, gEventObjectSpriteOamTable_16x32_3}, - {2, gEventObjectSpriteOamTable_16x32_4} + {1, gObjectEventSpriteOamTable_16x32_0}, + {1, gObjectEventSpriteOamTable_16x32_1}, + {3, gObjectEventSpriteOamTable_16x32_2}, + {2, gObjectEventSpriteOamTable_16x32_3}, + {2, gObjectEventSpriteOamTable_16x32_4} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = { { .x = -16, .y = -16, @@ -193,7 +193,7 @@ const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = { { .x = -16, .y = -16, @@ -204,7 +204,7 @@ const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = { { .x = -16, .y = -16, @@ -231,7 +231,7 @@ const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = { { .x = -16, .y = -16, @@ -250,7 +250,7 @@ const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = { { .x = -16, .y = -16, @@ -269,16 +269,16 @@ const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_32x32_0}, - {1, gEventObjectSpriteOamTable_32x32_1}, - {3, gEventObjectSpriteOamTable_32x32_2}, - {2, gEventObjectSpriteOamTable_32x32_3}, - {2, gEventObjectSpriteOamTable_32x32_4} + {1, gObjectEventSpriteOamTable_32x32_0}, + {1, gObjectEventSpriteOamTable_32x32_1}, + {3, gObjectEventSpriteOamTable_32x32_2}, + {2, gObjectEventSpriteOamTable_32x32_3}, + {2, gObjectEventSpriteOamTable_32x32_4} }; -const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = { { .x = -24, .y = -24, @@ -377,16 +377,16 @@ const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = { - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0} +const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = { + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = { { .x = -32, .y = -16, @@ -397,7 +397,7 @@ const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = { { .x = -32, .y = -16, @@ -408,7 +408,7 @@ const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = { { .x = -32, .y = -16, @@ -419,7 +419,7 @@ const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = { { .x = -32, .y = -16, @@ -430,16 +430,16 @@ const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_Unused_0}, - {1, gEventObjectSpriteOamTable_Unused_1}, - {1, gEventObjectSpriteOamTable_Unused_2}, - {1, gEventObjectSpriteOamTable_Unused_3}, - {1, gEventObjectSpriteOamTable_Unused_3} + {1, gObjectEventSpriteOamTable_Unused_0}, + {1, gObjectEventSpriteOamTable_Unused_1}, + {1, gObjectEventSpriteOamTable_Unused_2}, + {1, gObjectEventSpriteOamTable_Unused_3}, + {1, gObjectEventSpriteOamTable_Unused_3} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = { { .x = -32, .y = -32, @@ -450,7 +450,7 @@ const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = { { .x = -32, .y = -32, @@ -461,7 +461,7 @@ const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = { { .x = -32, .y = -32, @@ -472,7 +472,7 @@ const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = { { .x = -32, .y = -32, @@ -483,16 +483,16 @@ const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_64x64_0}, - {1, gEventObjectSpriteOamTable_64x64_1}, - {1, gEventObjectSpriteOamTable_64x64_2}, - {1, gEventObjectSpriteOamTable_64x64_3}, - {1, gEventObjectSpriteOamTable_64x64_3} + {1, gObjectEventSpriteOamTable_64x64_0}, + {1, gObjectEventSpriteOamTable_64x64_1}, + {1, gObjectEventSpriteOamTable_64x64_2}, + {1, gObjectEventSpriteOamTable_64x64_3}, + {1, gObjectEventSpriteOamTable_64x64_3} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = { { .x = -48, .y = -20, @@ -615,7 +615,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = { { .x = -48, .y = -20, @@ -738,7 +738,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = { { .x = -48, .y = -20, @@ -861,7 +861,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = { { .x = -48, .y = -20, @@ -984,16 +984,16 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = { - {15, gEventObjectSpriteOamTable_SSTidal_0}, - {15, gEventObjectSpriteOamTable_SSTidal_0}, - {15, gEventObjectSpriteOamTable_SSTidal_1}, - {15, gEventObjectSpriteOamTable_SSTidal_2}, - {15, gEventObjectSpriteOamTable_SSTidal_3}, - {15, gEventObjectSpriteOamTable_SSTidal_3} +const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = { + {15, gObjectEventSpriteOamTable_SSTidal_0}, + {15, gObjectEventSpriteOamTable_SSTidal_0}, + {15, gObjectEventSpriteOamTable_SSTidal_1}, + {15, gObjectEventSpriteOamTable_SSTidal_2}, + {15, gObjectEventSpriteOamTable_SSTidal_3}, + {15, gObjectEventSpriteOamTable_SSTidal_3} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = { { .x = -48, .y = -20, @@ -1124,7 +1124,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = { { .x = -48, .y = -20, @@ -1255,7 +1255,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = { { .x = -48, .y = -20, @@ -1386,7 +1386,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { } }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = { { .x = -48, .y = -20, @@ -1517,11 +1517,11 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { } }; -const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { - {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_1}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_2}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_3} +const struct SubspriteTable gObjectEventSpriteOamTables_SubmarineShadow[] = { + {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_1}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_2}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_3}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_3} }; diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/object_event/field_effect_object_template_pointers.h index 32d2b069a..32d2b069a 100755 --- a/src/data/field_event_obj/field_effect_object_template_pointers.h +++ b/src/data/object_event/field_effect_object_template_pointers.h diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/object_event/field_effect_objects.h index a3944de36..e47973dae 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/object_event/field_effect_objects.h @@ -29,13 +29,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), @@ -60,7 +60,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = gFieldEffectObjectImageAnim_850CA84, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), @@ -88,7 +88,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = gFieldEffectObjectImageAnim_850CAE0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), @@ -113,7 +113,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = gFieldEffectObjectImageAnim_850CB48, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0), @@ -153,7 +153,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = gSurfBlobAnim_FaceEast, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), @@ -202,7 +202,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = gFieldEffectObjectImageAnim_850CC40, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), @@ -223,7 +223,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = gFieldEffectObjectImageAnim_850CC8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0), @@ -246,7 +246,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = gFieldEffectObjectImageAnim_850CCD8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), @@ -286,7 +286,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = gFieldEffectObjectImageAnim_850CD30, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), @@ -326,7 +326,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] gFieldEffectObjectImageAnim_850CD8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0), @@ -396,7 +396,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = gFieldEffectObjectImageAnim_850CE18, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0), @@ -419,7 +419,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = gFieldEffectObjectImageAnim_850CE7C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), @@ -452,7 +452,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = gFieldEffectObjectImageAnim_850CEC8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0), @@ -473,7 +473,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] gFieldEffectObjectImageAnim_850CF24, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), @@ -499,7 +499,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = gFieldEffectObjectImageAnim_850CF70, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0), @@ -526,7 +526,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = gFieldEffectObjectImageAnim_850CFDC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), @@ -559,7 +559,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = gFieldEffectObjectImageAnim_850D05C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0), @@ -584,7 +584,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = gFieldEffectObjectImageAnim_850D0C0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), @@ -607,7 +607,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = gFieldEffectObjectImageAnim_850D118, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0), @@ -628,7 +628,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = gFieldEffectObjectImageAnim_850D160, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), @@ -653,7 +653,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] = gFieldEffectObjectImageAnim_850D1AC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = { @@ -730,7 +730,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark gFieldEffectObjectImageAnim_850D2D4, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), @@ -766,7 +766,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = gFieldEffectObjectImageAnim_850D384, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), @@ -802,7 +802,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = gFieldEffectObjectImageAnim_850D404, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), @@ -814,7 +814,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { obj_frame_tiles(gFieldEffectObjectPic_Bird), @@ -831,7 +831,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = gFieldEffectObjectImageAnim_850D49C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), @@ -850,7 +850,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = gFieldEffectObjectImageAnim_850D4D0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), @@ -867,7 +867,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = gFieldEffectObjectImageAnim_850D500, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0), @@ -892,7 +892,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] = gFieldEffectObjectImageAnim_850D54C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; @@ -919,7 +919,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] = gFieldEffectObjectImageAnim_850D5B0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), @@ -950,7 +950,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = gFieldEffectObjectImageAnim_850D624, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0), @@ -970,7 +970,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] = gFieldEffectObjectImageAnim_850D674, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; @@ -984,9 +984,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { }; const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; -const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; +const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, 0x1011}; diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/object_event/movement_action_func_tables.h index 8e136b58b..8cf7d1699 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/object_event/movement_action_func_tables.h @@ -1,427 +1,427 @@ -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_HideReflection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ShowReflection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkLeftAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkLeftAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkRightAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkRightAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Figure8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Figure8_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Levitate_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_StopLevitate_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Fly_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyDown_Step1(struct EventObject *, struct Sprite *); - -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *); - -u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PauseSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay1_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay2_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay4_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay16_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WaitSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FacePlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetInvisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetVisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_HideReflection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ShowReflection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Figure8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Figure8_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Levitate_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StopLevitate_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Fly_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyDown_Step1(struct ObjectEvent *, struct Sprite *); + +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_HideReflection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ShowReflection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StopLevitate[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *); + +u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown, [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp, [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft, @@ -582,22 +582,22 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown, }; -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceDown_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceUp_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceRight_Step0, MovementAction_PauseSpriteAnim, }; @@ -610,97 +610,97 @@ u8 (*const gUnknown_0850DEE8[])(u8) = { GetMoveDirectionFastestAnimNum, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalUpLeft_Step0, MovementAction_WalkSlowDiagonalUpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalUpRight_Step0, MovementAction_WalkSlowDiagonalUpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalDownLeft_Step0, MovementAction_WalkSlowDiagonalDownLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalDownRight_Step0, MovementAction_WalkSlowDiagonalDownRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDown_Step0, MovementAction_WalkSlowDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowUp_Step0, MovementAction_WalkSlowUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowLeft_Step0, MovementAction_WalkSlowLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowRight_Step0, MovementAction_WalkSlowRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalUpLeft_Step0, MovementAction_WalkNormalDiagonalUpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalUpRight_Step0, MovementAction_WalkNormalDiagonalUpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalDownLeft_Step0, MovementAction_WalkNormalDiagonalDownLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalDownRight_Step0, MovementAction_WalkNormalDiagonalDownRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDown_Step0, MovementAction_WalkNormalDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalUp_Step0, MovementAction_WalkNormalUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalLeft_Step0, MovementAction_WalkNormalLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalRight_Step0, MovementAction_WalkNormalRight_Step1, MovementAction_PauseSpriteAnim, @@ -709,805 +709,805 @@ u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Down_Step0, MovementAction_Jump2Down_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Up_Step0, MovementAction_Jump2Up_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Left_Step0, MovementAction_Jump2Left_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Right_Step0, MovementAction_Jump2Right_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay1_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay2_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay4_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay8_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay16_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastDown_Step0, MovementAction_WalkFastDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastUp_Step0, MovementAction_WalkFastUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastLeft_Step0, MovementAction_WalkFastLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastRight_Step0, MovementAction_WalkFastRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowDown_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowUp_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowLeft_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowRight_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentDown_Step0, MovementAction_RideWaterCurrentDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentUp_Step0, MovementAction_RideWaterCurrentUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentLeft_Step0, MovementAction_RideWaterCurrentLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentRight_Step0, MovementAction_RideWaterCurrentRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestDown_Step0, MovementAction_WalkFastestDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestUp_Step0, MovementAction_WalkFastestUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestLeft_Step0, MovementAction_WalkFastestLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestRight_Step0, MovementAction_WalkFastestRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideDown_Step0, MovementAction_SlideDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideUp_Step0, MovementAction_SlideUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideLeft_Step0, MovementAction_SlideLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideRight_Step0, MovementAction_SlideRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunDown_Step0, MovementAction_PlayerRunDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunUp_Step0, MovementAction_PlayerRunUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunLeft_Step0, MovementAction_PlayerRunLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunRight_Step0, MovementAction_PlayerRunRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StartAnimInDirection_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialDown_Step0, MovementAction_JumpSpecialDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialUp_Step0, MovementAction_JumpSpecialUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialLeft_Step0, MovementAction_JumpSpecialLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialRight_Step0, MovementAction_JumpSpecialRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FacePlayer_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceAwayPlayer_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_LockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnlockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpDown_Step0, MovementAction_JumpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpUp_Step0, MovementAction_JumpUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpLeft_Step0, MovementAction_JumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpRight_Step0, MovementAction_JumpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDown_Step0, MovementAction_JumpInPlaceDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUp_Step0, MovementAction_JumpInPlaceUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeft_Step0, MovementAction_JumpInPlaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRight_Step0, MovementAction_JumpInPlaceRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDownUp_Step0, MovementAction_JumpInPlaceDownUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUpDown_Step0, MovementAction_JumpInPlaceUpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeftRight_Step0, MovementAction_JumpInPlaceLeftRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRightLeft_Step0, MovementAction_JumpInPlaceRightLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceOriginalDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_NurseJoyBowDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EnableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableAnimation_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RestoreAnimation_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetInvisible_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetVisible_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteExclamationMark_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteQuestionMark_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteHeart_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RevealTrainer_Step0, MovementAction_RevealTrainer_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RockSmashBreak_Step0, MovementAction_RockSmashBreak_Step1, MovementAction_RockSmashBreak_Step2, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_CutTree_Step0, MovementAction_CutTree_Step1, MovementAction_CutTree_Step2, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetFixedPriority_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearFixedPriority_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_InitAffineAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearAffineAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_HideReflection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_HideReflection_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ShowReflection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ShowReflection_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownStartAffine_Step0, MovementAction_WalkDownStartAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownAffine_Step0, MovementAction_WalkDownAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkLeftAffine_Step0, MovementAction_WalkLeftAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkRightAffine_Step0, MovementAction_WalkRightAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceDown_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceUp_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceRight_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Figure8_Step0, MovementAction_Figure8_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceDown_Step0, MovementAction_AcroWheelieHopFaceDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceUp_Step0, MovementAction_AcroWheelieHopFaceUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceLeft_Step0, MovementAction_AcroWheelieHopFaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceRight_Step0, MovementAction_AcroWheelieHopFaceRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopDown_Step0, MovementAction_AcroWheelieHopDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopUp_Step0, MovementAction_AcroWheelieHopUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopLeft_Step0, MovementAction_AcroWheelieHopLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopRight_Step0, MovementAction_AcroWheelieHopRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpDown_Step0, MovementAction_AcroWheelieJumpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpUp_Step0, MovementAction_AcroWheelieJumpUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpLeft_Step0, MovementAction_AcroWheelieJumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpRight_Step0, MovementAction_AcroWheelieJumpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveDown_Step0, MovementAction_AcroPopWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveUp_Step0, MovementAction_AcroPopWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveLeft_Step0, MovementAction_AcroPopWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveRight_Step0, MovementAction_AcroPopWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveDown_Step0, MovementAction_AcroWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveUp_Step0, MovementAction_AcroWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveLeft_Step0, MovementAction_AcroWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveRight_Step0, MovementAction_AcroWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveDown_Step0, MovementAction_AcroEndWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveUp_Step0, MovementAction_AcroEndWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveLeft_Step0, MovementAction_AcroEndWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveRight_Step0, MovementAction_AcroEndWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Levitate_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StopLevitate[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StopLevitate_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DestroyExtraTaskIfAtTop_Step0, MovementAction_Finish, }; diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/object_event/movement_type_func_tables.h index 3c490011b..7d149a628 100755 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/object_event/movement_type_func_tables.h @@ -1,4 +1,4 @@ -u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderAround_Step0, MovementType_WanderAround_Step1, MovementType_WanderAround_Step2, @@ -24,7 +24,7 @@ u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = { GetLimitedVectorDirection_SouthWestEast, }; -u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_LookAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_LookAround_Step0, MovementType_LookAround_Step1, MovementType_LookAround_Step2, @@ -32,7 +32,7 @@ u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite MovementType_LookAround_Step4, }; -u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderUpAndDown_Step0, MovementType_WanderUpAndDown_Step1, MovementType_WanderUpAndDown_Step2, @@ -44,7 +44,7 @@ u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sp const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderLeftAndRight_Step0, MovementType_WanderLeftAndRight_Step1, MovementType_WanderLeftAndRight_Step2, @@ -56,13 +56,13 @@ u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDirection_Step0, MovementType_FaceDirection_Step1, MovementType_FaceDirection_Step2, }; -u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_BerryTreeGrowth_Step0, MovementType_BerryTreeGrowth_Step1, MovementType_BerryTreeGrowth_Step2, @@ -70,7 +70,7 @@ u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sp MovementType_BerryTreeGrowth_Step4, }; -u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndUp_Step0, MovementType_FaceDownAndUp_Step1, MovementType_FaceDownAndUp_Step2, @@ -78,7 +78,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Spri MovementType_FaceDownAndUp_Step4, }; -u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceLeftAndRight_Step0, MovementType_FaceLeftAndRight_Step1, MovementType_FaceLeftAndRight_Step2, @@ -86,7 +86,7 @@ u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct S MovementType_FaceLeftAndRight_Step4, }; -u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndLeft_Step0, MovementType_FaceUpAndLeft_Step1, MovementType_FaceUpAndLeft_Step2, @@ -96,7 +96,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Spri const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndRight_Step0, MovementType_FaceUpAndRight_Step1, MovementType_FaceUpAndRight_Step2, @@ -106,7 +106,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Spr const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndLeft_Step0, MovementType_FaceDownAndLeft_Step1, MovementType_FaceDownAndLeft_Step2, @@ -116,7 +116,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sp const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndRight_Step0, MovementType_FaceDownAndRight_Step1, MovementType_FaceDownAndRight_Step2, @@ -126,7 +126,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct S const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndLeft_Step0, MovementType_FaceDownUpAndLeft_Step1, MovementType_FaceDownUpAndLeft_Step2, @@ -136,7 +136,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndRight_Step0, MovementType_FaceDownUpAndRight_Step1, MovementType_FaceDownUpAndRight_Step2, @@ -146,7 +146,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpLeftAndRight_Step0, MovementType_FaceUpLeftAndRight_Step1, MovementType_FaceUpLeftAndRight_Step2, @@ -156,7 +156,7 @@ u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownLeftAndRight_Step0, MovementType_FaceDownLeftAndRight_Step1, MovementType_FaceDownLeftAndRight_Step2, @@ -166,7 +166,7 @@ u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, stru const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateCounterclockwise_Step0, MovementType_RotateCounterclockwise_Step1, MovementType_RotateCounterclockwise_Step2, @@ -175,7 +175,7 @@ u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, st const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateClockwise_Step0, MovementType_RotateClockwise_Step1, MovementType_RotateClockwise_Step2, @@ -184,14 +184,14 @@ u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sp const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkBackAndForth_Step0, MovementType_WalkBackAndForth_Step1, MovementType_WalkBackAndForth_Step2, MovementType_WalkBackAndForth_Step3, }; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightLeftDown_Step1, MovementType_WalkSequence_Step2, @@ -199,7 +199,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftDownUp_Step1, MovementType_WalkSequence_Step2, @@ -207,7 +207,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpRightLeft_Step1, MovementType_WalkSequence_Step2, @@ -215,7 +215,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownUpRight_Step1, MovementType_WalkSequence_Step2, @@ -223,7 +223,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftRightDown_Step1, MovementType_WalkSequence_Step2, @@ -231,7 +231,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightDownUp_Step1, MovementType_WalkSequence_Step2, @@ -239,13 +239,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpLeftRight_Step1, MovementType_WalkSequence_Step2, }; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownUpLeft_Step1, MovementType_WalkSequence_Step2, @@ -253,7 +253,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpDownRight_Step1, MovementType_WalkSequence_Step2, @@ -261,7 +261,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownRightLeft_Step1, MovementType_WalkSequence_Step2, @@ -269,7 +269,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftUpDown_Step1, MovementType_WalkSequence_Step2, @@ -277,7 +277,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightLeftUp_Step1, MovementType_WalkSequence_Step2, @@ -285,7 +285,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpDownLeft_Step1, MovementType_WalkSequence_Step2, @@ -293,7 +293,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownLeftRight_Step1, MovementType_WalkSequence_Step2, @@ -301,7 +301,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightUpDown_Step1, MovementType_WalkSequence_Step2, @@ -309,7 +309,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftRightUp_Step1, MovementType_WalkSequence_Step2, @@ -317,7 +317,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftDownRight_Step1, MovementType_WalkSequence_Step2, @@ -325,7 +325,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightUpLeft_Step1, MovementType_WalkSequence_Step2, @@ -333,7 +333,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownRightUp_Step1, MovementType_WalkSequence_Step2, @@ -341,7 +341,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpLeftDown_Step1, MovementType_WalkSequence_Step2, @@ -349,7 +349,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightDownLeft_Step1, MovementType_WalkSequence_Step2, @@ -357,7 +357,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftUpRight_Step1, MovementType_WalkSequence_Step2, @@ -365,7 +365,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpRightDown_Step1, MovementType_WalkSequence_Step2, @@ -373,7 +373,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownLeftUp_Step1, MovementType_WalkSequence_Step2, @@ -381,13 +381,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayer_Step1, MovementType_CopyPlayer_Step2, }; -bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { +bool8 (*const gCopyPlayerMovementFuncs[])(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)) = { CopyablePlayerMovement_None, CopyablePlayerMovement_FaceDirection, CopyablePlayerMovement_GoSpeed0, @@ -401,37 +401,37 @@ bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, CopyablePlayerMovement_None, }; -u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayerInGrass_Step1, MovementType_CopyPlayer_Step2, }; -u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Hidden[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Hidden_Step0, }; -u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSlowlyInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_JogInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_JogInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RunInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RunInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Invisible_Step0, MovementType_Invisible_Step1, MovementType_Invisible_Step2, diff --git a/src/data/trade.h b/src/data/trade.h index 4ed39f6cd..739132093 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -5,7 +5,7 @@ static const u32 sUnusedStructSizes[] = sizeof(struct SaveBlock1), sizeof(struct MapHeader), // 0x00000530, in RS - sizeof(struct MailStruct), //or EventObject / EventObjectGraphicsInfo + sizeof(struct MailStruct), //or ObjectEvent / ObjectEventGraphicsInfo sizeof(struct Pokemon), //or TrainerCard 0x00000528 // 0x000004D8, in RS }; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 19aa40b00..b27de4513 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -12214,4 +12214,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/src/decoration.c b/src/decoration.c index 2a47dd553..a0065752a 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1246,22 +1246,22 @@ void SetDecoration(void) if (FlagGet(FLAG_DECORATION_1 + i) == TRUE) { FlagClear(FLAG_DECORATION_1 + i); - for (j = 0; j < gMapHeader.events->eventObjectCount; j++) + for (j = 0; j < gMapHeader.events->objectEventCount; j++) { - if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i) + if (gMapHeader.events->objectEvents[j].flagId == FLAG_DECORATION_1 + i) break; } VarSet( - VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[j].graphicsId - EVENT_OBJ_GFX_VAR_0), + VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[j].graphicsId - OBJ_EVENT_GFX_VAR_0), sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; - TrySpawnEventObject(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); break; } } @@ -1365,9 +1365,9 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic x -= 8; if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -1504,7 +1504,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) return FALSE; } @@ -1525,7 +1525,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) return FALSE; } } @@ -1542,7 +1542,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) return FALSE; } @@ -1579,7 +1579,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) return FALSE; } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) return FALSE; } break; @@ -1999,7 +1999,7 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf sub_8129048(data); data->decoration = &gDecorations[decor]; if (data->decoration->permission == DECORPERM_SPRITE) - return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + return AddPseudoObjectEvent(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG); sub_81291E8(data); @@ -2047,7 +2047,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode) return gDecorIconTable[decor][mode]; } -u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) +u8 AddDecorationIconObjectFromObjectEvent(u16 tilesTag, u16 paletteTag, u8 decor) { u8 spriteId; struct SpriteSheet sheet; @@ -2078,7 +2078,7 @@ u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor } else { - spriteId = AddPseudoEventObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + spriteId = AddPseudoObjectEvent(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); } return spriteId; } @@ -2098,7 +2098,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1 } else if (gDecorIconTable[decor][0] == NULL) { - spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor); + spriteId = AddDecorationIconObjectFromObjectEvent(tilesTag, paletteTag, decor); if (spriteId == MAX_SPRITES) return MAX_SPRITES; @@ -2142,11 +2142,11 @@ void sub_8129708(void) { gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId; sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx); - for (i = 0; i < gMapHeader.events->eventObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8005) { - gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8006 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -2157,11 +2157,11 @@ void sub_81297AC(void) { u8 i; - for (i = 0; i < gMapHeader.events->eventObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8004) { - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -2250,9 +2250,9 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) sub_812A39C(); gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0); if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -2453,9 +2453,9 @@ void sub_8129F20(void) yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F; for (i = 0; i < 0x40; i++) { - if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId)) + if (gSaveBlock1Ptr->objectEventTemplates[i].x == xOff && gSaveBlock1Ptr->objectEventTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->objectEventTemplates[i].flagId)) { - sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->eventObjectTemplates[i].flagId; + sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->objectEventTemplates[i].flagId; break; } } diff --git a/src/easy_chat.c b/src/easy_chat.c index 32478ff1a..0d32e91cf 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4718,13 +4718,13 @@ static void sub_811E828(void) switch (GetDisplayedPersonType()) { case EASY_CHAT_PERSON_REPORTER_MALE: - graphicsId = EVENT_OBJ_GFX_REPORTER_M; + graphicsId = OBJ_EVENT_GFX_REPORTER_M; break; case EASY_CHAT_PERSON_REPORTER_FEMALE: - graphicsId = EVENT_OBJ_GFX_REPORTER_F; + graphicsId = OBJ_EVENT_GFX_REPORTER_F; break; case EASY_CHAT_PERSON_BOY: - graphicsId = EVENT_OBJ_GFX_BOY_1; + graphicsId = OBJ_EVENT_GFX_BOY_1; break; default: return; @@ -4733,15 +4733,15 @@ static void sub_811E828(void) if (GetEasyChatScreenFrameId() != 4) return; - spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); + spriteId = AddPseudoObjectEvent(graphicsId, SpriteCallbackDummy, 76, 40, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; StartSpriteAnim(&gSprites[spriteId], 2); } - spriteId = AddPseudoEventObject( - gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + spriteId = AddPseudoObjectEvent( + gSaveBlock2Ptr->playerGender == MALE ? OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL : OBJ_EVENT_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, 52, 40, diff --git a/src/event_data.c b/src/event_data.c index 50628f984..00ae1d890 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -187,7 +187,7 @@ bool8 VarSet(u16 id, u16 value) return TRUE; } -u8 VarGetEventObjectGraphicsId(u8 id) +u8 VarGetObjectEventGraphicsId(u8 id) { return VarGet(VAR_OBJ_GFX_ID_0 + id); } diff --git a/src/event_obj_lock.c b/src/event_object_lock.c index c64a2ab22..1f1be8d5a 100644 --- a/src/event_obj_lock.c +++ b/src/event_object_lock.c @@ -1,8 +1,8 @@ #include "global.h" #include "event_data.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" -#include "event_obj_lock.h" #include "script_movement.h" #include "task.h" #include "trainer_see.h" @@ -39,9 +39,9 @@ bool8 sub_80983C4(void) } -void ScriptFreezeEventObjects(void) +void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_80983A4, 80); } @@ -54,9 +54,9 @@ static void sub_8098400(u8 taskId) sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) + if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -76,61 +76,61 @@ bool8 sub_809847C(void) } } -void LockSelectedEventObject(void) +void LockSelectedObjectEvent(void) { u8 taskId; - FreezeEventObjectsExceptOne(gSelectedEventObject); + FreezeObjectEventsExceptOne(gSelectedObjectEvent); taskId = CreateTask(sub_8098400, 80); - if (!gEventObjects[gSelectedEventObject].singleMovementActive) + if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); gTasks[taskId].data[1] = 1; } } -void ScriptUnfreezeEventObjects(void) +void ScriptUnfreezeObjectEvents(void) { - u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); } void sub_8098524(void) { u8 playerObjectId; - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); } void Script_FacePlayer(void) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } void Script_ClearHeldMovement(void) { - EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); } static void sub_80985BC(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 eventObjectId = task->data[2]; + u8 objectEventId = task->data[2]; if (!task->data[0] && walkrun_is_standing_still() == TRUE) { sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive) + if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive) { - FreezeEventObject(&gEventObjects[eventObjectId]); + FreezeObjectEvent(&gObjectEvents[objectEventId]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -140,34 +140,34 @@ static void sub_80985BC(u8 taskId) void sub_8098630(void) { u8 trainerObjectId1, trainerObjectId2, taskId; - trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0); + trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0); if(gNoOfApproachingTrainers == 2) { - trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1); + trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1); sub_8098074(trainerObjectId1, trainerObjectId2); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gEventObjects[trainerObjectId1].singleMovementActive) + if(!gObjectEvents[trainerObjectId1].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId1]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); gTasks[taskId].data[1] = 1; } taskId = CreateTask(sub_80985BC, 81); gTasks[taskId].data[2] = trainerObjectId2; - if(!gEventObjects[trainerObjectId2].singleMovementActive) + if(!gObjectEvents[trainerObjectId2].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId2]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId2]); gTasks[taskId].data[1] = 1; } } else { - FreezeEventObjectsExceptOne(trainerObjectId1); + FreezeObjectEventsExceptOne(trainerObjectId1); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gEventObjects[trainerObjectId1].singleMovementActive) + if(!gObjectEvents[trainerObjectId1].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId1]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); gTasks[taskId].data[1] = 1; } } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index f84a7bedb..a3cd676b1 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -22,7 +22,7 @@ #include "trainer_see.h" #include "trainer_hill.h" #include "util.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/items.h" @@ -31,104 +31,104 @@ // this file was known as evobjmv.c in Game Freak's original source #define movement_type_def(setup, table) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ - return table[sprite->data[1]](eventObject, sprite);\ + return table[sprite->data[1]](objectEvent, sprite);\ } #define movement_type_empty_callback(setup) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ return 0;\ } EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; -EWRAM_DATA struct LockedAnimEventObjects *gLockedAnimEventObjects = {0}; +EWRAM_DATA struct LockedAnimObjectEvents *gLockedAnimObjectEvents = {0}; static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); -static bool8 EventObjectExecSingleMovementAction(struct EventObject *, struct Sprite *); +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *); static void SetMovementDelay(struct Sprite *, s16); static bool8 WaitForMovementDelay(struct Sprite *); -static u8 GetCollisionInDirection(struct EventObject *, u8); +static u8 GetCollisionInDirection(struct ObjectEvent *, u8); static u32 state_to_direction(u8, u32, u32); -static void TryEnableEventObjectAnim(struct EventObject *, struct Sprite *); -static void EventObjectExecHeldMovementAction(struct EventObject *, struct Sprite *); -static void UpdateEventObjectSpriteAnimPause(struct EventObject *, struct Sprite *); -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *, s16, s16); -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8); -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *, s16, s16); -static void sub_8096530(struct EventObject *, struct Sprite *); -static void UpdateEventObjSpriteVisibility(struct EventObject *, struct Sprite *); -static void EventObjectUpdateMetatileBehaviors(struct EventObject*); -static void GetGroundEffectFlags_Reflection(struct EventObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject*, u32*); -static void GetGroundEffectFlags_SandHeap(struct EventObject*, u32*); -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject*, u32*); -static void GetGroundEffectFlags_ShortGrass(struct EventObject*, u32*); -static void GetGroundEffectFlags_HotSprings(struct EventObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject*, u32*); -static void GetGroundEffectFlags_Tracks(struct EventObject*, u32*); -static void GetGroundEffectFlags_Puddle(struct EventObject*, u32*); -static void GetGroundEffectFlags_Ripple(struct EventObject*, u32*); -static void GetGroundEffectFlags_Seaweed(struct EventObject*, u32*); -static void GetGroundEffectFlags_JumpLanding(struct EventObject*, u32*); -static u8 EventObjectCheckForReflectiveSurface(struct EventObject*); +static void TryEnableObjectEventAnim(struct ObjectEvent *, struct Sprite *); +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *, struct Sprite *); +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *, struct Sprite *); +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *, s16, s16); +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *, s16, s16, u8); +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16); +static void sub_8096530(struct ObjectEvent *, struct Sprite *); +static void UpdateObjEventSpriteVisibility(struct ObjectEvent *, struct Sprite *); +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32*); +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); -static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*); -static void DoTracksGroundEffect_None(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8); -static void DoRippleFieldEffect(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*); +static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); +static void DoTracksGroundEffect_None(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8); +static void DoRippleFieldEffect(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*); static void sub_8097D68(struct Sprite*); static void ApplyLevitateMovement(u8); -static bool8 MovementType_Disguise_Callback(struct EventObject *, struct Sprite *); -static bool8 MovementType_Hidden_Callback(struct EventObject *, struct Sprite *); +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *); +static bool8 MovementType_Hidden_Callback(struct ObjectEvent *, struct Sprite *); static void CreateReflectionEffectSprites(void); -static u8 GetEventObjectIdByLocalId(u8); -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); -static void SetEventObjectDynamicGraphicsId(struct EventObject *); -static void RemoveEventObjectInternal(struct EventObject *); -static u16 GetEventObjectFlagIdByEventObjectId(u8); -static void UpdateEventObjectVisibility(struct EventObject *, struct Sprite *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); -static void GetEventObjectMovingCameraOffset(s16 *, s16 *); -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); -static void LoadEventObjectPalette(u16); -static void RemoveEventObjectIfOutsideView(struct EventObject *); +static u8 GetObjectEventIdByLocalId(u8); +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); +static bool8 GetAvailableObjectEventId(u16, u8, u8, u8 *); +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *); +static void RemoveObjectEventInternal(struct ObjectEvent *); +static u16 GetObjectEventFlagIdByObjectEventId(u8); +static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *); +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); +static void GetObjectEventMovingCameraOffset(s16 *, s16 *); +static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); +static void LoadObjectEventPalette(u16); +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); static void sub_808E1B8(u8, s16, s16); -static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); -static void sub_808E38C(struct EventObject *); +static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); +static void sub_808E38C(struct ObjectEvent *); static u8 sub_808E8F4(const struct SpritePalette *); -static u8 FindEventObjectPaletteIndexByTag(u16); +static u8 FindObjectEventPaletteIndexByTag(u16); static void sub_808EAB0(u16, u8); -static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *, u8); static void ObjectCB_CameraObject(struct Sprite *); static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count); -static void ClearEventObjectMovement(struct EventObject *, struct Sprite *); -static void EventObjectSetSingleMovement(struct EventObject *, struct Sprite *, u8); +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count); +static void ClearObjectEventMovement(struct ObjectEvent *, struct Sprite *); +static void ObjectEventSetSingleMovement(struct ObjectEvent *, struct Sprite *, u8); static void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/field_event_obj/event_object_graphics.h" +#include "data/object_event/event_object_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -396,262 +396,262 @@ const u8 gInitialMovementTypeFacingDirections[] = { [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_EAST, }; -#define EVENT_OBJ_PAL_TAG_0 0x1103 -#define EVENT_OBJ_PAL_TAG_1 0x1104 -#define EVENT_OBJ_PAL_TAG_2 0x1105 -#define EVENT_OBJ_PAL_TAG_3 0x1106 -#define EVENT_OBJ_PAL_TAG_4 0x1107 -#define EVENT_OBJ_PAL_TAG_5 0x1108 -#define EVENT_OBJ_PAL_TAG_6 0x1109 -#define EVENT_OBJ_PAL_TAG_7 0x110A -#define EVENT_OBJ_PAL_TAG_8 0x1100 -#define EVENT_OBJ_PAL_TAG_9 0x1101 -#define EVENT_OBJ_PAL_TAG_10 0x1102 -#define EVENT_OBJ_PAL_TAG_11 0x1115 -#define EVENT_OBJ_PAL_TAG_12 0x110B -#define EVENT_OBJ_PAL_TAG_13 0x110C -#define EVENT_OBJ_PAL_TAG_14 0x110D -#define EVENT_OBJ_PAL_TAG_15 0x110E -#define EVENT_OBJ_PAL_TAG_16 0x110F -#define EVENT_OBJ_PAL_TAG_17 0x1110 -#define EVENT_OBJ_PAL_TAG_18 0x1111 -#define EVENT_OBJ_PAL_TAG_19 0x1112 -#define EVENT_OBJ_PAL_TAG_20 0x1113 -#define EVENT_OBJ_PAL_TAG_21 0x1114 -#define EVENT_OBJ_PAL_TAG_22 0x1116 -#define EVENT_OBJ_PAL_TAG_23 0x1117 -#define EVENT_OBJ_PAL_TAG_24 0x1118 -#define EVENT_OBJ_PAL_TAG_25 0x1119 -#define EVENT_OBJ_PAL_TAG_26 0x111B -#define EVENT_OBJ_PAL_TAG_27 0x111C -#define EVENT_OBJ_PAL_TAG_28 0x111D -#define EVENT_OBJ_PAL_TAG_29 0x111E -#define EVENT_OBJ_PAL_TAG_30 0x111F -#define EVENT_OBJ_PAL_TAG_31 0x1120 -#define EVENT_OBJ_PAL_TAG_32 0x1121 -#define EVENT_OBJ_PAL_TAG_33 0x1122 -#define EVENT_OBJ_PAL_TAG_34 0x1123 -#define EVENT_OBJ_PAL_TAG_NONE 0x11FF - -#include "data/field_event_obj/event_object_graphics_info_pointers.h" -#include "data/field_event_obj/field_effect_object_template_pointers.h" -#include "data/field_event_obj/event_object_pic_tables.h" -#include "data/field_event_obj/event_object_anims.h" -#include "data/field_event_obj/base_oam.h" -#include "data/field_event_obj/event_object_subsprites.h" -#include "data/field_event_obj/event_object_graphics_info.h" - -const struct SpritePalette sEventObjectSpritePalettes[] = { - {gEventObjectPalette0, EVENT_OBJ_PAL_TAG_0}, - {gEventObjectPalette1, EVENT_OBJ_PAL_TAG_1}, - {gEventObjectPalette2, EVENT_OBJ_PAL_TAG_2}, - {gEventObjectPalette3, EVENT_OBJ_PAL_TAG_3}, - {gEventObjectPalette4, EVENT_OBJ_PAL_TAG_4}, - {gEventObjectPalette5, EVENT_OBJ_PAL_TAG_5}, - {gEventObjectPalette6, EVENT_OBJ_PAL_TAG_6}, - {gEventObjectPalette7, EVENT_OBJ_PAL_TAG_7}, - {gEventObjectPalette8, EVENT_OBJ_PAL_TAG_8}, - {gEventObjectPalette9, EVENT_OBJ_PAL_TAG_9}, - {gEventObjectPalette10, EVENT_OBJ_PAL_TAG_10}, - {gEventObjectPalette11, EVENT_OBJ_PAL_TAG_11}, - {gEventObjectPalette12, EVENT_OBJ_PAL_TAG_12}, - {gEventObjectPalette13, EVENT_OBJ_PAL_TAG_13}, - {gEventObjectPalette14, EVENT_OBJ_PAL_TAG_14}, - {gEventObjectPalette15, EVENT_OBJ_PAL_TAG_15}, - {gEventObjectPalette16, EVENT_OBJ_PAL_TAG_16}, - {gEventObjectPalette17, EVENT_OBJ_PAL_TAG_17}, - {gEventObjectPalette18, EVENT_OBJ_PAL_TAG_18}, - {gEventObjectPalette19, EVENT_OBJ_PAL_TAG_19}, - {gEventObjectPalette20, EVENT_OBJ_PAL_TAG_20}, - {gEventObjectPalette21, EVENT_OBJ_PAL_TAG_21}, - {gEventObjectPalette22, EVENT_OBJ_PAL_TAG_22}, - {gEventObjectPalette23, EVENT_OBJ_PAL_TAG_23}, - {gEventObjectPalette24, EVENT_OBJ_PAL_TAG_24}, - {gEventObjectPalette25, EVENT_OBJ_PAL_TAG_25}, - {gEventObjectPalette26, EVENT_OBJ_PAL_TAG_26}, - {gEventObjectPalette27, EVENT_OBJ_PAL_TAG_27}, - {gEventObjectPalette28, EVENT_OBJ_PAL_TAG_28}, - {gEventObjectPalette29, EVENT_OBJ_PAL_TAG_29}, - {gEventObjectPalette30, EVENT_OBJ_PAL_TAG_30}, - {gEventObjectPalette31, EVENT_OBJ_PAL_TAG_31}, - {gEventObjectPalette32, EVENT_OBJ_PAL_TAG_32}, - {gEventObjectPalette33, EVENT_OBJ_PAL_TAG_33}, - {gEventObjectPalette34, EVENT_OBJ_PAL_TAG_34}, +#define OBJ_EVENT_PAL_TAG_0 0x1103 +#define OBJ_EVENT_PAL_TAG_1 0x1104 +#define OBJ_EVENT_PAL_TAG_2 0x1105 +#define OBJ_EVENT_PAL_TAG_3 0x1106 +#define OBJ_EVENT_PAL_TAG_4 0x1107 +#define OBJ_EVENT_PAL_TAG_5 0x1108 +#define OBJ_EVENT_PAL_TAG_6 0x1109 +#define OBJ_EVENT_PAL_TAG_7 0x110A +#define OBJ_EVENT_PAL_TAG_8 0x1100 +#define OBJ_EVENT_PAL_TAG_9 0x1101 +#define OBJ_EVENT_PAL_TAG_10 0x1102 +#define OBJ_EVENT_PAL_TAG_11 0x1115 +#define OBJ_EVENT_PAL_TAG_12 0x110B +#define OBJ_EVENT_PAL_TAG_13 0x110C +#define OBJ_EVENT_PAL_TAG_14 0x110D +#define OBJ_EVENT_PAL_TAG_15 0x110E +#define OBJ_EVENT_PAL_TAG_16 0x110F +#define OBJ_EVENT_PAL_TAG_17 0x1110 +#define OBJ_EVENT_PAL_TAG_18 0x1111 +#define OBJ_EVENT_PAL_TAG_19 0x1112 +#define OBJ_EVENT_PAL_TAG_20 0x1113 +#define OBJ_EVENT_PAL_TAG_21 0x1114 +#define OBJ_EVENT_PAL_TAG_22 0x1116 +#define OBJ_EVENT_PAL_TAG_23 0x1117 +#define OBJ_EVENT_PAL_TAG_24 0x1118 +#define OBJ_EVENT_PAL_TAG_25 0x1119 +#define OBJ_EVENT_PAL_TAG_26 0x111B +#define OBJ_EVENT_PAL_TAG_27 0x111C +#define OBJ_EVENT_PAL_TAG_28 0x111D +#define OBJ_EVENT_PAL_TAG_29 0x111E +#define OBJ_EVENT_PAL_TAG_30 0x111F +#define OBJ_EVENT_PAL_TAG_31 0x1120 +#define OBJ_EVENT_PAL_TAG_32 0x1121 +#define OBJ_EVENT_PAL_TAG_33 0x1122 +#define OBJ_EVENT_PAL_TAG_34 0x1123 +#define OBJ_EVENT_PAL_TAG_NONE 0x11FF + +#include "data/object_event/event_object_graphics_info_pointers.h" +#include "data/object_event/field_effect_object_template_pointers.h" +#include "data/object_event/event_object_pic_tables.h" +#include "data/object_event/event_object_anims.h" +#include "data/object_event/base_oam.h" +#include "data/object_event/event_object_subsprites.h" +#include "data/object_event/event_object_graphics_info.h" + +const struct SpritePalette sObjectEventSpritePalettes[] = { + {gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0}, + {gObjectEventPalette1, OBJ_EVENT_PAL_TAG_1}, + {gObjectEventPalette2, OBJ_EVENT_PAL_TAG_2}, + {gObjectEventPalette3, OBJ_EVENT_PAL_TAG_3}, + {gObjectEventPalette4, OBJ_EVENT_PAL_TAG_4}, + {gObjectEventPalette5, OBJ_EVENT_PAL_TAG_5}, + {gObjectEventPalette6, OBJ_EVENT_PAL_TAG_6}, + {gObjectEventPalette7, OBJ_EVENT_PAL_TAG_7}, + {gObjectEventPalette8, OBJ_EVENT_PAL_TAG_8}, + {gObjectEventPalette9, OBJ_EVENT_PAL_TAG_9}, + {gObjectEventPalette10, OBJ_EVENT_PAL_TAG_10}, + {gObjectEventPalette11, OBJ_EVENT_PAL_TAG_11}, + {gObjectEventPalette12, OBJ_EVENT_PAL_TAG_12}, + {gObjectEventPalette13, OBJ_EVENT_PAL_TAG_13}, + {gObjectEventPalette14, OBJ_EVENT_PAL_TAG_14}, + {gObjectEventPalette15, OBJ_EVENT_PAL_TAG_15}, + {gObjectEventPalette16, OBJ_EVENT_PAL_TAG_16}, + {gObjectEventPalette17, OBJ_EVENT_PAL_TAG_17}, + {gObjectEventPalette18, OBJ_EVENT_PAL_TAG_18}, + {gObjectEventPalette19, OBJ_EVENT_PAL_TAG_19}, + {gObjectEventPalette20, OBJ_EVENT_PAL_TAG_20}, + {gObjectEventPalette21, OBJ_EVENT_PAL_TAG_21}, + {gObjectEventPalette22, OBJ_EVENT_PAL_TAG_22}, + {gObjectEventPalette23, OBJ_EVENT_PAL_TAG_23}, + {gObjectEventPalette24, OBJ_EVENT_PAL_TAG_24}, + {gObjectEventPalette25, OBJ_EVENT_PAL_TAG_25}, + {gObjectEventPalette26, OBJ_EVENT_PAL_TAG_26}, + {gObjectEventPalette27, OBJ_EVENT_PAL_TAG_27}, + {gObjectEventPalette28, OBJ_EVENT_PAL_TAG_28}, + {gObjectEventPalette29, OBJ_EVENT_PAL_TAG_29}, + {gObjectEventPalette30, OBJ_EVENT_PAL_TAG_30}, + {gObjectEventPalette31, OBJ_EVENT_PAL_TAG_31}, + {gObjectEventPalette32, OBJ_EVENT_PAL_TAG_32}, + {gObjectEventPalette33, OBJ_EVENT_PAL_TAG_33}, + {gObjectEventPalette34, OBJ_EVENT_PAL_TAG_34}, {NULL, 0x0000}, }; const u16 gPlayerReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_9, }; const u16 Unknown_0850BCF0[] = { - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, - EVENT_OBJ_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, + OBJ_EVENT_PAL_TAG_18, }; const u16 gPlayerUnderwaterReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, - EVENT_OBJ_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, + OBJ_EVENT_PAL_TAG_11, }; const struct PairedPalettes gPlayerReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, Unknown_0850BCF0}, - {EVENT_OBJ_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, Unknown_0850BCF0}, + {OBJ_EVENT_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gQuintyPlumpReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, - EVENT_OBJ_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, + OBJ_EVENT_PAL_TAG_13, }; const u16 gTruckReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, - EVENT_OBJ_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, + OBJ_EVENT_PAL_TAG_14, }; const u16 gVigorothMoverReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, - EVENT_OBJ_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, + OBJ_EVENT_PAL_TAG_15, }; const u16 gMovingBoxReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, - EVENT_OBJ_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, + OBJ_EVENT_PAL_TAG_19, }; const u16 gCableCarReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, - EVENT_OBJ_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, + OBJ_EVENT_PAL_TAG_20, }; const u16 gSSTidalReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, - EVENT_OBJ_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, + OBJ_EVENT_PAL_TAG_21, }; const u16 gSubmarineShadowReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, - EVENT_OBJ_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, + OBJ_EVENT_PAL_TAG_26, }; const u16 Unknown_0850BD58[] = { // Kyogre2? - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, - EVENT_OBJ_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, + OBJ_EVENT_PAL_TAG_23, }; const u16 Unknown_0850BD60[] = { // Groudon2? - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, - EVENT_OBJ_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, + OBJ_EVENT_PAL_TAG_25, }; const u16 Unknown_0850BD68[] = { // Invisible Keckleon? - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_6, }; const u16 gRedLeafReflectionPaletteTags[] = { - EVENT_OBJ_PAL_TAG_28, - EVENT_OBJ_PAL_TAG_28, - EVENT_OBJ_PAL_TAG_28, - EVENT_OBJ_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, + OBJ_EVENT_PAL_TAG_28, }; const struct PairedPalettes gSpecialObjectReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, Unknown_0850BCF0}, - {EVENT_OBJ_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_14, gTruckReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_15, gVigorothMoverReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_20, gCableCarReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_21, gSSTidalReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_22, Unknown_0850BD58}, - {EVENT_OBJ_PAL_TAG_24, Unknown_0850BD60}, - {EVENT_OBJ_PAL_TAG_2, Unknown_0850BD68}, - {EVENT_OBJ_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_28, gRedLeafReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, Unknown_0850BCF0}, + {OBJ_EVENT_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_14, gTruckReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_15, gVigorothMoverReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_20, gCableCarReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_21, gSSTidalReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_22, Unknown_0850BD58}, + {OBJ_EVENT_PAL_TAG_24, Unknown_0850BD60}, + {OBJ_EVENT_PAL_TAG_2, Unknown_0850BD68}, + {OBJ_EVENT_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_28, gRedLeafReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_NONE, NULL}, }; const u16 gObjectPaletteTags0[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags1[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags2[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 gObjectPaletteTags3[] = { - EVENT_OBJ_PAL_TAG_8, - EVENT_OBJ_PAL_TAG_9, - EVENT_OBJ_PAL_TAG_0, - EVENT_OBJ_PAL_TAG_1, - EVENT_OBJ_PAL_TAG_2, - EVENT_OBJ_PAL_TAG_3, - EVENT_OBJ_PAL_TAG_4, - EVENT_OBJ_PAL_TAG_5, - EVENT_OBJ_PAL_TAG_6, - EVENT_OBJ_PAL_TAG_7, + OBJ_EVENT_PAL_TAG_8, + OBJ_EVENT_PAL_TAG_9, + OBJ_EVENT_PAL_TAG_0, + OBJ_EVENT_PAL_TAG_1, + OBJ_EVENT_PAL_TAG_2, + OBJ_EVENT_PAL_TAG_3, + OBJ_EVENT_PAL_TAG_4, + OBJ_EVENT_PAL_TAG_5, + OBJ_EVENT_PAL_TAG_6, + OBJ_EVENT_PAL_TAG_7, }; const u16 *const gObjectPaletteTagSets[] = { @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/field_event_obj/berry_tree_graphics_tables.h" -#include "data/field_event_obj/field_effect_objects.h" +#include "data/object_event/berry_tree_graphics_tables.h" +#include "data/object_event/field_effect_objects.h" const s16 gMovementDelaysMedium[] = {32, 64, 96, 128}; const s16 gMovementDelaysLong[] = {32, 64, 128, 192}; const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; -#include "data/field_event_obj/movement_type_func_tables.h" +#include "data/object_event/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,31 +1089,31 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/field_event_obj/movement_action_func_tables.h" +#include "data/object_event/movement_action_func_tables.h" // Code -static void ClearEventObject(struct EventObject *eventObject) +static void ClearObjectEvent(struct ObjectEvent *objectEvent) { - *eventObject = (struct EventObject){}; - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + *objectEvent = (struct ObjectEvent){}; + objectEvent->localId = 0xFF; + objectEvent->mapNum = 0xFF; + objectEvent->mapGroup = 0xFF; + objectEvent->movementActionId = 0xFF; } -static void ClearAllEventObjects(void) +static void ClearAllObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - ClearEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + ClearObjectEvent(&gObjectEvents[i]); } -void ResetEventObjects(void) +void ResetObjectEvents(void) { - ClearLinkPlayerEventObjects(); - ClearAllEventObjects(); + ClearLinkPlayerObjectEvents(); + ClearAllObjectEvents(); ClearPlayerAvatarInfo(); CreateReflectionEffectSprites(); } @@ -1133,235 +1133,235 @@ static void CreateReflectionEffectSprites(void) gSprites[spriteId].invisible = TRUE; } -u8 GetFirstInactiveEventObjectId(void) +u8 GetFirstInactiveObjectEventId(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; } return i; } -u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) +u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { - if (localId < EVENT_OBJ_ID_PLAYER) + if (localId < OBJ_EVENT_ID_PLAYER) { - return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); + return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } - return GetEventObjectIdByLocalId(localId); + return GetObjectEventIdByLocalId(localId); } -bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *eventObjectId) +bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *objectEventId) { - *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroupId); - if (*eventObjectId == EVENT_OBJECTS_COUNT) + *objectEventId = GetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroupId); + if (*objectEventId == OBJECT_EVENTS_COUNT) return TRUE; else return FALSE; } -u8 GetEventObjectIdByXY(s16 x, s16 y) +u8 GetObjectEventIdByXY(s16 x, s16 y) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) + if (gObjectEvents[i].active && gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) break; } return i; } -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroupId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroupId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static u8 GetEventObjectIdByLocalId(u8 localId) +static u8 GetObjectEventIdByLocalId(u8 localId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) +static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapNum, u8 mapGroup) { - struct EventObject *eventObject; - u8 eventObjectId; + struct ObjectEvent *objectEvent; + u8 objectEventId; s16 x; s16 y; - if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId)) - return EVENT_OBJECTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - ClearEventObject(eventObject); + if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) + return OBJECT_EVENTS_COUNT; + objectEvent = &gObjectEvents[objectEventId]; + ClearObjectEvent(objectEvent); x = template->x + 7; y = template->y + 7; - eventObject->active = TRUE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->graphicsId = template->graphicsId; - eventObject->movementType = template->movementType; - eventObject->localId = template->localId; - eventObject->mapNum = mapNum; - eventObject++; eventObject--; - eventObject->mapGroup = mapGroup; - eventObject->initialCoords.x = x; - eventObject->initialCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentElevation = template->elevation; - eventObject->previousElevation = template->elevation; - eventObject->range.as_nybbles.x = template->movementRangeX; - eventObject->range.as_nybbles.y = template->movementRangeY; - eventObject->trainerType = template->trainerType; - eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; - eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - SetEventObjectDirection(eventObject, eventObject->previousMovementDirection); - SetEventObjectDynamicGraphicsId(eventObject); + objectEvent->active = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->graphicsId = template->graphicsId; + objectEvent->movementType = template->movementType; + objectEvent->localId = template->localId; + objectEvent->mapNum = mapNum; + objectEvent++; objectEvent--; + objectEvent->mapGroup = mapGroup; + objectEvent->initialCoords.x = x; + objectEvent->initialCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentElevation = template->elevation; + objectEvent->previousElevation = template->elevation; + objectEvent->range.as_nybbles.x = template->movementRangeX; + objectEvent->range.as_nybbles.y = template->movementRangeY; + objectEvent->trainerType = template->trainerType; + objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; + SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); + SetObjectEventDynamicGraphicsId(objectEvent); #ifndef NONMATCHING asm("":::"r5", "r6"); #endif - if (gRangedMovementTypes[eventObject->movementType]) + if (gRangedMovementTypes[objectEvent->movementType]) { - if (eventObject->range.as_nybbles.x == 0) + if (objectEvent->range.as_nybbles.x == 0) { - eventObject->range.as_nybbles.x++; + objectEvent->range.as_nybbles.x++; } - if (eventObject->range.as_nybbles.y == 0) + if (objectEvent->range.as_nybbles.y == 0) { - eventObject->range.as_nybbles.y++; + objectEvent->range.as_nybbles.y++; } } - return eventObjectId; + return objectEventId; } -u8 Unref_TryInitLocalEventObject(u8 localId) +u8 Unref_TryInitLocalObjectEvent(u8 localId) { u8 i; - u8 eventObjectCount; - struct EventObjectTemplate *template; + u8 objectEventCount; + struct ObjectEventTemplate *template; if (gMapHeader.events != NULL) { if (InBattlePyramid()) { - eventObjectCount = GetNumBattlePyramidEventObjects(); + objectEventCount = GetNumBattlePyramidObjectEvents(); } else if (InTrainerHill()) { - eventObjectCount = 2; + objectEventCount = 2; } else { - eventObjectCount = gMapHeader.events->eventObjectCount; + objectEventCount = gMapHeader.events->objectEventCount; } - for (i = 0; i < eventObjectCount; i++) + for (i = 0; i < objectEventCount; i++) { - template = &gSaveBlock1Ptr->eventObjectTemplates[i]; + template = &gSaveBlock1Ptr->objectEventTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) { - return InitEventObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + return InitObjectEventStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) // Looks for an empty slot. // Returns FALSE and the location of the available slot -// in *eventObjectId. +// in *objectEventId. // If no slots are available, or if the object is already // loaded, returns TRUE. { u8 i = 0; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; - if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; } - if (i >= EVENT_OBJECTS_COUNT) + if (i >= OBJECT_EVENTS_COUNT) return TRUE; - *eventObjectId = i; + *objectEventId = i; do { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; i++; - } while (i < EVENT_OBJECTS_COUNT); + } while (i < OBJECT_EVENTS_COUNT); return FALSE; } -static void RemoveEventObject(struct EventObject *eventObject) +static void RemoveObjectEvent(struct ObjectEvent *objectEvent) { - eventObject->active = FALSE; - RemoveEventObjectInternal(eventObject); + objectEvent->active = FALSE; + RemoveObjectEventInternal(objectEvent); } -void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId)); - RemoveEventObject(&gEventObjects[eventObjectId]); + FlagSet(GetObjectEventFlagIdByObjectEventId(objectEventId)); + RemoveObjectEvent(&gObjectEvents[objectEventId]); } } -static void RemoveEventObjectInternal(struct EventObject *eventObject) +static void RemoveObjectEventInternal(struct ObjectEvent *objectEvent) { struct SpriteFrameImage image; - image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size; - gSprites[eventObject->spriteId].images = ℑ - DestroySprite(&gSprites[eventObject->spriteId]); + image.size = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->size; + gSprites[objectEvent->spriteId].images = ℑ + DestroySprite(&gSprites[objectEvent->spriteId]); } -void RemoveAllEventObjectsExceptPlayer(void) +void RemoveAllObjectEventsExceptPlayer(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (i != gPlayerAvatar.eventObjectId) - RemoveEventObject(&gEventObjects[i]); + if (i != gPlayerAvatar.objectEventId) + RemoveObjectEvent(&gObjectEvents[i]); } } -static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { u8 spriteId; u8 paletteSlot; - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - struct EventObject *eventObject; - const struct EventObjectGraphicsInfo *graphicsInfo; + struct ObjectEvent *objectEvent; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); - if (eventObjectId == EVENT_OBJECTS_COUNT) - return EVENT_OBJECTS_COUNT; + objectEventId = InitObjectEventStateFromTemplate(objectEventTemplate, mapNum, mapGroup); + if (objectEventId == OBJECT_EVENTS_COUNT) + return OBJECT_EVENTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent = &gObjectEvents[objectEventId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1377,104 +1377,104 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE) - eventObject->invisible = TRUE; + if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) + objectEvent->invisible = TRUE; *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { - gEventObjects[eventObjectId].active = FALSE; - return EVENT_OBJECTS_COUNT; + gObjectEvents[objectEventId].active = FALSE; + return OBJECT_EVENTS_COUNT; } sprite = &gSprites[spriteId]; - sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(objectEvent->currentCoords.x + cameraX, objectEvent->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - eventObject->inanimate = graphicsInfo->inanimate; - if (!eventObject->inanimate) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + objectEvent->inanimate = graphicsInfo->inanimate; + if (!objectEvent->inanimate) + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); - UpdateEventObjectVisibility(eventObject, sprite); - return eventObjectId; + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); + UpdateObjectEventVisibility(objectEvent, sprite); + return objectEventId; } -static u8 TrySpawnEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySpawnObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { - u8 eventObjectId; + u8 objectEventId; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; const struct SubspriteTable *subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId); - MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(objectEventTemplate->graphicsId); + MakeObjectTemplateFromObjectEventTemplate(objectEventTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; - eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); - if (eventObjectId == EVENT_OBJECTS_COUNT) - return EVENT_OBJECTS_COUNT; + objectEventId = TrySetupObjectEventSprite(objectEventTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); + if (objectEventId == OBJECT_EVENTS_COUNT) + return OBJECT_EVENTS_COUNT; - gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images; + gSprites[gObjectEvents[objectEventId].spriteId].images = graphicsInfo->images; if (subspriteTables) - SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables); + SetSubspriteTables(&gSprites[gObjectEvents[objectEventId].spriteId], subspriteTables); - return eventObjectId; + return objectEventId; } -u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *objectEventTemplate) { s16 cameraX; s16 cameraY; - GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return TrySpawnEventObjectTemplate(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + GetObjectEventMovingCameraOffset(&cameraX, &cameraY); + return TrySpawnObjectEventTemplate(objectEventTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } -u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) +u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) { - struct EventObjectTemplate eventObjectTemplate; + struct ObjectEventTemplate objectEventTemplate; x -= 7; y -= 7; - eventObjectTemplate.localId = localId; - eventObjectTemplate.graphicsId = graphicsId; - eventObjectTemplate.unk2 = 0; - eventObjectTemplate.x = x; - eventObjectTemplate.y = y; - eventObjectTemplate.elevation = z; - eventObjectTemplate.movementType = movementBehavior; - eventObjectTemplate.movementRangeX = 0; - eventObjectTemplate.movementRangeY = 0; - eventObjectTemplate.trainerType = 0; - eventObjectTemplate.trainerRange_berryTreeId = 0; - return SpawnSpecialEventObject(&eventObjectTemplate); -} - -u8 TrySpawnEventObject(u8 localId, u8 mapNum, u8 mapGroup) -{ - struct EventObjectTemplate *eventObjectTemplate; + objectEventTemplate.localId = localId; + objectEventTemplate.graphicsId = graphicsId; + objectEventTemplate.unk2 = 0; + objectEventTemplate.x = x; + objectEventTemplate.y = y; + objectEventTemplate.elevation = z; + objectEventTemplate.movementType = movementBehavior; + objectEventTemplate.movementRangeX = 0; + objectEventTemplate.movementRangeY = 0; + objectEventTemplate.trainerType = 0; + objectEventTemplate.trainerRange_berryTreeId = 0; + return SpawnSpecialObjectEvent(&objectEventTemplate); +} + +u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup) +{ + struct ObjectEventTemplate *objectEventTemplate; s16 cameraX, cameraY; - eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (!eventObjectTemplate) - return EVENT_OBJECTS_COUNT; + objectEventTemplate = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (!objectEventTemplate) + return OBJECT_EVENTS_COUNT; - GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return TrySpawnEventObjectTemplate(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY); + GetObjectEventMovingCameraOffset(&cameraX, &cameraY); + return TrySpawnObjectEventTemplate(objectEventTemplate, mapNum, mapGroup, cameraX, cameraY); } -static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); spriteTemplate->tileTag = graphicsInfo->tileTag; spriteTemplate->paletteTag = graphicsInfo->paletteTag1; @@ -1486,17 +1486,17 @@ static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void ( *subspriteTables = graphicsInfo->subspriteTables; } -static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], spriteTemplate, subspriteTables); } -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjectTemplate->graphicsId, eventObjectTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEventTemplate->graphicsId, objectEventTemplate->movementType, spriteTemplate, subspriteTables); } -u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) +u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) { struct SpriteTemplate *spriteTemplate; const struct SubspriteTable *subspriteTables; @@ -1504,10 +1504,10 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x u8 spriteId; spriteTemplate = malloc(sizeof(struct SpriteTemplate)); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); if (spriteTemplate->paletteTag != 0xFFFF) { - LoadEventObjectPalette(spriteTemplate->paletteTag); + LoadObjectEventPalette(spriteTemplate->paletteTag); } spriteId = CreateSprite(spriteTemplate, x, y, subpriority); free(spriteTemplate); @@ -1527,10 +1527,10 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) struct Sprite *sprite; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, UpdateObjectEventSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; x += 7; y += 7; @@ -1570,7 +1570,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) return spriteId; } -void TrySpawnEventObjects(s16 cameraX, s16 cameraY) +void TrySpawnObjectEvents(s16 cameraX, s16 cameraY) { u8 i; u8 objectCount; @@ -1584,7 +1584,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) if (InBattlePyramid()) { - objectCount = GetNumBattlePyramidEventObjects(); + objectCount = GetNumBattlePyramidObjectEvents(); } else if (InTrainerHill()) { @@ -1592,58 +1592,58 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) } else { - objectCount = gMapHeader.events->eventObjectCount; + objectCount = gMapHeader.events->objectEventCount; } for (i = 0; i < objectCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1Ptr->eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1Ptr->objectEventTemplates[i]; s16 npcX = template->x + 7; s16 npcY = template->y + 7; if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - TrySpawnEventObjectTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + TrySpawnObjectEventTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } } } -void RemoveEventObjectsOutsideView(void) +void RemoveObjectEventsOutsideView(void) { u8 i, j; bool8 isActiveLinkPlayer; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j++) + for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerObjectEvents); j++) { - if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId) + if (gLinkPlayerObjectEvents[j].active && i == gLinkPlayerObjectEvents[j].objEventId) isActiveLinkPlayer = TRUE; } if (!isActiveLinkPlayer) { - struct EventObject *eventObject = &gEventObjects[i]; + struct ObjectEvent *objectEvent = &gObjectEvents[i]; - if (eventObject->active && !eventObject->isPlayer) - RemoveEventObjectIfOutsideView(eventObject); + if (objectEvent->active && !objectEvent->isPlayer) + RemoveObjectEventIfOutsideView(objectEvent); } } } -static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject) +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent) { s16 left = gSaveBlock1Ptr->pos.x - 2; s16 right = gSaveBlock1Ptr->pos.x + 17; s16 top = gSaveBlock1Ptr->pos.y; s16 bottom = gSaveBlock1Ptr->pos.y + 16; - if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right - && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom) + if (objectEvent->currentCoords.x >= left && objectEvent->currentCoords.x <= right + && objectEvent->currentCoords.y >= top && objectEvent->currentCoords.y <= bottom) return; - if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right - && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom) + if (objectEvent->initialCoords.x >= left && objectEvent->initialCoords.x <= right + && objectEvent->initialCoords.y >= top && objectEvent->initialCoords.y <= bottom) return; - RemoveEventObject(eventObject); + RemoveObjectEvent(objectEvent); } void sub_808E16C(s16 x, s16 y) @@ -1651,9 +1651,9 @@ void sub_808E16C(s16 x, s16 y) u8 i; ClearPlayerAvatarInfo(); - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { sub_808E1B8(i, x, y); } @@ -1661,32 +1661,32 @@ void sub_808E16C(s16 x, s16 y) CreateReflectionEffectSprites(); } -static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) +static void sub_808E1B8(u8 objectEventId, s16 x, s16 y) { u8 spriteId; u8 paletteSlot; struct Sprite *sprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; #define i spriteId - for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i++) + for (i = 0; i < ARRAY_COUNT(gLinkPlayerObjectEvents); i++) { - if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) + if (gLinkPlayerObjectEvents[i].active && objectEventId == gLinkPlayerObjectEvents[i].objEventId) { return; } } #undef i - eventObject = &gEventObjects[eventObjectId]; + objectEvent = &gObjectEvents[objectEventId]; subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEvent->graphicsId, objectEvent->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; paletteSlot = graphicsInfo->paletteSlot; @@ -1708,16 +1708,16 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8092FF0(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; - if (eventObject->movementType == MOVEMENT_TYPE_PLAYER) + if (objectEvent->movementType == MOVEMENT_TYPE_PLAYER) { - SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId); - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); + SetPlayerAvatarObjectEventIdAndObjectId(objectEventId, spriteId); + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); } if (subspriteTables != NULL) { @@ -1725,46 +1725,46 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) } sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - if (!eventObject->inanimate && eventObject->movementType != MOVEMENT_TYPE_PLAYER) + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + if (!objectEvent->inanimate && objectEvent->movementType != MOVEMENT_TYPE_PLAYER) { - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); } - sub_808E38C(eventObject); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); + sub_808E38C(objectEvent); + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); } } -static void sub_808E38C(struct EventObject *eventObject) +static void sub_808E38C(struct ObjectEvent *objectEvent) { - eventObject->singleMovementActive = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->hasShadow = FALSE; - eventObject->hasReflection = FALSE; - eventObject->inShortGrass = FALSE; - eventObject->inShallowFlowingWater = FALSE; - eventObject->inSandPile = FALSE; - eventObject->inHotSprings = FALSE; - EventObjectClearHeldMovement(eventObject); + objectEvent->singleMovementActive = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->hasShadow = FALSE; + objectEvent->hasReflection = FALSE; + objectEvent->inShortGrass = FALSE; + objectEvent->inShallowFlowingWater = FALSE; + objectEvent->inSandPile = FALSE; + objectEvent->inHotSprings = FALSE; + ObjectEventClearHeldMovement(objectEvent); } -static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId) +static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteId) { - gPlayerAvatar.eventObjectId = eventObjectId; + gPlayerAvatar.objectEventId = objectEventId; gPlayerAvatar.spriteId = spriteId; - gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId); - SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20); + gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gObjectEvents[objectEventId].graphicsId); + SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, 0x20); } -void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) +void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *sprite; u8 paletteSlot; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - sprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + sprite = &gSprites[objectEvent->spriteId]; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1785,172 +1785,172 @@ void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = paletteSlot; - eventObject->inanimate = graphicsInfo->inanimate; - eventObject->graphicsId = graphicsId; - SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + objectEvent->inanimate = graphicsInfo->inanimate; + objectEvent->graphicsId = graphicsId; + SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (eventObject->trackedByCamera) + if (objectEvent->trackedByCamera) { CameraObjectReset1(); } } -void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) +void ObjectEventSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId); + ObjectEventSetGraphicsId(&gObjectEvents[objectEventId], graphicsId); } } -void EventObjectTurn(struct EventObject *eventObject, u8 direction) +void ObjectEventTurn(struct ObjectEvent *objectEvent, u8 direction) { - SetEventObjectDirection(eventObject, direction); - if (!eventObject->inanimate) + SetObjectEventDirection(objectEvent, direction); + if (!objectEvent->inanimate) { - StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection)); - SeekSpriteAnim(&gSprites[eventObject->spriteId], 0); + StartSpriteAnim(&gSprites[objectEvent->spriteId], GetFaceDirectionAnimNum(objectEvent->facingDirection)); + SeekSpriteAnim(&gSprites[objectEvent->spriteId], 0); } } -void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) +void ObjectEventTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectTurn(&gEventObjects[eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[objectEventId], direction); } } void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) { - EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[playerAvatar->objectEventId], direction); } -static void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) +static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; u8 berryId; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage != 0) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; - berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; + berryId = GetBerryTypeByBerryTreeId(objectEvent->trainerRange_berryTreeId) - 1; berryStage--; if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX)) berryId = 0; - EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]); + ObjectEventSetGraphicsId(objectEvent, gBerryTreeObjectEventGraphicsIdTablePointers[berryId][berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; StartSpriteAnim(sprite, berryStage); } } -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { u8 bard; if (graphicsId >= SPRITE_VAR) { - graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR); + graphicsId = VarGetObjectEventGraphicsId(graphicsId - SPRITE_VAR); } - if (graphicsId == EVENT_OBJ_GFX_BARD) + if (graphicsId == OBJ_EVENT_GFX_BARD) { bard = GetCurrentMauvilleOldMan(); return gMauvilleOldManGraphicsInfoPointers[bard]; } if (graphicsId >= NUM_OBJECT_GRAPHICS_INFO) { - graphicsId = EVENT_OBJ_GFX_NINJA_BOY; + graphicsId = OBJ_EVENT_GFX_NINJA_BOY; } - return gEventObjectGraphicsInfoPointers[graphicsId]; + return gObjectEventGraphicsInfoPointers[graphicsId]; } -static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) { - if (eventObject->graphicsId >= SPRITE_VAR) + if (objectEvent->graphicsId >= SPRITE_VAR) { - eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - SPRITE_VAR); + objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - SPRITE_VAR); } } void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gEventObjects[eventObjectId].invisible = state; + gObjectEvents[objectEventId].invisible = state; } } -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup) +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup) { - *(u8*)(localId) = eventObject->localId; - *(u8*)(mapNum) = eventObject->mapNum; - *(u8*)(mapGroup) = eventObject->mapGroup; + *(u8*)(localId) = objectEvent->localId; + *(u8*)(mapNum) = objectEvent->mapNum; + *(u8*)(mapGroup) = objectEvent->mapGroup; } void sub_808E75C(s16 x, s16 y) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - eventObjectId = GetEventObjectIdByXY(x, y); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByXY(x, y); + if (objectEventId != OBJECT_EVENTS_COUNT) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->fixedPriority = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->fixedPriority = TRUE; sprite->subpriority = subpriority; } } void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->fixedPriority = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->fixedPriority = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos2.x = x; sprite->pos2.y = y; } @@ -1962,23 +1962,23 @@ void FreeAndReserveObjectSpritePalettes(void) gReservedSpritePaletteCount = 12; } -static void LoadEventObjectPalette(u16 paletteTag) +static void LoadObjectEventPalette(u16 paletteTag) { - u16 i = FindEventObjectPaletteIndexByTag(paletteTag); + u16 i = FindObjectEventPaletteIndexByTag(paletteTag); - if (i != EVENT_OBJ_PAL_TAG_NONE) // always true + if (i != OBJ_EVENT_PAL_TAG_NONE) // always true { - sub_808E8F4(&sEventObjectSpritePalettes[i]); + sub_808E8F4(&sObjectEventSpritePalettes[i]); } } -void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) +void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) { u8 i; - for (i = 0; paletteTags[i] != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; paletteTags[i] != OBJ_EVENT_PAL_TAG_NONE; i++) { - LoadEventObjectPalette(paletteTags[i]); + LoadObjectEventPalette(paletteTags[i]); } } @@ -1993,9 +1993,9 @@ static u8 sub_808E8F4(const struct SpritePalette *spritePalette) void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) { - u8 paletteIndex = FindEventObjectPaletteIndexByTag(paletteTag); + u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag); - LoadPalette(sEventObjectSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); + LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); } void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) @@ -2008,13 +2008,13 @@ void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) } } -static u8 FindEventObjectPaletteIndexByTag(u16 tag) +static u8 FindObjectEventPaletteIndexByTag(u16 tag) { u8 i; - for (i = 0; sEventObjectSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; sObjectEventSpritePalettes[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { - if (sEventObjectSpritePalettes[i].tag == tag) + if (sObjectEventSpritePalettes[i].tag == tag) { return i; } @@ -2027,7 +2027,7 @@ void LoadPlayerObjectReflectionPalette(u16 tag, u8 slot) u8 i; PatchObjectPalette(tag, slot); - for (i = 0; gPlayerReflectionPaletteSets[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gPlayerReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gPlayerReflectionPaletteSets[i].tag == tag) { @@ -2043,7 +2043,7 @@ void LoadSpecialObjectReflectionPalette(u16 tag, u8 slot) sCurrentSpecialObjectPaletteTag = tag; PatchObjectPalette(tag, slot); - for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].tag == tag) { @@ -2058,65 +2058,65 @@ static void sub_808EAB0(u16 tag, u8 slot) PatchObjectPalette(tag, slot); } -void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y) +void unref_sub_808EAC4(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x += x; - eventObject->currentCoords.y += y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x += x; + objectEvent->currentCoords.y += y; } -void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +void ShiftObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +static void SetObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -void MoveEventObjectToMapCoords(struct EventObject *eventObject, s16 x, s16 y) +void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - sprite = &gSprites[eventObject->spriteId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - SetEventObjectCoords(eventObject, x, y); - SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sprite = &gSprites[objectEvent->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + SetObjectEventCoords(objectEvent, x, y); + SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - sub_808E38C(eventObject); - if (eventObject->trackedByCamera) + sub_808E38C(objectEvent); + if (objectEvent->trackedByCamera) CameraObjectReset1(); } -void TryMoveEventObjectToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) +void TryMoveObjectEventToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { x += 7; y += 7; - MoveEventObjectToMapCoords(&gEventObjects[eventObjectId], x, y); + MoveObjectEventToMapCoords(&gObjectEvents[objectEventId], x, y); } } -void ShiftStillEventObjectCoords(struct EventObject *eventObject) +void ShiftStillObjectEventCoords(struct ObjectEvent *objectEvent) { - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); } -void UpdateEventObjectCoordsForCameraUpdate(void) +void UpdateObjectEventCoordsForCameraUpdate(void) { u8 i; s16 dx; @@ -2126,52 +2126,52 @@ void UpdateEventObjectCoordsForCameraUpdate(void) { dx = gCamera.x; dy = gCamera.y; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - gEventObjects[i].initialCoords.x -= dx; - gEventObjects[i].initialCoords.y -= dy; - gEventObjects[i].currentCoords.x -= dx; - gEventObjects[i].currentCoords.y -= dy; - gEventObjects[i].previousCoords.x -= dx; - gEventObjects[i].previousCoords.y -= dy; + gObjectEvents[i].initialCoords.x -= dx; + gObjectEvents[i].initialCoords.y -= dy; + gObjectEvents[i].currentCoords.x -= dx; + gObjectEvents[i].currentCoords.y -= dy; + gObjectEvents[i].previousCoords.x -= dx; + gObjectEvents[i].previousCoords.y -= dy; } } } } -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - if (gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y && EventObjectDoesZCoordMatch(&gEventObjects[i], z)) + if (gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y && ObjectEventDoesZCoordMatch(&gObjectEvents[i], z)) { return i; } } } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z) +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *objectEvent, u8 z) { - if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z) + if (objectEvent->currentElevation != 0 && z != 0 && objectEvent->currentElevation != z) { return FALSE; } return TRUE; } -void UpdateEventObjectsForCameraUpdate(s16 x, s16 y) +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y) { - UpdateEventObjectCoordsForCameraUpdate(); - TrySpawnEventObjects(x, y); - RemoveEventObjectsOutsideView(); + UpdateObjectEventCoordsForCameraUpdate(); + TrySpawnObjectEvents(x, y); + RemoveObjectEventsOutsideView(); } u8 AddCameraObject(u8 linkedSpriteId) @@ -2310,91 +2310,91 @@ u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) +void SetObjectEventDirection(struct ObjectEvent *objectEvent, u8 direction) { s8 d2; - eventObject->previousMovementDirection = eventObject->facingDirection; - if (!eventObject->facingDirectionLocked) + objectEvent->previousMovementDirection = objectEvent->facingDirection; + if (!objectEvent->facingDirectionLocked) { d2 = direction; - eventObject->facingDirection = d2; + objectEvent->facingDirection = d2; } - eventObject->movementDirection = direction; + objectEvent->movementDirection = direction; } -static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const u8 *GetObjectEventScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; } -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId) { - return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventScriptPointerByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } -static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static u16 GetObjectEventFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) +static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId) { - return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventFlagIdByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { return 0xFF; } - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } -u8 sub_808F0BC(u8 eventObjectId) +u8 sub_808F0BC(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { return 0xFF; } - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -u8 EventObjectGetBerryTreeId(u8 eventObjectId) +u8 ObjectEventGetBerryTreeId(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *templates; + struct ObjectEventTemplate *templates; const struct MapHeader *mapHeader; u8 count; if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup) { - templates = gSaveBlock1Ptr->eventObjectTemplates; - count = gMapHeader.events->eventObjectCount; + templates = gSaveBlock1Ptr->objectEventTemplates; + count = gMapHeader.events->objectEventCount; } else { mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - templates = mapHeader->events->eventObjects; - count = mapHeader->events->eventObjectCount; + templates = mapHeader->events->objectEvents; + count = mapHeader->events->objectEventCount; } - return FindEventObjectTemplateByLocalId(localId, templates, count); + return FindObjectEventTemplateByLocalId(localId, templates, count); } -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count) { u8 i; @@ -2408,84 +2408,84 @@ static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, return NULL; } -struct EventObjectTemplate *GetBaseTemplateForEventObject(const struct EventObject *eventObject) +struct ObjectEventTemplate *GetBaseTemplateForObjectEvent(const struct ObjectEvent *objectEvent) { int i; - if (eventObject->mapNum != gSaveBlock1Ptr->location.mapNum || eventObject->mapGroup != gSaveBlock1Ptr->location.mapGroup) + if (objectEvent->mapNum != gSaveBlock1Ptr->location.mapNum || objectEvent->mapGroup != gSaveBlock1Ptr->location.mapGroup) { return NULL; } - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { - if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId) + if (objectEvent->localId == gSaveBlock1Ptr->objectEventTemplates[i].localId) { - return &gSaveBlock1Ptr->eventObjectTemplates[i]; + return &gSaveBlock1Ptr->objectEventTemplates[i]; } } return NULL; } -void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject) +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate != NULL) + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate != NULL) { - eventObjectTemplate->x = eventObject->currentCoords.x - 7; - eventObjectTemplate->y = eventObject->currentCoords.y - 7; + objectEventTemplate->x = objectEvent->currentCoords.x - 7; + objectEventTemplate->y = objectEvent->currentCoords.y - 7; } } -static void OverrideEventObjectTemplateScript(const struct EventObject *eventObject, const u8 *script) +static void OverrideObjectEventTemplateScript(const struct ObjectEvent *objectEvent, const u8 *script) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate) - eventObjectTemplate->script = script; + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate) + objectEventTemplate->script = script; } -void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType) +void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate != NULL) + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate != NULL) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; } } -void TryOverrideEventObjectTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup) +void TryOverrideObjectEventTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) - OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]); + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + OverrideTemplateCoordsForObjectEvent(&gObjectEvents[objectEventId]); } void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorationCategory) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { switch (decorationCategory) { case DECORCAT_DOLL: - OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_DollInteract); + OverrideObjectEventTemplateScript(&gObjectEvents[objectEventId], SecretBase_EventScript_DollInteract); break; case DECORCAT_CUSHION: - OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_CushionInteract); + OverrideObjectEventTemplateScript(&gObjectEvents[objectEventId], SecretBase_EventScript_CushionInteract); break; } } } -void InitEventObjectPalettes(u8 palSlot) +void InitObjectEventPalettes(u8 palSlot) { FreeAndReserveObjectSpritePalettes(); - sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; + sCurrentSpecialObjectPaletteTag = OBJ_EVENT_PAL_TAG_NONE; sCurrentReflectionType = palSlot; if (palSlot == 1) { @@ -2506,36 +2506,36 @@ u16 GetObjectPaletteTag(u8 palSlot) { return gObjectPaletteTagSets[sCurrentReflectionType][palSlot]; } - for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].tag == sCurrentSpecialObjectPaletteTag) { return gSpecialObjectReflectionPaletteSets[i].data[sCurrentReflectionType]; } } - return EVENT_OBJ_PAL_TAG_NONE; + return OBJ_EVENT_PAL_TAG_NONE; } movement_type_empty_callback(MovementType_None) movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround) -bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -2544,7 +2544,7 @@ bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sp return TRUE; } -bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2554,40 +2554,40 @@ bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; u8 chosenDirection; memcpy(directions, gStandardDirections, sizeof directions); chosenDirection = directions[Random() & 3]; - SetEventObjectDirection(eventObject, chosenDirection); + SetObjectEventDirection(objectEvent, chosenDirection); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, chosenDirection)) + if (GetCollisionInDirection(objectEvent, chosenDirection)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) +bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent) { s16 playerX; s16 playerY; @@ -2602,17 +2602,17 @@ bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) { return FALSE; } - if (eventObject->trainerType != 1 && eventObject->trainerType != 3) + if (objectEvent->trainerType != 1 && objectEvent->trainerType != 3) { return FALSE; } PlayerGetDestCoords(&playerX, &playerY); - objX = eventObject->currentCoords.x; - objY = eventObject->currentCoords.y; - minX = objX - eventObject->trainerRange_berryTreeId; - minY = objY - eventObject->trainerRange_berryTreeId; - maxX = objX + eventObject->trainerRange_berryTreeId; - maxY = objY + eventObject->trainerRange_berryTreeId; + objX = objectEvent->currentCoords.x; + objY = objectEvent->currentCoords.y; + minX = objX - objectEvent->trainerRange_berryTreeId; + minY = objY - objectEvent->trainerRange_berryTreeId; + maxX = objX + objectEvent->trainerRange_berryTreeId; + maxY = objY + objectEvent->trainerRange_berryTreeId; if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY) { return FALSE; @@ -2811,18 +2811,18 @@ u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementType) +u8 TryGetTrainerEncounterDirection(struct ObjectEvent *objectEvent, u8 movementType) { s16 dx, dy; s16 absdx, absdy; - if (!EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (!ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { return 0; } PlayerGetDestCoords(&dx, &dy); - dx -= eventObject->currentCoords.x; - dy -= eventObject->currentCoords.y; + dx -= objectEvent->currentCoords.x; + dy -= objectEvent->currentCoords.y; absdx = dx; absdy = dy; if (absdx < 0) @@ -2838,34 +2838,34 @@ u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementT movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround) -bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -2873,39 +2873,39 @@ bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Spri return FALSE; } -bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gStandardDirections, sizeof directions); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == DIR_NONE) direction = directions[Random() & 3]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown) -bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -2914,7 +2914,7 @@ bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct return TRUE; } -bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2924,33 +2924,33 @@ bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction)) + if (GetCollisionInDirection(objectEvent, direction)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -2958,23 +2958,23 @@ bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight) -bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -2983,7 +2983,7 @@ bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, str return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (WaitForMovementDelay(sprite)) { @@ -2993,33 +2993,33 @@ bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction)) + if (GetCollisionInDirection(objectEvent, direction)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3027,17 +3027,17 @@ bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, str movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection) -bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -3045,44 +3045,44 @@ bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } -static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite); -extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *eventObject, struct Sprite *sprite); +static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite); +extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *objectEvent, struct Sprite *sprite); void MovementType_BerryTreeGrowth(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; + objectEvent = &gObjectEvents[sprite->data[0]]; if (!(sprite->data[7] & 1)) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[7] |= 1; } - UpdateEventObjectCurrentMovement(eventObject, sprite, EventObjectCB2_BerryTree); + UpdateObjectEventCurrentMovement(objectEvent, sprite, ObjectEventCB2_BerryTree); } -static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; - ClearEventObjectMovement(eventObject, sprite); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage == 0) { if (!(sprite->data[7] & 4) && sprite->animNum == 4) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -3090,7 +3090,7 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct } return FALSE; } - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; berryStage --; if (sprite->animNum != berryStage) @@ -3098,15 +3098,15 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct sprite->data[1] = 2; return TRUE; } - get_berry_tree_graphics(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + get_berry_tree_graphics(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 0; return TRUE; @@ -3114,28 +3114,28 @@ bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 2; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = (sprite->data[2] & 0x02) >> 1; + objectEvent->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[1] = 4; sprite->data[2] = 0; return TRUE; @@ -3143,10 +3143,10 @@ bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = (sprite->data[2] & 0x02) >> 1; + objectEvent->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -3159,34 +3159,34 @@ bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp) -bool8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3194,51 +3194,51 @@ bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight) -bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3246,51 +3246,51 @@ bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_EAST_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft) -bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3298,51 +3298,51 @@ bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight) -bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3350,51 +3350,51 @@ bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_EAST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft) -bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3402,51 +3402,51 @@ bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight) -bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3454,51 +3454,51 @@ bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft) -bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3506,51 +3506,51 @@ bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight) -bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3558,51 +3558,51 @@ bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpRightAndLeft, gMovementTypeFuncs_FaceUpLeftAndRight) -bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3610,51 +3610,51 @@ bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownRightAndLeft, gMovementTypeFuncs_FaceDownLeftAndRight) -bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3662,34 +3662,34 @@ bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, s return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise) -bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3697,43 +3697,43 @@ bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise) -bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3741,132 +3741,132 @@ bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth) -bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; - direction = gInitialMovementTypeFacingDirections[eventObject->movementType]; - if (eventObject->directionSequenceIndex) + direction = gInitialMovementTypeFacingDirections[objectEvent->movementType]; + if (objectEvent->directionSequenceIndex) { direction = GetOppositeDirection(direction); } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool8 collision; u8 movementActionId; - if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + objectEvent->directionSequenceIndex = 0; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); } - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); if (collision == COLLISION_OUTSIDE_RANGE) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collision) - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route) +bool8 MoveNextDirectionInSequence(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 *route) { u8 collision; u8 movementActionId; - if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) - eventObject->directionSequenceIndex = 0; + if (objectEvent->directionSequenceIndex == 3 && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) + objectEvent->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + SetObjectEventDirection(objectEvent, route[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); if (collision == COLLISION_OUTSIDE_RANGE) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, route[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collision) - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3874,579 +3874,579 @@ bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sp movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown) -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpRightLeftDownDirections)]; memcpy(directions, gUpRightLeftDownDirections, sizeof(gUpRightLeftDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp) -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightLeftDownUpDirections)]; memcpy(directions, gRightLeftDownUpDirections, sizeof(gRightLeftDownUpDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft) -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownUpRightLeftDirections)]; memcpy(directions, gDownUpRightLeftDirections, sizeof(gDownUpRightLeftDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight) -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftDownUpRightDirections)]; memcpy(directions, gLeftDownUpRightDirections, sizeof(gLeftDownUpRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown) -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpLeftRightDownDirections)]; memcpy(directions, gUpLeftRightDownDirections, sizeof(gUpLeftRightDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp) -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftRightDownUpDirections)]; memcpy(directions, gLeftRightDownUpDirections, sizeof(gLeftRightDownUpDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight) -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gStandardDirections)]; memcpy(directions, gStandardDirections, sizeof(gStandardDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft) -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightDownUpLeftDirections)]; memcpy(directions, gRightDownUpLeftDirections, sizeof(gRightDownUpLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight) -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftUpDownRightDirections)]; memcpy(directions, gLeftUpDownRightDirections, sizeof(gLeftUpDownRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft) -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpDownRightLeftDirections)]; memcpy(directions, gUpDownRightLeftDirections, sizeof(gUpDownRightLeftDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown) -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightLeftUpDownDirections)]; memcpy(directions, gRightLeftUpDownDirections, sizeof(gRightLeftUpDownDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp) -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownRightLeftUpDirections)]; memcpy(directions, gDownRightLeftUpDirections, sizeof(gDownRightLeftUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft) -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightUpDownLeftDirections)]; memcpy(directions, gRightUpDownLeftDirections, sizeof(gRightUpDownLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight) -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpDownLeftRightDirections)]; memcpy(directions, gUpDownLeftRightDirections, sizeof(gUpDownLeftRightDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown) -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftRightUpDownDirections)]; memcpy(directions, gLeftRightUpDownDirections, sizeof(gLeftRightUpDownDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp) -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownLeftRightUpDirections)]; memcpy(directions, gDownLeftRightUpDirections, sizeof(gDownLeftRightUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight) -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpLeftDownRightDirections)]; memcpy(directions, gUpLeftDownRightDirections, sizeof(gUpLeftDownRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft) -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownRightUpLeftDirections)]; memcpy(directions, gDownRightUpLeftDirections, sizeof(gDownRightUpLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp) -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftDownRightUpDirections)]; memcpy(directions, gLeftDownRightUpDirections, sizeof(gLeftDownRightUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown) -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightUpLeftDownDirections)]; memcpy(directions, gRightUpLeftDownDirections, sizeof(gRightUpLeftDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft) -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpRightDownLeftDirections)]; memcpy(directions, gUpRightDownLeftDirections, sizeof(gUpRightDownLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight) -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownLeftUpRightDirections)]; memcpy(directions, gDownLeftUpRightDirections, sizeof(gDownLeftUpRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown) -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftUpRightDownDirections)]; memcpy(directions, gLeftUpRightDownDirections, sizeof(gLeftUpRightDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp) -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightDownLeftUpDirections)]; memcpy(directions, gRightDownLeftUpDirections, sizeof(gRightDownLeftUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer) -bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - if (eventObject->directionSequenceIndex == 0) + ClearObjectEventMovement(objectEvent, sprite); + if (objectEvent->directionSequenceIndex == 0) { - eventObject->directionSequenceIndex = GetPlayerFacingDirection(); + objectEvent->directionSequenceIndex = GetPlayerFacingDirection(); } sprite->data[1] = 1; return TRUE; } -bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), NULL); } -bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_None(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { return FALSE; } -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, playerDirection))); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - if (EventObjectIsFarawayIslandMew(eventObject)) + if (ObjectEventIsFarawayIslandMew(objectEvent)) { direction = GetMewMoveDirection(); if (direction == DIR_NONE) { direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); - eventObject->singleMovementActive = 1; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } } else { - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); } - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastestMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetSlideMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 cph_IM_DIFFERENT(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction)); - eventObject->singleMovementActive = TRUE; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpInPlaceMovementAction(direction)); + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoordsInDirection(direction, &x, &y, 2, 2); - EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventSetSingleMovement(objectEvent, sprite, GetJump2MovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass) -bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); } void MovementType_TreeDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } void MovementType_MountainDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } void MovementType_Hidden(struct Sprite *sprite) { if (!sprite->data[7]) { - gEventObjects[sprite->data[0]].fixedPriority = TRUE; + gObjectEvents[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY; sprite->oam.priority = 3; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Hidden_Callback); } -static bool8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Hidden_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_Hidden[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Hidden_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } -bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_MoveInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 0; } @@ -4455,57 +4455,57 @@ bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Spr movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace) -bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WalkSlowlyInPlace, gMovementTypeFuncs_WalkSlowlyInPlace) -bool8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceSlowMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceSlowMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace) -bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_JogInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace) -bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RunInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible) -bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); + objectEvent->invisible = TRUE; sprite->data[1] = 1; return TRUE; } -bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -4513,18 +4513,18 @@ bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } -static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite) +static void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - eventObject->movementActionId = 0xFF; + objectEvent->singleMovementActive = 0; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + objectEvent->movementActionId = 0xFF; sprite->data[1] = 0; } @@ -4617,11 +4617,11 @@ static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const * return NULL; } -void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void npc_apply_anim_looping(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; unk85094AC = sub_8092A4C(sprite->anims); @@ -4640,11 +4640,11 @@ void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *spri } } -void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void obj_npc_animation_step(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { u8 animPos; @@ -4681,13 +4681,13 @@ u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType) +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType) { - eventObject->movementType = movementType; - eventObject->directionSequenceIndex = 0; - eventObject->playerCopyableMovement = 0; - gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType]; - gSprites[eventObject->spriteId].data[1] = 0; + objectEvent->movementType = movementType; + objectEvent->directionSequenceIndex = 0; + objectEvent->playerCopyableMovement = 0; + gSprites[objectEvent->spriteId].callback = sMovementTypeCallbacks[movementType]; + gSprites[objectEvent->spriteId].data[1] = 0; } u8 GetTrainerFacingDirectionMovementType(u8 direction) @@ -4695,67 +4695,67 @@ u8 GetTrainerFacingDirectionMovementType(u8 direction) return gTrainerFacingDirectionMovementTypes[direction]; } -static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction) +static u8 GetCollisionInDirection(struct ObjectEvent *objectEvent, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return GetCollisionAtCoords(eventObject, x, y, direction); + return GetCollisionAtCoords(objectEvent, x, y, direction); } -u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dir) +u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir) { u8 direction = dir; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) return COLLISION_OUTSIDE_RANGE; - else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) + else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction)) return COLLISION_IMPASSABLE; - else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) + else if (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)) return COLLISION_IMPASSABLE; - else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + else if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) return COLLISION_ELEVATION_MISMATCH; - else if (DoesObjectCollideWithObjectAt(eventObject, x, y)) - return COLLISION_EVENT_OBJECT; + else if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) + return COLLISION_OBJECT_EVENT; return COLLISION_NONE; } -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { u8 flags = 0; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) flags |= 1; - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction) || (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction))) flags |= 2; - if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) flags |= 4; - if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) flags |= 8; return flags; } -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y) +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *objectEvent, s16 x, s16 y) { s16 left; s16 right; s16 top; s16 bottom; - if (eventObject->range.as_nybbles.x != 0) + if (objectEvent->range.as_nybbles.x != 0) { - left = eventObject->initialCoords.x - eventObject->range.as_nybbles.x; - right = eventObject->initialCoords.x + eventObject->range.as_nybbles.x; + left = objectEvent->initialCoords.x - objectEvent->range.as_nybbles.x; + right = objectEvent->initialCoords.x + objectEvent->range.as_nybbles.x; if (left > x || right < x) { return TRUE; } } - if (eventObject->range.as_nybbles.y != 0) + if (objectEvent->range.as_nybbles.y != 0) { - top = eventObject->initialCoords.y - eventObject->range.as_nybbles.y; - bottom = eventObject->initialCoords.y + eventObject->range.as_nybbles.y; + top = objectEvent->initialCoords.y - objectEvent->range.as_nybbles.y; + bottom = objectEvent->initialCoords.y + objectEvent->range.as_nybbles.y; if (top > y || bottom < y) { return TRUE; @@ -4764,9 +4764,9 @@ static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObj return FALSE; } -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { - if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](objectEvent->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; @@ -4774,19 +4774,19 @@ static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, return FALSE; } -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y) +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *objectEvent, s16 x, s16 y) { u8 i; - struct EventObject *curObject; + struct ObjectEvent *curObject; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - curObject = &gEventObjects[i]; - if (curObject->active && curObject != eventObject) + curObject = &gObjectEvents[i]; + if (curObject->active && curObject != objectEvent) { if ((curObject->currentCoords.x == x && curObject->currentCoords.y == y) || (curObject->previousCoords.x == x && curObject->previousCoords.y == y)) { - if (AreZCoordsCompatible(eventObject->currentElevation, curObject->currentElevation)) + if (AreZCoordsCompatible(objectEvent->currentElevation, curObject->currentElevation)) { return TRUE; } @@ -4798,10 +4798,10 @@ static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) - && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) + && gSprites[gObjectEvents[objectEventId].spriteId].data[7] & 2) { return TRUE; } @@ -4811,11 +4811,11 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 0x04; + gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 0x04; } } @@ -4881,7 +4881,7 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetObjectEventMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -4903,106 +4903,106 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) } } -void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y) +void ObjectEventMoveDestCoords(struct ObjectEvent *objectEvent, u32 direction, s16 *x, s16 *y) { u8 newDirn = direction; - *x = eventObject->currentCoords.x; - *y = eventObject->currentCoords.y; + *x = objectEvent->currentCoords.x; + *y = objectEvent->currentCoords.y; MoveCoords(newDirn, x, y); } -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent) { - if (eventObject->singleMovementActive || eventObject->heldMovementActive) + if (objectEvent->singleMovementActive || objectEvent->heldMovementActive) return TRUE; return FALSE; } -bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) + if (objectEvent->heldMovementActive && objectEvent->movementActionId != 0xFF) return TRUE; return FALSE; } -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - if (EventObjectIsMovementOverridden(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent)) return TRUE; - UnfreezeEventObject(eventObject); - eventObject->movementActionId = movementActionId; - eventObject->heldMovementActive = TRUE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[2] = 0; + UnfreezeObjectEvent(objectEvent); + objectEvent->movementActionId = movementActionId; + objectEvent->heldMovementActive = TRUE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[2] = 0; return FALSE; } -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - EventObjectClearHeldMovementIfActive(eventObject); - EventObjectSetHeldMovement(eventObject, movementActionId); + ObjectEventClearHeldMovementIfActive(objectEvent); + ObjectEventSetHeldMovement(objectEvent, movementActionId); } -void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - EventObjectClearHeldMovement(eventObject); + if (objectEvent->heldMovementActive) + ObjectEventClearHeldMovement(objectEvent); } -void EventObjectClearHeldMovement(struct EventObject *eventObject) +void ObjectEventClearHeldMovement(struct ObjectEvent *objectEvent) { - eventObject->movementActionId = 0xFF; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[1] = 0; - gSprites[eventObject->spriteId].data[2] = 0; + objectEvent->movementActionId = 0xFF; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[1] = 0; + gSprites[objectEvent->spriteId].data[2] = 0; } -u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject) +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->heldMovementFinished; + if (objectEvent->heldMovementActive) + return objectEvent->heldMovementFinished; return 16; } -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject) +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *objectEvent) { - u8 heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject); + u8 heldMovementStatus = ObjectEventCheckHeldMovementStatus(objectEvent); if (heldMovementStatus != 0 && heldMovementStatus != 16) - EventObjectClearHeldMovementIfActive(eventObject); + ObjectEventClearHeldMovementIfActive(objectEvent); return heldMovementStatus; } -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->movementActionId; + if (objectEvent->heldMovementActive) + return objectEvent->movementActionId; return 0xFF; } -void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) +void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 (*callback)(struct ObjectEvent *, struct Sprite *)) { - DoGroundEffects_OnSpawn(eventObject, sprite); - TryEnableEventObjectAnim(eventObject, sprite); - if (EventObjectIsHeldMovementActive(eventObject)) + DoGroundEffects_OnSpawn(objectEvent, sprite); + TryEnableObjectEventAnim(objectEvent, sprite); + if (ObjectEventIsHeldMovementActive(objectEvent)) { - EventObjectExecHeldMovementAction(eventObject, sprite); + ObjectEventExecHeldMovementAction(objectEvent, sprite); } - else if (!eventObject->frozen) + else if (!objectEvent->frozen) { - while (callback(eventObject, sprite)); + while (callback(objectEvent, sprite)); } - DoGroundEffects_OnBeginStep(eventObject, sprite); - DoGroundEffects_OnFinishStep(eventObject, sprite); - UpdateEventObjectSpriteAnimPause(eventObject, sprite); - UpdateEventObjectVisibility(eventObject, sprite); - EventObjectUpdateSubpriority(eventObject, sprite); + DoGroundEffects_OnBeginStep(objectEvent, sprite); + DoGroundEffects_OnFinishStep(objectEvent, sprite); + UpdateObjectEventSpriteAnimPause(objectEvent, sprite); + UpdateObjectEventVisibility(objectEvent, sprite); + ObjectEventUpdateSubpriority(objectEvent, sprite); } #define dirn_to_anim(name, table)\ @@ -5034,9 +5034,9 @@ dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActio dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions); dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions); -bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) +bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction) { - return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); + return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); } dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gAcroWheelieFaceDirectionMovementActions); @@ -5083,154 +5083,154 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; } -static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->heldMovementFinished = TRUE; + objectEvent->heldMovementFinished = TRUE; } } -static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->movementActionId = 0xFF; + objectEvent->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } return FALSE; } -static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 animId) +static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animId) { - eventObject->movementActionId = animId; + objectEvent->movementActionId = animId; sprite->data[2] = 0; } -static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + obj_npc_animation_step(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_SOUTH); + FaceDirection(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_NORTH); + FaceDirection(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_WEST); + FaceDirection(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_EAST); + FaceDirection(objectEvent, sprite, DIR_EAST); return TRUE; } -void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void npc_apply_direction(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - if (gLockedAnimEventObjects != NULL && FindLockedEventObjectIndex(eventObject) != EVENT_OBJECTS_COUNT) + if (gLockedAnimObjectEvents != NULL && FindLockedObjectEventIndex(objectEvent) != OBJECT_EVENTS_COUNT) { sprite->animPaused = TRUE; } - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void do_go_anim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { u8 (*functions[ARRAY_COUNT(gUnknown_0850DEE8)])(u8); memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8); - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + npc_apply_anim_looping(objectEvent, sprite, functions[speed](objectEvent->facingDirection)); } -void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void StartRunningAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - npc_apply_direction(eventObject, sprite, direction, 1); - npc_apply_anim_looping(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, 1); + npc_apply_anim_looping(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection)); } -bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite) +bool8 npc_obj_ministep_stop_on_arrival(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (obj_npc_ministep(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8093AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); sub_80976DC(sprite, direction); sprite->animPaused = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8093B60(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8093AF0(eventObject, sprite, direction); - npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + sub_8093AF0(objectEvent, sprite, direction); + npc_apply_anim_looping(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); } -bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 an_walk_any_2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_80976EC(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTHWEST); - return MovementAction_WalkSlowDiagonalUpLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTHWEST); + return MovementAction_WalkSlowDiagonalUpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5238,15 +5238,15 @@ bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTHEAST); - return MovementAction_WalkSlowDiagonalUpRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTHEAST); + return MovementAction_WalkSlowDiagonalUpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5254,15 +5254,15 @@ bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTHWEST); - return MovementAction_WalkSlowDiagonalDownLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTHWEST); + return MovementAction_WalkSlowDiagonalDownLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5270,15 +5270,15 @@ bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObj return FALSE; } -bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTHEAST); - return MovementAction_WalkSlowDiagonalDownRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTHEAST); + return MovementAction_WalkSlowDiagonalDownRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5286,15 +5286,15 @@ bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventOb return FALSE; } -bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); - return MovementAction_WalkSlowDown_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); + return MovementAction_WalkSlowDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5302,15 +5302,15 @@ bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTH); - return MovementAction_WalkSlowUp_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTH); + return MovementAction_WalkSlowUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5318,15 +5318,15 @@ bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_WEST); - return MovementAction_WalkSlowLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_WEST); + return MovementAction_WalkSlowLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5334,15 +5334,15 @@ bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_EAST); - return MovementAction_WalkSlowRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_EAST); + return MovementAction_WalkSlowRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5350,15 +5350,15 @@ bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTHWEST, 0); - return MovementAction_WalkNormalDiagonalUpLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTHWEST, 0); + return MovementAction_WalkNormalDiagonalUpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5366,15 +5366,15 @@ bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObj return FALSE; } -bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTHEAST, 0); - return MovementAction_WalkNormalDiagonalUpRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTHEAST, 0); + return MovementAction_WalkNormalDiagonalUpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5382,15 +5382,15 @@ bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventOb return FALSE; } -bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTHWEST, 0); - return MovementAction_WalkNormalDiagonalDownLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTHWEST, 0); + return MovementAction_WalkNormalDiagonalDownLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5398,15 +5398,15 @@ bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventO return FALSE; } -bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTHEAST, 0); - return MovementAction_WalkNormalDiagonalDownRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTHEAST, 0); + return MovementAction_WalkNormalDiagonalDownRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5414,15 +5414,15 @@ bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *event return FALSE; } -bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 0); - return MovementAction_WalkNormalDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 0); + return MovementAction_WalkNormalDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5430,15 +5430,15 @@ bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 0); - return MovementAction_WalkNormalUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 0); + return MovementAction_WalkNormalUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5446,15 +5446,15 @@ bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 0); - return MovementAction_WalkNormalLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 0); + return MovementAction_WalkNormalLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5462,15 +5462,15 @@ bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 0); - return MovementAction_WalkNormalRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 0); + return MovementAction_WalkNormalRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5478,7 +5478,7 @@ bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, stru return FALSE; } -void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) +void sub_8093FC4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)]; s16 x; @@ -5487,24 +5487,24 @@ void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 dire memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); x = 0; y = 0; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); MoveCoordsInDirection(direction, &x, &y, displacements[speed], displacements[speed]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); sub_809783C(sprite, direction, speed, a5); sprite->data[2] = 1; sprite->animPaused = 0; - eventObject->triggerGroundEffectsOnMove = 1; - eventObject->disableCoveringGroundEffects = 1; + objectEvent->triggerGroundEffectsOnMove = 1; + objectEvent->disableCoveringGroundEffects = 1; } -void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void maybe_shadow_1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); - npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); - DoShadowFieldEffect(eventObject); + sub_8093FC4(objectEvent, sprite, direction, speed, a4); + npc_apply_anim_looping(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); + DoShadowFieldEffect(objectEvent); } -u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callback(struct Sprite *)) +u8 sub_80940C4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 callback(struct Sprite *)) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)]; s16 x; @@ -5517,125 +5517,125 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba { x = 0; y = 0; - MoveCoordsInDirection(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->disableCoveringGroundEffects = TRUE; + MoveCoordsInDirection(objectEvent->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->disableCoveringGroundEffects = TRUE; } else if (result == 0xFF) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; - eventObject->landingJump = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; + objectEvent->landingJump = TRUE; sprite->animPaused = TRUE; } return result; } -u8 sub_8094188(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8094188(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_80940C4(eventObject, sprite, sub_809785C); + return sub_80940C4(objectEvent, sprite, sub_809785C); } -u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_809419C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_80940C4(eventObject, sprite, sub_80978E4); + return sub_80940C4(objectEvent, sprite, sub_80978E4); } -bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941B0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == 0xFF) + if (sub_8094188(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941C8(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == 0xFF) + if (sub_809419C(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941E0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - switch (sub_8094188(eventObject, sprite)) + switch (sub_8094188(objectEvent, sprite)) { case 255: return TRUE; case 1: - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + obj_npc_animation_step(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); default: return FALSE; } } -bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_Jump2Down_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_Jump2Down_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_Jump2Up_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_Jump2Up_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_Jump2Left_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_Jump2Left_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_Jump2Right_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_Jump2Right_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5649,7 +5649,7 @@ void sub_8094390(struct Sprite *sprite, u16 duration) sprite->data[3] = duration; } -bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5659,45 +5659,45 @@ bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite return FALSE; } -bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay1_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 1); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay2_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 2); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay4_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 4); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 8); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay16_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 16); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_WalkFastDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_WalkFastDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5705,15 +5705,15 @@ bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_WalkFastUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_WalkFastUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5721,15 +5721,15 @@ bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 1); - return MovementAction_WalkFastLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_WalkFastLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5737,15 +5737,15 @@ bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 1); - return MovementAction_WalkFastRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_WalkFastRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5754,16 +5754,16 @@ bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct } -void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +void sub_8094554(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - SetEventObjectDirection(eventObject, direction); - npc_apply_anim_looping(eventObject, sprite, animNum); + SetObjectEventDirection(objectEvent, direction); + npc_apply_anim_looping(objectEvent, sprite, animNum); sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } -bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5774,120 +5774,120 @@ bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->data[3] & 1) { sprite->animDelayCounter++; } - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 2); - return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 2); + return MovementAction_RideWaterCurrentDown_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5895,15 +5895,15 @@ bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 2); - return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 2); + return MovementAction_RideWaterCurrentUp_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5911,15 +5911,15 @@ bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, s return FALSE; } -bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 2); - return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 2); + return MovementAction_RideWaterCurrentLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5927,15 +5927,15 @@ bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 2); - return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 2); + return MovementAction_RideWaterCurrentRight_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5943,15 +5943,15 @@ bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject return FALSE; } -bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 3); - return MovementAction_WalkFastestDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 3); + return MovementAction_WalkFastestDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5959,15 +5959,15 @@ bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 3); - return MovementAction_WalkFastestUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 3); + return MovementAction_WalkFastestUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5975,15 +5975,15 @@ bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 3); - return MovementAction_WalkFastestLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 3); + return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5991,15 +5991,15 @@ bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 3); - return MovementAction_WalkFastestRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 3); + return MovementAction_WalkFastestRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6007,15 +6007,15 @@ bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, str return FALSE; } -bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 4); - return MovementAction_SlideDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 4); + return MovementAction_SlideDown_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6023,15 +6023,15 @@ bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 4); - return MovementAction_SlideUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 4); + return MovementAction_SlideUp_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6039,15 +6039,15 @@ bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 4); - return MovementAction_SlideLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 4); + return MovementAction_SlideLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6055,15 +6055,15 @@ bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 4); - return MovementAction_SlideRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 4); + return MovementAction_SlideRight_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6071,15 +6071,15 @@ bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_SOUTH); - return MovementAction_PlayerRunDown_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_SOUTH); + return MovementAction_PlayerRunDown_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6087,15 +6087,15 @@ bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_NORTH); - return MovementAction_PlayerRunUp_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_NORTH); + return MovementAction_PlayerRunUp_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6103,15 +6103,15 @@ bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_WEST); - return MovementAction_PlayerRunLeft_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_WEST); + return MovementAction_PlayerRunLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6119,15 +6119,15 @@ bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_EAST); - return MovementAction_PlayerRunRight_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_EAST); + return MovementAction_PlayerRunRight_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6135,20 +6135,20 @@ bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struc return FALSE; } -void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) +void StartSpriteAnimInDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum) { SetAndStartSpriteAnim(sprite, animNum, 0); - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[2] = 1; } -bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + StartSpriteAnimInDirection(objectEvent, sprite, objectEvent->movementDirection, sprite->animNum); return FALSE; } -bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6158,420 +6158,420 @@ bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Spri return FALSE; } -void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8094DE4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8093FC4(eventObject, sprite, direction, 1, 0); + sub_8093FC4(objectEvent, sprite, direction, 1, 0); StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } -bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_SOUTH); - return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_SOUTH); + return MovementAction_JumpSpecialDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_NORTH); - return MovementAction_JumpSpecialUp_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_NORTH); + return MovementAction_JumpSpecialUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_WEST); - return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_WEST); + return MovementAction_JumpSpecialLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_EAST); - return MovementAction_JumpSpecialRight_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_EAST); + return MovementAction_JumpSpecialRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)); + FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y))); + FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = TRUE; + objectEvent->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = FALSE; + objectEvent->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2); - return MovementAction_JumpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 1, 2); + return MovementAction_JumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2); - return MovementAction_JumpUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 1, 2); + return MovementAction_JumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2); - return MovementAction_JumpLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 1, 2); + return MovementAction_JumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2); - return MovementAction_JumpRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 1, 2); + return MovementAction_JumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0); - return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 0); + return MovementAction_JumpInPlaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0); - return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 0); + return MovementAction_JumpInPlaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0); - return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 0); + return MovementAction_JumpInPlaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0); - return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 0); + return MovementAction_JumpInPlaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2); - return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 2); + return MovementAction_JumpInPlaceDownUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2); - return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 2); + return MovementAction_JumpInPlaceUpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2); - return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 2); + return MovementAction_JumpInPlaceLeftRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2); - return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 2); + return MovementAction_JumpInPlaceRightLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); + FaceDirection(objectEvent, sprite, gInitialMovementTypeFacingDirections[objectEvent->movementType]); return TRUE; } -bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, 0x14); return FALSE; } -bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = FALSE; + objectEvent->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = TRUE; + objectEvent->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = TRUE; + objectEvent->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetInvisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetVisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_QUESTION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN) + if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN) { - sub_80B4578(eventObject); + sub_80B4578(objectEvent); return FALSE; } - if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) + if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) { sprite->data[2] = 2; return TRUE; } - sub_8155D78(eventObject); + sub_8155D78(objectEvent); sprite->data[2] = 1; - return MovementAction_RevealTrainer_Step1(eventObject, sprite); + return MovementAction_RevealTrainer_Step1(objectEvent, sprite); } -bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8155DA0(eventObject)) + if (sub_8155DA0(objectEvent)) { sprite->data[2] = 2; return TRUE; @@ -6579,14 +6579,14 @@ bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6596,25 +6596,25 @@ bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; + objectEvent->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetAndStartSpriteAnim(sprite, 1, 0); sprite->data[2] = 1; return FALSE; } -bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6624,32 +6624,32 @@ bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_CutTree_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible ^= TRUE; + objectEvent->invisible ^= TRUE; if (WaitForMovementDelay(sprite)) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 3; } return FALSE; } -bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->fixedPriority = TRUE; + objectEvent->fixedPriority = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->fixedPriority = FALSE; + objectEvent->fixedPriority = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; InitSpriteAffineAnim(sprite); @@ -6658,7 +6658,7 @@ bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struc return TRUE; } -bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { FreeOamMatrix(sprite->oam.matrixNum); sprite->oam.affineMode = ST_OAM_AFFINE_OFF; @@ -6666,29 +6666,29 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru return TRUE; } -bool8 MovementAction_HideReflection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_HideReflection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->hideReflection = TRUE; + objectEvent->hideReflection = TRUE; return TRUE; } -bool8 MovementAction_ShowReflection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ShowReflection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->hideReflection = FALSE; + objectEvent->hideReflection = FALSE; return TRUE; } -bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = FALSE; StartSpriteAffineAnimIfDifferent(sprite, 0); - return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownStartAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6697,17 +6697,17 @@ bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 1); - return MovementAction_WalkDownAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6716,17 +6716,17 @@ bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkLeftAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkLeftAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 1); + do_go_anim(objectEvent, sprite, DIR_WEST, 1); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 2); - return MovementAction_WalkLeftAffine_Step1(eventObject, sprite); + return MovementAction_WalkLeftAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkLeftAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6735,17 +6735,17 @@ bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkRightAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkRightAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 1); + do_go_anim(objectEvent, sprite, DIR_EAST, 1); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 3); - return MovementAction_WalkRightAffine_Step1(eventObject, sprite); + return MovementAction_WalkRightAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkRightAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6754,139 +6754,139 @@ bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, stru return FALSE; } -static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void sub_80958C0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - obj_npc_animation_step(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + obj_npc_animation_step(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_SOUTH); + sub_80958C0(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_NORTH); + sub_80958C0(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_WEST); + sub_80958C0(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_EAST); + sub_80958C0(objectEvent, sprite, DIR_EAST); return TRUE; } -bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); return FALSE; } -void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite) +void sub_8095AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8097750(sprite); sprite->animPaused = FALSE; } -bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8095B0C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_8097758(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_Figure8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095AF0(eventObject, sprite); + sub_8095AF0(objectEvent, sprite); sprite->data[2] = 1; - return MovementAction_Figure8_Step1(eventObject, sprite); + return MovementAction_Figure8_Step1(objectEvent, sprite); } -bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8095B0C(eventObject, sprite)) + if (sub_8095B0C(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6894,257 +6894,257 @@ bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void sub_8095B84(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); + sub_8093FC4(objectEvent, sprite, direction, speed, a4); StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); - DoShadowFieldEffect(eventObject); + DoShadowFieldEffect(objectEvent); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 0, 1); - return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 0, 1); + return MovementAction_AcroWheelieHopFaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 0, 1); - return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 0, 1); + return MovementAction_AcroWheelieHopFaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 0, 1); - return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 0, 1); + return MovementAction_AcroWheelieHopFaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 0, 1); - return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 0, 1); + return MovementAction_AcroWheelieHopFaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 1, 1); - return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 1, 1); + return MovementAction_AcroWheelieHopDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 1, 1); - return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 1, 1); + return MovementAction_AcroWheelieHopUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 1, 1); - return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 1, 1); + return MovementAction_AcroWheelieHopLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 1, 1); - return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 1, 1); + return MovementAction_AcroWheelieHopRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_AcroWheelieJumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_AcroWheelieJumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_AcroWheelieJumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_AcroWheelieJumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_80960C8(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroPopWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7152,15 +7152,15 @@ bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroPopWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7168,15 +7168,15 @@ bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroPopWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7184,15 +7184,15 @@ bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroPopWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7200,21 +7200,21 @@ bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096200(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + npc_apply_anim_looping(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection)); } -bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7222,15 +7222,15 @@ bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7238,15 +7238,15 @@ bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, st return FALSE; } -bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7254,15 +7254,15 @@ bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7270,22 +7270,22 @@ bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, return FALSE; } -void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096330(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroEndWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7293,15 +7293,15 @@ bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroEndWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7309,15 +7309,15 @@ bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroEndWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7325,15 +7325,15 @@ bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroEndWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7341,75 +7341,75 @@ bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_Levitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Levitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - CreateLevitateMovementTask(eventObject); + CreateLevitateMovementTask(objectEvent); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_StopLevitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StopLevitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - DestroyExtraMovementTask(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(objectEvent->warpArrowSpriteId); sprite->pos2.y = 0; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->pos2.y == 0) { - DestroyExtraMovementTask(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(objectEvent->warpArrowSpriteId); sprite->data[2] = 1; return TRUE; } return FALSE; } -u8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } -bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PauseSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->animPaused = TRUE; return TRUE; } -static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->disableAnim) + if (objectEvent->disableAnim) { sprite->animPaused = TRUE; } } -static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void TryEnableObjectEventAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->enableAnim) + if (objectEvent->enableAnim) { sprite->animPaused = FALSE; - eventObject->disableAnim = FALSE; - eventObject->enableAnim = FALSE; + objectEvent->disableAnim = FALSE; + objectEvent->enableAnim = FALSE; } } -static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096530(eventObject, sprite); - UpdateEventObjSpriteVisibility(eventObject, sprite); + sub_8096530(objectEvent, sprite); + UpdateObjEventSpriteVisibility(objectEvent, sprite); } -static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_8096530(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u16 x, y; u16 x2, y2; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObject->offScreen = FALSE; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent->offScreen = FALSE; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (sprite->coordOffsetEnabled) { x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -7426,221 +7426,221 @@ static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) y2 += graphicsInfo->height; if ((s16)x >= 0x100 || (s16)x2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } if ((s16)y >= 0xB0 || (s16)y2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } } -static void UpdateEventObjSpriteVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjEventSpriteVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->invisible = FALSE; - if (eventObject->invisible || eventObject->offScreen) + if (objectEvent->invisible || objectEvent->offScreen) { sprite->invisible = TRUE; } } -static void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_LongGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_Tracks(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_LongGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_Tracks(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnFinishStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_Ripple(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); - GetGroundEffectFlags_Seaweed(eventObj, flags); - GetGroundEffectFlags_JumpLanding(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_Ripple(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); + GetGroundEffectFlags_Seaweed(objEvent, flags); + GetGroundEffectFlags_JumpLanding(objEvent, flags); } -static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *objEvent) { - eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); - eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); + objEvent->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->previousCoords.x, objEvent->previousCoords.y); + objEvent->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->currentCoords.x, objEvent->currentCoords.y); } -static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; - u8 type = EventObjectCheckForReflectiveSurface(eventObj); + u8 type = ObjectEventCheckForReflectiveSurface(objEvent); if (type) { - if (!eventObj->hasReflection) + if (!objEvent->hasReflection) { - eventObj->hasReflection = 0; - eventObj->hasReflection = 1; + objEvent->hasReflection = 0; + objEvent->hasReflection = 1; *flags |= reflectionFlags[type - 1]; } } else { - eventObj->hasReflection = 0; + objEvent->hasReflection = 0; } } -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_DEEP_SAND; } - else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior) - || MetatileBehavior_IsFootprints(eventObj->previousMetatileBehavior)) + else if (MetatileBehavior_IsSandOrDeepSand(objEvent->previousMetatileBehavior) + || MetatileBehavior_IsFootprints(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_SAND; } } -static void GetGroundEffectFlags_SandHeap(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { - if (!eventObj->inSandPile) + if (!objEvent->inSandPile) { - eventObj->inSandPile = 0; - eventObj->inSandPile = 1; + objEvent->inSandPile = 0; + objEvent->inSandPile = 1; *flags |= GROUND_EFFECT_FLAG_SAND_PILE; } } else { - eventObj->inSandPile = 0; + objEvent->inSandPile = 0; } } -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *objEvent, u32 *flags) { - if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) - || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior))) + if ((MetatileBehavior_IsShallowFlowingWater(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShallowFlowingWater(objEvent->previousMetatileBehavior)) + || (MetatileBehavior_IsPacifidlogLog(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPacifidlogLog(objEvent->previousMetatileBehavior))) { - if (!eventObj->inShallowFlowingWater) + if (!objEvent->inShallowFlowingWater) { - eventObj->inShallowFlowingWater = 0; - eventObj->inShallowFlowingWater = 1; + objEvent->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 1; *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER; } } else { - eventObj->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 0; } } -static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsPuddle(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPuddle(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_PUDDLE; } } -static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_HasRipples(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsShortGrass(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShortGrass(objEvent->previousMetatileBehavior)) { - if (!eventObj->inShortGrass) + if (!objEvent->inShortGrass) { - eventObj->inShortGrass = 0; - eventObj->inShortGrass = 1; + objEvent->inShortGrass = 0; + objEvent->inShortGrass = 1; *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS; } } else { - eventObj->inShortGrass = 0; + objEvent->inShortGrass = 0; } } -static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsHotSprings(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsHotSprings(objEvent->previousMetatileBehavior)) { - if (!eventObj->inHotSprings) + if (!objEvent->inHotSprings) { - eventObj->inHotSprings = 0; - eventObj->inHotSprings = 1; + objEvent->inHotSprings = 0; + objEvent->inHotSprings = 1; *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS; } } else { - eventObj->inHotSprings = 0; + objEvent->inHotSprings = 0; } } -static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsSeaweed(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -7662,13 +7662,13 @@ static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 * GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND, }; - if (eventObj->landingJump && !eventObj->disableJumpLandingGroundEffect) + if (objEvent->landingJump && !objEvent->disableJumpLandingGroundEffect) { u8 i; for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++) { - if (metatileFuncs[i](eventObj->currentMetatileBehavior)) + if (metatileFuncs[i](objEvent->currentMetatileBehavior)) { *flags |= jumpLandingFlags[i]; return; @@ -7677,9 +7677,9 @@ static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 * } } -static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *objEvent) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); // ceil div by tile width? s16 width = (info->width + 8) >> 4; @@ -7698,14 +7698,14 @@ static u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj) for (i = 0, one = 1; i < height; i++) { - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x, objEvent->previousCoords.y + one + i) for (j = 1; j < width; j++) { - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x + j, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x - j, eventObj->currentCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x + j, eventObj->previousCoords.y + one + i) - RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x - j, eventObj->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x + j, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x - j, objEvent->currentCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x + j, objEvent->previousCoords.y + one + i) + RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x - j, objEvent->previousCoords.y + one + i) } } return 0; @@ -7749,20 +7749,20 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) return 0; } -static void SetEventObjectSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +static void SetObjectEventSpriteOamTableForLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) return; - if (!MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (!MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) return; - if (!MetatileBehavior_IsLongGrass(eventObj->previousMetatileBehavior)) + if (!MetatileBehavior_IsLongGrass(objEvent->previousMetatileBehavior)) return; sprite->subspriteTableNum = 4; - if (ZCoordToPriority(eventObj->previousElevation) == 1) + if (ZCoordToPriority(objEvent->previousElevation) == 1) sprite->subspriteTableNum = 5; } @@ -7788,54 +7788,54 @@ static const u8 sUnknown_08376050[] = { 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 }; -// Each byte corresponds to a sprite priority for an event object. -// This is directly the inverse of gEventObjectPriorities_08376070. -static const u8 sEventObjectPriorities_08376060[] = { +// Each byte corresponds to a sprite priority for an object event. +// This is directly the inverse of gObjectEventPriorities_08376070. +static const u8 sObjectEventPriorities_08376060[] = { 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 }; -// Each byte corresponds to a sprite priority for an event object. -// This is the inverse of gEventObjectPriorities_08376060. +// Each byte corresponds to a sprite priority for an object event. +// This is the inverse of gObjectEventPriorities_08376060. // 1 = Above player sprite // 2 = Below player sprite -static const u8 sEventObjectPriorities_08376070[] = { +static const u8 sObjectEventPriorities_08376070[] = { 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1, }; -void UpdateEventObjectZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite) +void UpdateObjectEventZCoordAndPriority(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->fixedPriority) + if (objEvent->fixedPriority) return; - EventObjectUpdateZCoord(eventObj); + ObjectEventUpdateZCoord(objEvent); - sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation]; - sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation]; + sprite->subspriteTableNum = sObjectEventPriorities_08376070[objEvent->previousElevation]; + sprite->oam.priority = sObjectEventPriorities_08376060[objEvent->previousElevation]; } static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z) { - sprite->subspriteTableNum = sEventObjectPriorities_08376070[z]; - sprite->oam.priority = sEventObjectPriorities_08376060[z]; + sprite->subspriteTableNum = sObjectEventPriorities_08376070[z]; + sprite->oam.priority = sObjectEventPriorities_08376060[z]; } u8 ZCoordToPriority(u8 z) { - return sEventObjectPriorities_08376060[z]; + return sObjectEventPriorities_08376060[z]; } -void EventObjectUpdateZCoord(struct EventObject *eventObj) +void ObjectEventUpdateZCoord(struct ObjectEvent *objEvent) { - u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y); - u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y); + u8 z = MapGridGetZCoordAt(objEvent->currentCoords.x, objEvent->currentCoords.y); + u8 z2 = MapGridGetZCoordAt(objEvent->previousCoords.x, objEvent->previousCoords.y); if (z == 0xF || z2 == 0xF) return; - eventObj->currentElevation = z; + objEvent->currentElevation = z; if (z != 0 && z != 0xF) - eventObj->previousElevation = z; + objEvent->previousElevation = z; } void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) @@ -7848,12 +7848,12 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b) sprite->subpriority = tmp3 + sUnknown_08376050[a] + b; } -static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite) +static void ObjectEventUpdateSubpriority(struct ObjectEvent *objEvent, struct Sprite *sprite) { - if (eventObj->fixedPriority) + if (objEvent->fixedPriority) return; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); } bool8 AreZCoordsCompatible(u8 a, u8 b) @@ -7867,96 +7867,96 @@ bool8 AreZCoordsCompatible(u8 a, u8 b) return TRUE; } -void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_StepOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_StepOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = (objEvent->localId << 8) | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_WaterReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(eventObj, sprite, 0); + SetUpReflection(objEvent, sprite, 0); } -void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_IceReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(eventObj, sprite, 1); + SetUpReflection(objEvent, sprite, 1); } -void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_FlowingWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_FEET_IN_FLOWING_WATER, objEvent); } -static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = { +static void (*const sGroundEffectTracksFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) = { DoTracksGroundEffect_None, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks, }; -void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 0); } -void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_DeepSandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 1); } -static void DoTracksGroundEffect_None(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_None(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { } -static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_Footprints(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // First half-word is a Field Effect script id. (gFieldEffectScriptPointers) u16 sandFootprints_FieldEffectData[2] = { @@ -7964,15 +7964,15 @@ static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct FLDEFF_DEEP_SAND_FOOTPRINTS }; - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->facingDirection; + gFieldEffectArguments[4] = objEvent->facingDirection; FieldEffectStart(sandFootprints_FieldEffectData[a]); } -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // Specifies which bike track shape to show next. // For example, when the bike turns from up to right, it will show @@ -7987,108 +7987,108 @@ static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, st 6, 7, 3, 4, }; - if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y) + if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y) { - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = - bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5]; + bikeTireTracks_Transitions[objEvent->previousMovementDirection][objEvent->facingDirection - 5]; FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS); } } -void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Ripple(struct ObjectEvent *objEvent, struct Sprite *sprite) { - DoRippleFieldEffect(eventObj, sprite); + DoRippleFieldEffect(objEvent, sprite); } -void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnPuddle(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SPLASH, objEvent); } -void GroundEffect_SandHeap(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandHeap(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SAND_PILE, objEvent); } -void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { u8 spriteId; - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); spriteId = FindTallGrassFieldEffectSpriteId( - eventObj->localId, - eventObj->mapNum, - eventObj->mapGroup, - eventObj->currentCoords.x, - eventObj->currentCoords.y); + objEvent->localId, + objEvent->mapNum, + objEvent->mapGroup, + objEvent->currentCoords.x, + objEvent->currentCoords.y); if (spriteId == MAX_SPRITES) - GroundEffect_SpawnOnTallGrass(eventObj, sprite); + GroundEffect_SpawnOnTallGrass(objEvent, sprite); } -void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); } -void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnShallowWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); } -void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); } -void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpLandingDust(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_DUST); } -void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_ShortGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SHORT_GRASS, objEvent); } -void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_HotSprings(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_HOT_SPRINGS_WATER, objEvent); } -void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Seaweed(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; FieldEffectStart(FLDEFF_BUBBLES); } -static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = { +static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite) = { GroundEffect_SpawnOnTallGrass, GroundEffect_StepOnTallGrass, GroundEffect_SpawnOnLongGrass, @@ -8111,26 +8111,26 @@ static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct S GroundEffect_Seaweed }; -static void DoFlaggedGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags) +static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags) { u8 i; - if (EventObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj)) + if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !sub_81D4A58(objEvent)) return; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) if (flags & 1) - sGroundEffectFuncs[i](eventObj, sprite); + sGroundEffectFuncs[i](objEvent, sprite); } -void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) +void filters_out_some_ground_effects(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) { - eventObj->inShortGrass = 0; - eventObj->inSandPile = 0; - eventObj->inShallowFlowingWater = 0; - eventObj->inHotSprings = 0; + objEvent->inShortGrass = 0; + objEvent->inSandPile = 0; + objEvent->inShallowFlowingWater = 0; + objEvent->inHotSprings = 0; *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS | GROUND_EFFECT_FLAG_SHORT_GRASS | GROUND_EFFECT_FLAG_SAND_PILE @@ -8139,111 +8139,111 @@ void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) } } -void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags) +void FilterOutStepOnPuddleGroundEffectIfJumping(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->landingJump) + if (objEvent->landingJump) *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; } -static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnSpawn(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnSpawn(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnSpawn(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnBeginStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - filters_out_some_ground_effects(eventObj, &flags); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnBeginStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + filters_out_some_ground_effects(objEvent, &flags); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnFinishStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnStop) + if (objEvent->triggerGroundEffectsOnStop) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnStop = 0; - eventObj->landingJump = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnFinishStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutStepOnPuddleGroundEffectIfJumping(objEvent, &flags); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnStop = 0; + objEvent->landingJump = 0; } } -bool8 FreezeEventObject(struct EventObject *eventObject) +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive || eventObject->frozen) + if (objectEvent->heldMovementActive || objectEvent->frozen) { return TRUE; } else { - eventObject->frozen = 1; - eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused; - eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused; - gSprites[eventObject->spriteId].animPaused = 1; - gSprites[eventObject->spriteId].affineAnimPaused = 1; + objectEvent->frozen = 1; + objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; + objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; + gSprites[objectEvent->spriteId].animPaused = 1; + gSprites[objectEvent->spriteId].affineAnimPaused = 1; return FALSE; } } -void FreezeEventObjects(void) +void FreezeObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + if (gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } -void FreezeEventObjectsExceptOne(u8 eventObjectId) +void FreezeObjectEventsExceptOne(u8 objectEventId) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (i != eventObjectId && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + if (i != objectEventId && gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } -void UnfreezeEventObject(struct EventObject *eventObject) +void UnfreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->active && eventObject->frozen) + if (objectEvent->active && objectEvent->frozen) { - eventObject->frozen = 0; - gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup; - gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup; + objectEvent->frozen = 0; + gSprites[objectEvent->spriteId].animPaused = objectEvent->spriteAnimPausedBackup; + gSprites[objectEvent->spriteId].affineAnimPaused = objectEvent->spriteAffineAnimPausedBackup; } } -void UnfreezeEventObjects(void) +void UnfreezeObjectEvents(void) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active) - UnfreezeEventObject(&gEventObjects[i]); + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + if (gObjectEvents[i].active) + UnfreezeObjectEvent(&gObjectEvents[i]); } static void Step1(struct Sprite *sprite, u8 dir) @@ -8598,7 +8598,7 @@ bool8 SpriteAnimEnded(struct Sprite *sprite) return FALSE; } -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible) { u16 x, y; s16 x2, y2; @@ -8625,11 +8625,11 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) sprite->invisible = TRUE; } -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *sprite) { sub_8097D68(sprite); SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - UpdateEventObjectSpriteVisibility(sprite, sprite->data[2]); + UpdateObjectEventSpriteVisibility(sprite, sprite->data[2]); } void sub_8097AF0(void) @@ -8639,7 +8639,7 @@ void sub_8097AF0(void) for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility) + if(sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility) DestroySprite(sprite); } } @@ -8651,7 +8651,7 @@ int sub_8097B2C(u8 var) // this should return a u8, because all that call this s for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) + if(sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) return i; } return MAX_SPRITES; @@ -8672,7 +8672,7 @@ void sub_8097BB4(u8 var1, u8 graphicsId) if(spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); u16 tileNum = sprite->oam.tileNum; sprite->oam = *graphicsInfo->oam; @@ -8796,24 +8796,24 @@ bool32 sub_8097D9C(u8 var) return FALSE; } -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject) +u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); return FieldEffectStart(fieldEffectId); } -void DoShadowFieldEffect(struct EventObject *eventObject) +void DoShadowFieldEffect(struct ObjectEvent *objectEvent) { - if (!eventObject->hasShadow) + if (!objectEvent->hasShadow) { - eventObject->hasShadow = 1; - StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject); + objectEvent->hasShadow = 1; + StartFieldEffectForObjectEvent(FLDEFF_SHADOW, objectEvent); } } -static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2; gFieldEffectArguments[2] = 151; @@ -8821,38 +8821,38 @@ static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite * FieldEffectStart(FLDEFF_RIPPLE); } -u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StoreAndLockAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FreeAndUnlockAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FlyUp_Step0, MovementAction_FlyUp_Step1, MovementAction_Fly_Finish, }; -u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FlyDown_Step0, MovementAction_FlyDown_Step1, MovementAction_Fly_Finish, }; -u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u32 one; bool32 ableToStore = FALSE; - if (gLockedAnimEventObjects == NULL) + if (gLockedAnimObjectEvents == NULL) { - gLockedAnimEventObjects = AllocZeroed(sizeof(struct LockedAnimEventObjects)); - gLockedAnimEventObjects->eventObjectIds[0] = eventObject->localId; + gLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents)); + gLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId; // needed to match - gLockedAnimEventObjects->count = (one = 1); + gLockedAnimObjectEvents->count = (one = 1); ableToStore = one; } else @@ -8862,10 +8862,10 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct bool32 found; for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) { - if (firstFreeSlot == 16 && gLockedAnimEventObjects->eventObjectIds[i] == 0) + if (firstFreeSlot == 16 && gLockedAnimObjectEvents->objectEventIds[i] == 0) firstFreeSlot = i; - if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) + if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) { found = TRUE; break; @@ -8874,44 +8874,44 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct if (!found && firstFreeSlot != 16) { - gLockedAnimEventObjects->eventObjectIds[firstFreeSlot] = eventObject->localId; - gLockedAnimEventObjects->count++; + gLockedAnimObjectEvents->objectEventIds[firstFreeSlot] = objectEvent->localId; + gLockedAnimObjectEvents->count++; ableToStore = TRUE; } } if (ableToStore == TRUE) { - eventObject->inanimate = TRUE; - eventObject->facingDirectionLocked = TRUE; + objectEvent->inanimate = TRUE; + objectEvent->facingDirectionLocked = TRUE; } sprite->data[2] = 1; return TRUE; } -u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool32 ableToStore; u8 index; sprite->data[2] = 1; - if (gLockedAnimEventObjects != NULL) + if (gLockedAnimObjectEvents != NULL) { ableToStore = FALSE; - index = FindLockedEventObjectIndex(eventObject); + index = FindLockedObjectEventIndex(objectEvent); if (index != 16) { - gLockedAnimEventObjects->eventObjectIds[index] = 0; - gLockedAnimEventObjects->count--; + gLockedAnimObjectEvents->objectEventIds[index] = 0; + gLockedAnimObjectEvents->count--; ableToStore = TRUE; } - if (gLockedAnimEventObjects->count == 0) - FREE_AND_SET_NULL(gLockedAnimEventObjects); + if (gLockedAnimObjectEvents->count == 0) + FREE_AND_SET_NULL(gLockedAnimObjectEvents); if (ableToStore == TRUE) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; - eventObject->facingDirectionLocked = FALSE; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; + objectEvent->facingDirectionLocked = FALSE; sprite->animPaused = 0; } } @@ -8919,36 +8919,36 @@ u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struc return TRUE; } -u8 FindLockedEventObjectIndex(struct EventObject *eventObject) +u8 FindLockedObjectEventIndex(struct ObjectEvent *objectEvent) { u8 i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) + if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -void CreateLevitateMovementTask(struct EventObject *eventObject) +void CreateLevitateMovementTask(struct ObjectEvent *objectEvent) { u8 taskId = CreateTask(ApplyLevitateMovement, 0xFF); struct Task *task = &gTasks[taskId]; - StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); - eventObject->warpArrowSpriteId = taskId; + StoreWordInTwoHalfwords(&task->data[0], (u32)objectEvent); + objectEvent->warpArrowSpriteId = taskId; task->data[3] = 0xFFFF; } static void ApplyLevitateMovement(u8 taskId) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // load the map object pointer. - sprite = &gSprites[eventObject->spriteId]; + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // load the map object pointer. + sprite = &gSprites[objectEvent->spriteId]; if(!(task->data[2] & 0x3)) sprite->pos2.y += task->data[3]; @@ -8961,10 +8961,10 @@ static void ApplyLevitateMovement(u8 taskId) void DestroyExtraMovementTask(u8 taskId) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // unused eventObject + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // unused objectEvent DestroyTask(taskId); } @@ -8972,22 +8972,22 @@ void sub_8098074(u8 var1, u8 var2) { u8 i; - for(i = 0; i < EVENT_OBJECTS_COUNT; i++) + for(i = 0; i < OBJECT_EVENTS_COUNT; i++) { if(i != var1 && i != var2 && - gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } } -u8 MovementAction_FlyUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; sprite->data[2]++; return FALSE; } -u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y -= 8; @@ -8996,14 +8996,14 @@ u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sp return FALSE; } -u8 MovementAction_FlyDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = -160; sprite->data[2]++; return FALSE; } -u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y += 8; @@ -9013,7 +9013,7 @@ u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite * } // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -u8 MovementAction_Fly_Finish(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Fly_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } diff --git a/src/faraway_island.c b/src/faraway_island.c index 6a835a02b..f8e3eac14 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -12,10 +12,10 @@ #include "constants/vars.h" static u8 sub_81D4890(u8); -static bool8 sub_81D4C14(struct EventObject*, u8); -static u8 sub_81D4C9C(struct EventObject*, u8); -static u8 sub_81D4C58(struct EventObject*, u8); -static u8 sub_81D4CE0(struct EventObject*, u8); +static bool8 sub_81D4C14(struct ObjectEvent*, u8); +static u8 sub_81D4C9C(struct ObjectEvent*, u8); +static u8 sub_81D4C58(struct ObjectEvent*, u8); +static u8 sub_81D4CE0(struct ObjectEvent*, u8); static u8 sub_81D4D24(u8); static bool8 CanMewWalkToCoords(s16, s16); @@ -36,26 +36,26 @@ static const s16 sFarawayIslandRockCoords[4][2] = {20, 20}, }; -static u8 GetMewEventObjectId(void) +static u8 GetMewObjectEventId(void) { - u8 eventObjectId; - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - return eventObjectId; + u8 objectEventId; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + return objectEventId; } u32 GetMewMoveDirection(void) { u8 i; int skip; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; - sPlayerToMewDeltaX = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; - sPlayerToMewDeltaY = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; + sPlayerToMewDeltaX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x - mew->currentCoords.x; + sPlayerToMewDeltaY = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y - mew->currentCoords.y; for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x - && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x + && gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y) { return DIR_NONE; } @@ -70,10 +70,10 @@ u32 GetMewMoveDirection(void) for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++) { - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == sFarawayIslandRockCoords[i][0]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == sFarawayIslandRockCoords[i][0]) { skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < sFarawayIslandRockCoords[i][1]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y < sFarawayIslandRockCoords[i][1]) { if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1]) skip = 1; @@ -88,7 +88,7 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaX > 0) { - if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; @@ -96,14 +96,14 @@ u32 GetMewMoveDirection(void) } else if (sPlayerToMewDeltaX < 0) { - if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } } - if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (sPlayerToMewDeltaY > 0) { @@ -119,10 +119,10 @@ u32 GetMewMoveDirection(void) } } - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == sFarawayIslandRockCoords[i][1]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == sFarawayIslandRockCoords[i][1]) { skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < sFarawayIslandRockCoords[i][0]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x < sFarawayIslandRockCoords[i][0]) { if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0]) skip = 1; @@ -137,7 +137,7 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaY > 0) { - if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; @@ -145,14 +145,14 @@ u32 GetMewMoveDirection(void) } else if (sPlayerToMewDeltaY < 0) { - if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } } - if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (sPlayerToMewDeltaX > 0) { @@ -211,13 +211,13 @@ u32 GetMewMoveDirection(void) if (sPlayerToMewDeltaY == 0) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y > mew->currentCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y < mew->currentCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; @@ -232,13 +232,13 @@ u32 GetMewMoveDirection(void) if (sPlayerToMewDeltaX == 0) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x > mew->currentCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x < mew->currentCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; @@ -256,8 +256,8 @@ u32 GetMewMoveDirection(void) static bool8 CanMewWalkToCoords(s16 x, s16 y) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x - && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x == x + && gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y == y) { return FALSE; } @@ -269,7 +269,7 @@ static u8 sub_81D4890(u8 ignoredDir) { u8 i; u8 count = 0; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; @@ -318,12 +318,12 @@ void UpdateFarawayIslandStepCounter(void) } } -bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent) { if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) { - if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) + if (objectEvent->graphicsId == OBJ_EVENT_GFX_MEW) return TRUE; } @@ -342,7 +342,7 @@ bool8 IsMewPlayingHideAndSeek(void) return FALSE; } -bool8 sub_81D4A58(struct EventObject *eventObject) +bool8 sub_81D4A58(struct ObjectEvent *objectEvent) { if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) @@ -356,7 +356,7 @@ void sub_81D4A90(void) s16 x; s16 y; u8 spriteId; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; mew->invisible = 0; if (gSpecialVar_0x8004 == 1) @@ -396,7 +396,7 @@ void sub_81D4BEC(void) DestroySprite(&gSprites[sUnknown_0203CF50]); } -static bool8 sub_81D4C14(struct EventObject *mew, u8 index) +static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) { @@ -407,7 +407,7 @@ static bool8 sub_81D4C14(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4C58(struct EventObject *mew, u8 index) +static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) { @@ -418,7 +418,7 @@ static u8 sub_81D4C58(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4C9C(struct EventObject *mew, u8 index) +static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) { @@ -429,7 +429,7 @@ static u8 sub_81D4C9C(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4CE0(struct EventObject *mew, u8 index) +static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) { diff --git a/src/field_camera.c b/src/field_camera.c index 7f294afdb..c5b32ff3b 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -299,7 +299,7 @@ static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset) gBGTilemapBuffers1[offset + 0x20] = metatiles[2]; gBGTilemapBuffers1[offset + 0x21] = metatiles[3]; - // Draw metatile's top layer to the top background layer, which covers event object sprites. + // Draw metatile's top layer to the top background layer, which covers object event sprites. gBGTilemapBuffers2[offset] = metatiles[4]; gBGTilemapBuffers2[offset + 1] = metatiles[5]; gBGTilemapBuffers2[offset + 0x20] = metatiles[6]; @@ -415,7 +415,7 @@ void CameraUpdate(void) if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); RotatingGatePuzzleCameraUpdate(deltaX, deltaY); ResetBerryTreeSparkleFlags(); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); @@ -430,7 +430,7 @@ void CameraUpdate(void) void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); DrawWholeMapView(); gTotalCameraPixelOffsetX -= deltaX * 16; gTotalCameraPixelOffsetY -= deltaY * 16; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 852fa2e1b..004d72614 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -28,7 +28,7 @@ #include "trainer_see.h" #include "trainer_hill.h" #include "wild_encounter.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/event_objects.h" #include "constants/field_poison.h" #include "constants/map_types.h" @@ -39,14 +39,14 @@ static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; -u8 gSelectedEventObject; +u8 gSelectedObjectEvent; static void GetPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *); static u16 GetPlayerCurMetatileBehavior(int); static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8); static const u8 *GetInteractionScript(struct MapPosition*, u8, u8); -static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); +static const u8 *GetInteractedObjectEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); @@ -139,7 +139,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) u16 metatileBehavior; gSpecialVar_LastTalked = 0; - gSelectedEventObject = 0; + gSelectedObjectEvent = 0; playerDirection = GetPlayerFacingDirection(); GetPlayerPosition(&position); @@ -240,7 +240,7 @@ static bool8 TryStartInteractionScript(struct MapPosition *position, u16 metatil static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - const u8 *script = GetInteractedEventObjectScript(position, metatileBehavior, direction); + const u8 *script = GetInteractedObjectEventScript(position, metatileBehavior, direction); if (script != NULL) return script; @@ -261,54 +261,54 @@ static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileB const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; s32 i; if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y))) - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); else - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) return NULL; for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == eventObjectId) + if (gLinkPlayerObjectEvents[i].active == TRUE && gLinkPlayerObjectEvents[i].objEventId == objectEventId) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; - return GetEventObjectScriptPointerByEventObjectId(eventObjectId); + return GetObjectEventScriptPointerByObjectEventId(objectEventId); } -static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; const u8 *script; - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; - // Look for an event object on the other side of the counter. - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + // Look for an object event on the other side of the counter. + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; if (InTrainerHill() == TRUE) script = GetTrainerHillTrainerScript(); else - script = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + script = GetObjectEventScriptPointerByObjectEventId(objectEventId); script = GetRamScript(gSpecialVar_LastTalked, script); return script; @@ -983,14 +983,14 @@ u8 TrySetDiveWarp(void) return 0; } -const u8 *GetEventObjectScriptPointerPlayerFacing(void) +const u8 *GetObjectEventScriptPointerPlayerFacing(void) { u8 direction; struct MapPosition position; direction = GetPlayerMovementDirection(); GetInFrontOfPlayerPosition(&position); - return GetInteractedEventObjectScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); + return GetInteractedObjectEventScript(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), direction); } int SetCableClubWarp(void) diff --git a/src/field_effect.c b/src/field_effect.c index f7667597c..f5f6b1cba 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -27,7 +27,7 @@ #include "trig.h" #include "util.h" #include "constants/field_effects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/rgb.h" #include "constants/songs.h" @@ -101,11 +101,11 @@ static bool8 sub_80B72D0(struct Task *); static bool8 sub_80B72F4(struct Task *); static void sub_80B7384(u8); -static bool8 sub_80B73D0(struct Task *, struct EventObject *); -static bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); -static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); -static bool8 sub_80B7450(struct Task *, struct EventObject *); -static bool8 sub_80B7478(struct Task *, struct EventObject *); +static bool8 sub_80B73D0(struct Task *, struct ObjectEvent *); +static bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *); +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *); +static bool8 sub_80B7450(struct Task *, struct ObjectEvent *); +static bool8 sub_80B7478(struct Task *, struct ObjectEvent *); static void Task_Dive(u8); static bool8 dive_1_lock(struct Task *); @@ -113,28 +113,28 @@ static bool8 dive_2_unknown(struct Task *); static bool8 dive_3_unknown(struct Task *); static void sub_80B75F0(u8); -static bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B764C(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7684(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B76B8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7704(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B77F8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7814(struct Task *, struct ObjectEvent *, struct Sprite *); static void mapldr_080851BC(void); static void sub_80B7890(u8); -static bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B78EC(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B791C(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7968(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B79BC(struct Task *, struct ObjectEvent *, struct Sprite *); static void sub_80B7A8C(u8); -static bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B7AE8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7B18(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7B94(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7BCC(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7BF4(struct Task *, struct ObjectEvent *, struct Sprite *); static void DoEscapeRopeFieldEffect(u8); static void EscapeRopeFieldEffect_Step0(struct Task *); @@ -246,12 +246,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp"); const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp"); const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal"); const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp"); -const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_04.gbapal"); +const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal"); const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp"); const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp"); const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp"); const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp"); -const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_05.gbapal"); +const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal"); // Graphics for the lights streaking past your Pokemon when it uses a field move. const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp"); @@ -628,7 +628,7 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = sub_80B72F4, }; -bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = +bool8 (*const gUnknown_0855C418[])(struct Task *, struct ObjectEvent *) = { sub_80B73D0, waterfall_1_do_anim_probably, @@ -644,7 +644,7 @@ bool8 (*const gUnknown_0855C42C[])(struct Task *) = dive_3_unknown, }; -bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C438[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B764C, sub_80B7684, @@ -654,7 +654,7 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct S sub_80B7814, }; -bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C450[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B78EC, sub_80B791C, @@ -662,7 +662,7 @@ bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct S sub_80B79BC, }; -bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C460[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B7AE8, sub_80B7B18, @@ -1431,7 +1431,7 @@ static void FieldCallback_Fly(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1468,13 +1468,13 @@ static void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; if (gPlayerAvatar.flags & 0x08) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); } ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1494,7 +1494,7 @@ static void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(taskId); } } @@ -1504,7 +1504,7 @@ void sub_80B6B68(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_80B6B94, 0); gFieldCallback = NULL; } @@ -1518,14 +1518,14 @@ static void sub_80B6B94(u8 taskId) static bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0] { - struct EventObject *playerObject; + struct ObjectEvent *playerObject; struct Sprite *playerSprite; - playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gPlayerAvatar.preventStep = TRUE; - EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1552,7 +1552,7 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1560,10 +1560,10 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] static bool8 sub_80B6D04(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->pos2.y += task->data[1]; if (task->data[1] < 8) @@ -1577,15 +1577,15 @@ static bool8 sub_80B6D04(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - eventObject->fixedPriority = 0; + objectEvent->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - eventObject->triggerGroundEffectsOnStop = 1; - eventObject->landingJump = 1; + objectEvent->triggerGroundEffectsOnStop = 1; + objectEvent->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1622,7 +1622,7 @@ static bool8 sub_80B6E18(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_80B6B94)); return FALSE; @@ -1648,7 +1648,7 @@ static void sub_80B6E88(u8 taskId) static bool8 sub_80B6EC0(struct Task *task) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); sub_80E1558(task->data[1]); task->data[0]++; @@ -1657,11 +1657,11 @@ static bool8 sub_80B6EC0(struct Task *task) static bool8 sub_80B6EE0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1772,13 +1772,13 @@ static void sub_80B70DC(u8 taskId) static bool8 sub_80B7114(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; s16 x; s16 y; u8 behavior; CameraObjectReset2(); - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1868,13 +1868,13 @@ static bool8 sub_80B72D0(struct Task *task) static bool8 sub_80B72F4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { CameraObjectReset1(); ScriptContext2_Disable(); - EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_80B70DC)); } return FALSE; @@ -1891,10 +1891,10 @@ bool8 FldEff_UseWaterfall(void) static void sub_80B7384(u8 taskId) { - while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); + while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])); } -static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B73D0(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1902,12 +1902,12 @@ static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) return FALSE; } -static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) +static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); - if (!EventObjectIsMovementOverridden(eventObject)) + if (!ObjectEventIsMovementOverridden(objectEvent)) { - EventObjectClearHeldMovementIfFinished(eventObject); + ObjectEventClearHeldMovementIfFinished(objectEvent); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1915,7 +1915,7 @@ static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject return FALSE; } -static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1925,20 +1925,20 @@ static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct Eve return TRUE; } -static bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B7450(struct Task *task, struct ObjectEvent *objectEvent) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -static bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B7478(struct Task *task, struct ObjectEvent *objectEvent) { - if (!EventObjectClearHeldMovementIfFinished(eventObject)) + if (!ObjectEventClearHeldMovementIfFinished(objectEvent)) { return FALSE; } - if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior)) + if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1987,7 +1987,7 @@ static bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior); + dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -2001,22 +2001,22 @@ void sub_80B75D8(u8 priority) static void sub_80B75F0(u8 taskId) { - while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B764C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B764C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; } -static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7684(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -2029,12 +2029,12 @@ static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B76B8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -2043,7 +2043,7 @@ static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, str return TRUE; } -static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7704(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -2075,7 +2075,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY; } @@ -2086,7 +2086,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B77F8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeScreen(); @@ -2094,7 +2094,7 @@ static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7814(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7814(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2117,25 +2117,25 @@ static void mapldr_080851BC(void) static void sub_80B7890(u8 taskId) { - while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B78EC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { CameraObjectReset2(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; task->data[0]++; return FALSE; } -static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B791C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -2144,27 +2144,27 @@ static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7968(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; } -static bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B79BC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B7890)); } return FALSE; @@ -2195,27 +2195,27 @@ void sub_80B7A74(u8 priority) static void sub_80B7A8C(u8 taskId) { - while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7AE8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[0]++; return FALSE; } -static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7B18(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[1] > 3) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -2223,24 +2223,24 @@ static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, str } else { task->data[1]++; - EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -static bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7B94(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; task->data[0]++; } return FALSE; } -static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7BCC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -2251,7 +2251,7 @@ static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7BF4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7BF4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2284,7 +2284,7 @@ void sub_80B7CAC(struct Sprite *sprite) void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(DoEscapeRopeFieldEffect, 0x50); } @@ -2302,19 +2302,19 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task) static void EscapeRopeFieldEffect_Step1(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; if (task->data[14] != 0 && (--task->data[14]) == 0) { TryFadeOutOldMapMusic(); WarpFadeScreen(); } - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { - SetEventObjectDirection(eventObject, task->data[15]); + SetObjectEventDirection(objectEvent, task->data[15]); SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; @@ -2322,7 +2322,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) DestroyTask(FindTaskIdByFunc(DoEscapeRopeFieldEffect)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2342,9 +2342,9 @@ static void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CreateTask(sub_80B7E94, 0); } @@ -2365,29 +2365,29 @@ static void sub_80B7EC4(struct Task *task) static void sub_80B7EE8(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent)) { return; } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B7E94)); return; } - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - eventObject->invisible ^= 1; + objectEvent->invisible ^= 1; } void CreateTeleportFieldEffectTask(void) @@ -2410,7 +2410,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; @@ -2419,14 +2419,14 @@ static void TeleportFieldEffectTask1(struct Task *task) static void TeleportFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection) + if (task->data[2] > 7 && task->data[15] == objectEvent->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2439,12 +2439,12 @@ static void TeleportFieldEffectTask2(struct Task *task) static void TeleportFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((--task->data[1]) <= 0) { task->data[1] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2490,9 +2490,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CameraObjectReset2(); CreateTask(sub_80B8250, 0); } @@ -2517,7 +2517,7 @@ static void sub_80B8280(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2530,14 +2530,14 @@ static void sub_80B8280(struct Task *task) static void sub_80B830C(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->pos2.y += task->data[1]) >= -8) { if (task->data[13] == 0) { task->data[13]++; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2555,7 +2555,7 @@ static void sub_80B830C(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2569,16 +2569,16 @@ static void sub_80B830C(struct Task *task) static void sub_80B8410(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if ((--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection) + if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B8250)); } } @@ -3008,31 +3008,31 @@ static void sub_80B8D84(u8 taskId) static void sub_80B8DB4(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]); + MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } static void sub_80B8E14(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B8E60(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectCheckHeldMovementStatus(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventCheckHeldMovementStatus(objectEvent)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -3042,32 +3042,32 @@ static void sub_80B8E60(struct Task *task) static void sub_80B8EA8(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3)); - EventObjectClearHeldMovementIfFinished(eventObject); - EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(3)); + ObjectEventClearHeldMovementIfFinished(objectEvent); + ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } static void sub_80B8F24(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection)); - sub_81555AC(eventObject->fieldEffectSpriteId, 1); - UnfreezeEventObjects(); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); + sub_81555AC(objectEvent->fieldEffectSpriteId, 1); + UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_80B8D84)); @@ -3172,22 +3172,22 @@ static void sub_80B91D4(u8 taskId) static void sub_80B9204(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B925C(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -3199,11 +3199,11 @@ static void sub_80B92A0(struct Task *task) { if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[15] & 0x08) { - sub_81555AC(eventObject->fieldEffectSpriteId, 2); - sub_81555D8(eventObject->fieldEffectSpriteId, 0); + sub_81555AC(objectEvent->fieldEffectSpriteId, 2); + sub_81555D8(objectEvent->fieldEffectSpriteId, 0); } task->data[1] = sub_80B94C4(); task->data[0]++; @@ -3217,14 +3217,14 @@ static void sub_80B92F8(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT); } } static void sub_80B933C(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; PlaySE(SE_W019); @@ -3236,14 +3236,14 @@ static void sub_80B9390(struct Task *task) { if ((++task->data[2]) >= 8) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->inanimate = 1; - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x03)); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->inanimate = 1; + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); + DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3254,11 +3254,11 @@ static void sub_80B9418(struct Task *task) { if ((++task->data[2]) >= 10) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(eventObject); - eventObject->inanimate = 0; - eventObject->hasShadow = 0; - sub_80B9560(task->data[1], eventObject->spriteId); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(objectEvent); + objectEvent->inanimate = 0; + objectEvent->hasShadow = 0; + sub_80B9560(task->data[1], objectEvent->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3460,9 +3460,9 @@ static void sub_80B97D4(u8 taskId) static void sub_80B9804(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; task->data[2] = 17; @@ -3471,27 +3471,27 @@ static void sub_80B9804(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_81555AC(eventObject->fieldEffectSpriteId, 0); + sub_81555AC(objectEvent->fieldEffectSpriteId, 0); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x3)); CameraObjectReset2(); - EventObjectTurn(eventObject, DIR_WEST); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->invisible = FALSE; + ObjectEventTurn(objectEvent, DIR_WEST); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->invisible = FALSE; task->data[1] = sub_80B94C4(); sub_80B9524(task->data[1]); - sub_80B9560(task->data[1], eventObject->spriteId); + sub_80B9560(task->data[1], objectEvent->spriteId); } } static void sub_80B98B8(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (task->data[2] == 0 || (--task->data[2]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; sub_80B9560(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3534,26 +3534,26 @@ static void sub_80B9924(struct Task *task) static void sub_80B9978(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (sub_80B9508(task->data[1])) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->inanimate = 0; - MoveEventObjectToMapCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->inanimate = 0; + MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B99F0(struct Task *task) { - if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { task->data[0]++; sub_80B9794(task->data[1]); @@ -3573,18 +3573,18 @@ static void sub_80B9A28(struct Task *task) static void sub_80B9A60(struct Task *task) { u8 state; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((--task->data[1]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; state = 0; if (task->data[15] & 0x08) { state = 3; - sub_81555AC(eventObject->fieldEffectSpriteId, 1); + sub_81555AC(objectEvent->fieldEffectSpriteId, 1); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state)); - EventObjectTurn(eventObject, DIR_SOUTH); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state)); + ObjectEventTurn(objectEvent, DIR_SOUTH); gPlayerAvatar.flags = task->data[15]; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); @@ -3595,11 +3595,11 @@ static void sub_80B9A60(struct Task *task) bool8 sub_80B9ADC(void) { u8 taskId; - u8 eventObjectIdBuffer; - if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) + u8 objectEventIdBuffer; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) { taskId = CreateTask(sub_80B9BE8, 0x50); - gTasks[taskId].data[2] = eventObjectIdBuffer; + gTasks[taskId].data[2] = objectEventIdBuffer; gTasks[taskId].data[6] = gFieldEffectArguments[0]; gTasks[taskId].data[7] = gFieldEffectArguments[1]; gTasks[taskId].data[8] = gFieldEffectArguments[2]; @@ -3678,8 +3678,8 @@ void sub_80B9C54(s16* data, u8 taskId) { if (++data[3] > 0x78) { - struct Sprite *sprite = &gSprites[gEventObjects[data[2]].spriteId]; - gEventObjects[data[2]].invisible = TRUE; + struct Sprite *sprite = &gSprites[gObjectEvents[data[2]].spriteId]; + gObjectEvents[data[2]].invisible = TRUE; BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); sub_80B9D24(sprite); @@ -3695,7 +3695,7 @@ void sub_80B9CDC(s16* a0, u8 taskId) if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C)) { InstallCameraPanAheadCallback(); - RemoveEventObjectByLocalIdAndMap(a0[6], a0[7], a0[8]); + RemoveObjectEventByLocalIdAndMap(a0[6], a0[7], a0[8]); FieldEffectActiveListRemove(0x41); DestroyTask(taskId); } @@ -3790,24 +3790,24 @@ static void sub_80B9DB8(struct Sprite* sprite) bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite) { - u8 eventObjectIdBuffer; - if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) + u8 objectEventIdBuffer; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) { - struct EventObject *object; + struct ObjectEvent *object; int xPos, yPos; u8 taskId; - object = &gEventObjects[eventObjectIdBuffer]; + object = &gObjectEvents[objectEventIdBuffer]; xPos = object->currentCoords.x - 7; yPos = object->currentCoords.y - 7; xPos = (gFieldEffectArguments[3] - xPos) * 16; yPos = (gFieldEffectArguments[4] - yPos) * 16; - ShiftEventObjectCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); + ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); taskId = CreateTask(Fldeff_MoveDeoxysRock_Step, 0x50); gTasks[taskId].data[1] = object->spriteId; gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos; gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos; gTasks[taskId].data[8] = gFieldEffectArguments[5]; - gTasks[taskId].data[9] = eventObjectIdBuffer; + gTasks[taskId].data[9] = objectEventIdBuffer; } return FALSE; } @@ -3836,10 +3836,10 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId) } else { - struct EventObject *object = &gEventObjects[data[9]]; + struct ObjectEvent *object = &gObjectEvents[data[9]]; sprite->pos1.x = data[2]; sprite->pos1.y = data[3]; - ShiftStillEventObjectCoords(object); + ShiftStillObjectEventCoords(object); object->triggerGroundEffectsOnStop = TRUE; FieldEffectActiveListRemove(0x42); DestroyTask(taskId); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 547a2851b..52c30ab0f 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -13,12 +13,12 @@ #include "constants/field_effects.h" #include "constants/songs.h" -#define EVENT_OBJ_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c +#define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c static void UpdateObjectReflectionSprite(struct Sprite *); -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite); -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *, u8); -static void LoadObjectRegularReflectionPalette(struct EventObject *, u8); +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8); +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8); static void sub_81561FC(struct Sprite *, u8, u8); static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *); @@ -26,13 +26,13 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); static void UpdateAshFieldEffect_Step0(struct Sprite *); static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step2(struct Sprite *); -static void SynchroniseSurfAnim(struct EventObject *, struct Sprite *); -static void sub_81556E8(struct EventObject *, struct Sprite *); -static void CreateBobbingEffect(struct EventObject *, struct Sprite *, struct Sprite *); +static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); +static void sub_81556E8(struct ObjectEvent *, struct Sprite *); +static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void sub_8155850(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); -void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, bool8 stillReflection) +void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection) { struct Sprite *reflectionSprite; @@ -47,41 +47,41 @@ void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, boo reflectionSprite->affineAnimBeginning = TRUE; reflectionSprite->subspriteMode = SUBSPRITES_OFF; reflectionSprite->data[0] = sprite->data[0]; - reflectionSprite->data[1] = eventObject->localId; + reflectionSprite->data[1] = objectEvent->localId; reflectionSprite->data[7] = stillReflection; - LoadObjectReflectionPalette(eventObject, reflectionSprite); + LoadObjectReflectionPalette(objectEvent, reflectionSprite); if (!stillReflection) reflectionSprite->oam.affineMode = ST_OAM_AFFINE_NORMAL; } -static s16 GetReflectionVerticalOffset(struct EventObject *eventObject) +static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent) { - return GetEventObjectGraphicsInfo(eventObject->graphicsId)->height - 2; + return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2; } -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite) +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 bridgeType; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; sprite->data[2] = 0; - if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(eventObject->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(eventObject->currentMetatileBehavior)))) + if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) { sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1]; - LoadObjectHighBridgeReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectHighBridgeReflectionPalette(objectEvent, sprite->oam.paletteNum); } else { - LoadObjectRegularReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectRegularReflectionPalette(objectEvent, sprite->oam.paletteNum); } } -static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, u8 paletteIndex) +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteIndex) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) { if (graphicsInfo->paletteSlot == 0) { @@ -101,12 +101,12 @@ static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, // When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color. // This is so the sprite blends in with the dark water metatile underneath the bridge. -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObject, u8 paletteNum) +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteNum) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) { PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); UpdateSpritePaletteWithWeather(paletteNum); @@ -115,12 +115,12 @@ static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObjec static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *mainSprite; - eventObject = &gEventObjects[reflectionSprite->data[0]]; - mainSprite = &gSprites[eventObject->spriteId]; - if (!eventObject->active || !eventObject->hasReflection || eventObject->localId != reflectionSprite->data[1]) + objectEvent = &gObjectEvents[reflectionSprite->data[0]]; + mainSprite = &gSprites[objectEvent->spriteId]; + if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1]) { reflectionSprite->inUse = FALSE; } @@ -136,14 +136,14 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->invisible = mainSprite->invisible; reflectionSprite->pos1.x = mainSprite->pos1.x; // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 - reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(eventObject) + reflectionSprite->data[2]; + reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; reflectionSprite->pos2.x = mainSprite->pos2.x; reflectionSprite->pos2.y = -mainSprite->pos2.y; reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled; - if (eventObject->hideReflection == TRUE) + if (objectEvent->hideReflection == TRUE) reflectionSprite->invisible = TRUE; // Check if the reflection is not still. @@ -218,12 +218,12 @@ const u16 gShadowVerticalOffsets[] = { u32 FldEff_Shadow(void) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; u8 spriteId; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94); if (spriteId != MAX_SPRITES) { @@ -238,27 +238,27 @@ u32 FldEff_Shadow(void) void UpdateShadowFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; - if (!eventObject->active || !eventObject->hasShadow - || MetatileBehavior_IsPokeGrass(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->previousMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->previousMetatileBehavior)) + if (!objectEvent->active || !objectEvent->hasShadow + || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->previousMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->previousMetatileBehavior)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } @@ -301,8 +301,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -316,21 +316,21 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) sprite->data[7] = TRUE; metatileBehavior = 0; if (sprite->animCmdIndex == 0) metatileBehavior = 4; - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_81561FC(sprite, sprite->data[0], metatileBehavior); } } @@ -407,8 +407,8 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -422,18 +422,18 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_LONG_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) { sprite->data[7] = TRUE; } - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_81561FC(sprite, sprite->data[0], 0); } } @@ -458,44 +458,44 @@ u32 FldEff_JumpLongGrass(void) u32 FldEff_ShortGrass(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &(gSprites[spriteId]); sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateShortGrassFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShortGrass) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShortGrass) { FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; y = linkedSprite->pos1.y; x = linkedSprite->pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) @@ -512,7 +512,7 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite) sprite->pos2.y = (graphicsInfo->height >> 1) - 8; sprite->subpriority = linkedSprite->subpriority - 1; sprite->oam.priority = linkedSprite->oam.priority; - UpdateEventObjectSpriteVisibility(sprite, linkedSprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible); } } @@ -586,14 +586,14 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite) if (++sprite->data[1] > 40) sprite->data[0] = 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) { sprite->invisible ^= 1; sprite->data[1]++; - UpdateEventObjectSpriteVisibility(sprite, sprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, sprite->invisible); if (sprite->data[1] > 56) { FieldEffectStop(sprite, sprite->data[7]); @@ -602,22 +602,22 @@ static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) u32 FldEff_Splash(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - linkedSprite = &gSprites[eventObject->spriteId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; @@ -630,17 +630,17 @@ u32 FldEff_Splash(void) void UpdateSplashFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; - if (sprite->animEnded || TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (sprite->animEnded || TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SPLASH); } else { - sprite->pos1.x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; - sprite->pos1.y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; + sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -682,22 +682,22 @@ u32 FldEff_JumpBigSplash(void) u32 FldEff_FeetInFlowingWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->callback = UpdateFeetInFlowingWaterFieldEffect; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; @@ -711,26 +711,26 @@ u32 FldEff_FeetInFlowingWater(void) static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *linkedSprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShallowFlowingWater) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShallowFlowingWater) { FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y; sprite->subpriority = linkedSprite->subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); - if (eventObject->currentCoords.x != sprite->data[3] || eventObject->currentCoords.y != sprite->data[4]) + UpdateObjectEventSpriteVisibility(sprite, FALSE); + if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4]) { - sprite->data[3] = eventObject->currentCoords.x; - sprite->data[4] = eventObject->currentCoords.y; + sprite->data[3] = objectEvent->currentCoords.x; + sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { PlaySE(SE_MIZU); @@ -757,46 +757,46 @@ u32 FldEff_Ripple(void) u32 FldEff_HotSpringsWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inHotSprings) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inHotSprings) { FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; sprite->subpriority = linkedSprite->subpriority - 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -928,13 +928,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *sprite) sprite->animPaused = FALSE; MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); - gEventObjects[gPlayerAvatar.eventObjectId].triggerGroundEffectsOnMove = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE; sprite->data[0] = 2; } static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->animEnded) FieldEffectStop(sprite, FLDEFF_ASH); } @@ -993,18 +993,18 @@ static u8 sub_815564C(struct Sprite *sprite) void UpdateSurfBlobFieldEffect(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - eventObject = &gEventObjects[sprite->data[2]]; - linkedSprite = &gSprites[eventObject->spriteId]; - SynchroniseSurfAnim(eventObject, sprite); - sub_81556E8(eventObject, sprite); - CreateBobbingEffect(eventObject, linkedSprite, sprite); + objectEvent = &gObjectEvents[sprite->data[2]]; + linkedSprite = &gSprites[objectEvent->spriteId]; + SynchroniseSurfAnim(objectEvent, sprite); + sub_81556E8(objectEvent, sprite); + CreateBobbingEffect(objectEvent, linkedSprite, sprite); sprite->oam.priority = linkedSprite->oam.priority; } -static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void SynchroniseSurfAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { [DIR_NONE] = 0, @@ -1019,14 +1019,14 @@ static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite * }; if (sub_8155640(sprite) == 0) - StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[eventObject->movementDirection]); + StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]); } -void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) +void sub_81556E8(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 i; - s16 x = eventObject->currentCoords.x; - s16 y = eventObject->currentCoords.y; + s16 x = objectEvent->currentCoords.x; + s16 y = objectEvent->currentCoords.y; s32 spriteY = sprite->pos2.y; if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7])) @@ -1046,7 +1046,7 @@ void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) } } -static void CreateBobbingEffect(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite) +static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite) { u16 unk_085CDC6A[] = {3, 7}; u8 v0 = sub_8155638(sprite); @@ -1121,26 +1121,26 @@ u32 FldEff_Dust(void) u32 FldEff_SandPile(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; sprite->pos2.y = (graphicsInfo->height >> 1) - 2; SeekSpriteAnim(sprite, 2); } @@ -1149,18 +1149,18 @@ u32 FldEff_SandPile(void) void UpdateSandPileFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inSandPile) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inSandPile) { FieldEffectStop(sprite, FLDEFF_SAND_PILE); } else { - y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; + y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) { sprite->data[3] = x; @@ -1172,8 +1172,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite) } sprite->pos1.x = x; sprite->pos1.y = y; - sprite->subpriority = gSprites[gEventObjects[eventObjectId].spriteId].subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -1198,7 +1198,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite) sprite->data[0] += 0x80; sprite->data[0] &= 0x100; sprite->pos1.y -= sprite->data[0] >> 8; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->invisible || sprite->animEnded) { FieldEffectStop(sprite, FLDEFF_BUBBLES); @@ -1243,7 +1243,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) u8 spriteId; struct Sprite *sprite; - if (TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) + if (TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) { FieldEffectActiveListRemove(fldEff); return MAX_SPRITES; @@ -1264,17 +1264,17 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) void UpdateDisguiseFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &objectEventId)) { FieldEffectStop(sprite, sprite->data[1]); } - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->invisible = linkedSprite->invisible; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; @@ -1294,30 +1294,30 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite) } } -void sub_8155D78(struct EventObject *eventObject) +void sub_8155D78(struct ObjectEvent *objectEvent) { - if (eventObject->directionSequenceIndex == 1) + if (objectEvent->directionSequenceIndex == 1) { - gSprites[eventObject->fieldEffectSpriteId].data[0]++; + gSprites[objectEvent->fieldEffectSpriteId].data[0]++; } } -bool8 sub_8155DA0(struct EventObject *eventObject) +bool8 sub_8155DA0(struct ObjectEvent *objectEvent) { struct Sprite *sprite; - if (eventObject->directionSequenceIndex == 2) + if (objectEvent->directionSequenceIndex == 2) { return TRUE; } - if (eventObject->directionSequenceIndex == 0) + if (objectEvent->directionSequenceIndex == 0) { return TRUE; } - sprite = &gSprites[eventObject->fieldEffectSpriteId]; + sprite = &gSprites[objectEvent->fieldEffectSpriteId]; if (sprite->data[7]) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; sprite->data[0]++; return TRUE; } @@ -1532,7 +1532,7 @@ void sub_8156194(struct Sprite *sprite) } else { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); } } @@ -1542,24 +1542,24 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite) if (sprite->animEnded) FieldEffectStop(sprite, sprite->data[0]); else - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) { u8 i; s16 var, xhi, lyhi, yhi, ylo; - const struct EventObjectGraphicsInfo *graphicsInfo; // Unused Variable + const struct ObjectEventGraphicsInfo *graphicsInfo; // Unused Variable struct Sprite *linkedSprite; SetObjectSubpriorityByZCoord(z, sprite, offset); - for (i = 0; i < EVENT_OBJECTS_COUNT; i ++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i ++) { - struct EventObject *eventObject = &gEventObjects[i]; - if (eventObject->active) + struct ObjectEvent *objectEvent = &gObjectEvents[i]; + if (objectEvent->active) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - linkedSprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + linkedSprite = &gSprites[objectEvent->spriteId]; xhi = sprite->pos1.x + sprite->centerToCornerVecX; var = sprite->pos1.x - sprite->centerToCornerVecX; if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 20d338e23..ac05bb2fd 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -23,7 +23,7 @@ #include "wild_encounter.h" #include "constants/abilities.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/maps.h" @@ -32,14 +32,14 @@ #include "constants/species.h" static EWRAM_DATA u8 gUnknown_0203734C = 0; -EWRAM_DATA struct EventObject gEventObjects[EVENT_OBJECTS_COUNT] = {}; +EWRAM_DATA struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT] = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; // static declarations -static u8 EventObjectCB2_NoMovement2(); -static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *, u8); -static void npc_clear_strange_bits(struct EventObject *); +static u8 ObjectEventCB2_NoMovement2(); +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *, u8); +static void npc_clear_strange_bits(struct ObjectEvent *); static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16); static void PlayerAllowForcedMovementIfMovingSameDirection(); static bool8 TryDoMetatileBehaviorForcedMovement(); @@ -70,20 +70,20 @@ static void PlayerNotOnBikeTurningInPlace(u8, u16); static void PlayerNotOnBikeMoving(u8, u16); static u8 CheckForPlayerAvatarCollision(u8); static u8 sub_808B028(u8); -static u8 sub_808B164(struct EventObject *, s16, s16, u8, u8); +static u8 sub_808B164(struct ObjectEvent *, s16, s16, u8, u8); static bool8 CanStopSurfing(s16, s16, u8); static bool8 ShouldJumpLedge(s16, s16, u8); static bool8 TryPushBoulder(s16, s16, u8); static void CheckAcroBikeCollision(s16, s16, u8, u8 *); static void DoPlayerAvatarTransition(void); -static void PlayerAvatarTransition_Dummy(struct EventObject *a); -static void PlayerAvatarTransition_Normal(struct EventObject *a); -static void PlayerAvatarTransition_MachBike(struct EventObject *a); -static void PlayerAvatarTransition_AcroBike(struct EventObject *a); -static void PlayerAvatarTransition_Surfing(struct EventObject *a); -static void PlayerAvatarTransition_Underwater(struct EventObject *a); -static void PlayerAvatarTransition_ReturnToField(struct EventObject *a); +static void PlayerAvatarTransition_Dummy(struct ObjectEvent *a); +static void PlayerAvatarTransition_Normal(struct ObjectEvent *a); +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *a); +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *a); +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *a); static bool8 player_is_anim_in_certain_ranges(void); static bool8 sub_808B618(void); @@ -96,24 +96,24 @@ static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8); static void PlayCollisionSoundIfNotFacingWarp(u8 a); -static void sub_808C280(struct EventObject *); +static void sub_808C280(struct ObjectEvent *); static void StartStrengthAnim(u8, u8); static void Task_BumpBoulder(u8 taskId); -static u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); -static u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); -static u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); +static u8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); +static u8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); +static u8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); static void DoPlayerMatJump(void); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent); static void DoPlayerMatSpin(void); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject); +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent); static void CreateStopSurfingTask(u8); static void Task_StopSurfingInit(u8 taskId); @@ -138,7 +138,7 @@ static u8 Fishing15(struct Task *task); static u8 Fishing16(struct Task *task); static void AlignFishingAnimationFrames(void); -static u8 sub_808D38C(struct EventObject *object, s16 *a1); +static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1); // .rodata @@ -211,7 +211,7 @@ static const u8 sAcroBikeTrickCollisionTypes[] = { COLLISION_HORIZONTAL_RAIL, }; -static void (*const gUnknown_084974B8[])(struct EventObject *) = +static void (*const gUnknown_084974B8[])(struct ObjectEvent *) = { PlayerAvatarTransition_Normal, PlayerAvatarTransition_MachBike, @@ -233,49 +233,49 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) = static const u8 sRivalAvatarGfxIds[][2] = { - {EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING, EVENT_OBJ_GFX_RIVAL_MAY_SURFING}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, - {EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE}, - {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, - {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING} + {OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_ACRO_BIKE, OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_SURFING, OBJ_EVENT_GFX_RIVAL_MAY_SURFING}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, + {OBJ_EVENT_GFX_RIVAL_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE}, + {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, + {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING} }; static const u8 sPlayerAvatarGfxIds[][2] = { - {EVENT_OBJ_GFX_BRENDAN_NORMAL, EVENT_OBJ_GFX_MAY_NORMAL}, - {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, EVENT_OBJ_GFX_MAY_MACH_BIKE}, - {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, EVENT_OBJ_GFX_MAY_ACRO_BIKE}, - {EVENT_OBJ_GFX_BRENDAN_SURFING, EVENT_OBJ_GFX_MAY_SURFING}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER}, - {EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_MAY_FIELD_MOVE}, - {EVENT_OBJ_GFX_BRENDAN_FISHING, EVENT_OBJ_GFX_MAY_FISHING}, - {EVENT_OBJ_GFX_BRENDAN_WATERING, EVENT_OBJ_GFX_MAY_WATERING}, + {OBJ_EVENT_GFX_BRENDAN_NORMAL, OBJ_EVENT_GFX_MAY_NORMAL}, + {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, OBJ_EVENT_GFX_MAY_MACH_BIKE}, + {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, OBJ_EVENT_GFX_MAY_ACRO_BIKE}, + {OBJ_EVENT_GFX_BRENDAN_SURFING, OBJ_EVENT_GFX_MAY_SURFING}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, OBJ_EVENT_GFX_MAY_UNDERWATER}, + {OBJ_EVENT_GFX_BRENDAN_FIELD_MOVE, OBJ_EVENT_GFX_MAY_FIELD_MOVE}, + {OBJ_EVENT_GFX_BRENDAN_FISHING, OBJ_EVENT_GFX_MAY_FISHING}, + {OBJ_EVENT_GFX_BRENDAN_WATERING, OBJ_EVENT_GFX_MAY_WATERING}, }; -static const u8 sFRLGAvatarGfxIds[] = {EVENT_OBJ_GFX_RED, EVENT_OBJ_GFX_LEAF}; +static const u8 sFRLGAvatarGfxIds[] = {OBJ_EVENT_GFX_RED, OBJ_EVENT_GFX_LEAF}; -static const u8 sRSAvatarGfxIds[] = {EVENT_OBJ_GFX_LINK_RS_BRENDAN, EVENT_OBJ_GFX_LINK_RS_MAY}; +static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GFX_LINK_RS_MAY}; static const u8 gUnknown_0849750C[2][5][2] = { //male { - {EVENT_OBJ_GFX_BRENDAN_NORMAL, 1}, - {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, 2}, - {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, 4}, - {EVENT_OBJ_GFX_BRENDAN_SURFING, 8}, - {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, 16}, + {OBJ_EVENT_GFX_BRENDAN_NORMAL, 1}, + {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, 2}, + {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, 4}, + {OBJ_EVENT_GFX_BRENDAN_SURFING, 8}, + {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, 16}, }, //female { - {EVENT_OBJ_GFX_MAY_NORMAL, 1}, - {EVENT_OBJ_GFX_MAY_MACH_BIKE, 2}, - {EVENT_OBJ_GFX_MAY_ACRO_BIKE, 4}, - {EVENT_OBJ_GFX_MAY_SURFING, 8}, - {EVENT_OBJ_GFX_MAY_UNDERWATER, 16}, + {OBJ_EVENT_GFX_MAY_NORMAL, 1}, + {OBJ_EVENT_GFX_MAY_MACH_BIKE, 2}, + {OBJ_EVENT_GFX_MAY_ACRO_BIKE, 4}, + {OBJ_EVENT_GFX_MAY_SURFING, 8}, + {OBJ_EVENT_GFX_MAY_UNDERWATER, 16}, } }; @@ -287,19 +287,19 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of MetatileBehavior_IsEastArrowWarp, }; -static bool8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) = +static bool8 (*const gUnknown_08497530[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) = { sub_808C3A4, do_boulder_dust, sub_808C484, }; -static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) = +static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_DoSecretBaseMatJump, }; -static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) = +static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep1, @@ -311,25 +311,25 @@ static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct Eve void MovementType_Player(struct Sprite *sprite) { - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2); } -static u8 EventObjectCB2_NoMovement2(void) +static u8 ObjectEventCB2_NoMovement2(void) { return 0; } void player_step(u8 direction, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - sub_808C280(playerEventObj); + sub_808C280(playerObjEvent); if (gPlayerAvatar.preventStep == FALSE) { Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); - if (TryInterruptEventObjectSpecialAnim(playerEventObj, direction) == 0) + if (TryInterruptObjectEventSpecialAnim(playerObjEvent, direction) == 0) { - npc_clear_strange_bits(playerEventObj); + npc_clear_strange_bits(playerObjEvent); DoPlayerAvatarTransition(); if (TryDoMetatileBehaviorForcedMovement() == 0) { @@ -340,16 +340,16 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) } } -static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction) +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerObjEvent, u8 direction) { u8 r5 = direction; u8 r6 = direction; r6++; r6--; - if (EventObjectIsMovementOverridden(playerEventObj) - && !EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent) + && !ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj); + u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerObjEvent); if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN) { if (direction == DIR_NONE) @@ -357,15 +357,15 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO return TRUE; } - if (playerEventObj->movementDirection != r5) + if (playerObjEvent->movementDirection != r5) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerObjEvent); return FALSE; } if (!sub_808B028(r6)) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerObjEvent); return FALSE; } } @@ -376,11 +376,11 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO return FALSE; } -static void npc_clear_strange_bits(struct EventObject *eventObj) +static void npc_clear_strange_bits(struct ObjectEvent *objEvent) { - eventObj->inanimate = 0; - eventObj->disableAnim = 0; - eventObj->facingDirectionLocked = 0; + objEvent->inanimate = 0; + objEvent->disableAnim = 0; + objEvent->facingDirectionLocked = 0; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; } @@ -410,7 +410,7 @@ static u8 GetForcedMovementByMetatileBehavior(void) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5)) { - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; for (i = 0; i < 18; i++) { @@ -425,11 +425,11 @@ static bool8 ForcedMovement_None(void) { if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->facingDirectionLocked = 0; - playerEventObj->enableAnim = 1; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + playerObjEvent->facingDirectionLocked = 0; + playerObjEvent->enableAnim = 1; + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; } return FALSE; @@ -467,10 +467,10 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8)) static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->disableAnim = 1; - return DoForcedMovement(playerEventObj->movementDirection, a); + playerObjEvent->disableAnim = 1; + return DoForcedMovement(playerObjEvent->movementDirection, a); } static bool8 ForcedMovement_Slip(void) @@ -520,10 +520,10 @@ static bool8 ForcedMovement_PushedEastByCurrent(void) u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - playerEventObj->disableAnim = 1; - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->disableAnim = 1; + playerObjEvent->facingDirectionLocked = 1; return DoForcedMovement(direction, b); } @@ -561,12 +561,12 @@ static bool8 ForcedMovement_0xBC(void) static bool8 ForcedMovement_MuddySlope(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) + if (playerObjEvent->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) { Bike_UpdateBikeCounterSpeed(0); - playerEventObj->facingDirectionLocked = 1; + playerObjEvent->facingDirectionLocked = 1; return DoForcedMovement(1, PlayerGoSpeed2); } else @@ -620,7 +620,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) PlayerJumpLedge(direction); return; } - else if (collision == COLLISION_EVENT_OBJECT && IsPlayerCollidingWithFarawayIslandMew(direction)) + else if (collision == COLLISION_OBJECT_EVENT && IsPlayerCollidingWithFarawayIslandMew(direction)) { PlayerNotOnBikeCollideWithFarawayIslandMew(direction); return; @@ -642,7 +642,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) } if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) - && IsRunningDisallowed(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) == 0) + && IsRunningDisallowed(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) == 0) { PlayerRun(direction); gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; @@ -657,28 +657,28 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) static u8 CheckForPlayerAvatarCollision(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - x = playerEventObj->currentCoords.x; - y = playerEventObj->currentCoords.y; + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return CheckForEventObjectCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return CheckForObjectEventCollision(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } static u8 sub_808B028(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - x = playerEventObj->currentCoords.x; - y = playerEventObj->currentCoords.y; + x = playerObjEvent->currentCoords.x; + y = playerObjEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return sub_808B164(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return sub_808B164(playerObjEvent, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } -u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) +u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); + u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); if (collision == COLLISION_ELEVATION_MISMATCH && CanStopSurfing(x, y, direction)) return COLLISION_STOP_SURFING; @@ -687,7 +687,7 @@ u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u IncrementGameStat(GAME_STAT_JUMPED_DOWN_LEDGES); return COLLISION_LEDGE_JUMP; } - if (collision == COLLISION_EVENT_OBJECT && TryPushBoulder(x, y, direction)) + if (collision == COLLISION_OBJECT_EVENT && TryPushBoulder(x, y, direction)) return COLLISION_PUSHED_BOULDER; if (collision == COLLISION_NONE) @@ -699,9 +699,9 @@ u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u return collision; } -static u8 sub_808B164(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) +static u8 sub_808B164(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); + u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); if (collision == COLLISION_NONE) { @@ -716,7 +716,7 @@ static bool8 CanStopSurfing(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) + && GetObjectEventIdByXYZ(x, y, 3) == OBJECT_EVENTS_COUNT) { CreateStopSurfingTask(direction); return TRUE; @@ -739,17 +739,17 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction) { if (FlagGet(FLAG_SYS_USE_STRENGTH)) { - u8 eventObjectId = GetEventObjectIdByXY(x, y); + u8 objectEventId = GetObjectEventIdByXY(x, y); - if (eventObjectId != 16 && gEventObjects[eventObjectId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) + if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == OBJ_EVENT_GFX_PUSHABLE_BOULDER) { - x = gEventObjects[eventObjectId].currentCoords.x; - y = gEventObjects[eventObjectId].currentCoords.y; + x = gObjectEvents[objectEventId].currentCoords.x; + y = gObjectEvents[objectEventId].currentCoords.y; MoveCoords(direction, &x, &y); - if (GetCollisionAtCoords(&gEventObjects[eventObjectId], x, y, direction) == COLLISION_NONE + if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) { - StartStrengthAnim(eventObjectId, direction); + StartStrengthAnim(objectEventId, direction); return TRUE; } } @@ -774,21 +774,21 @@ static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collis bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) { u8 mewObjectId; - struct EventObject *object; + struct ObjectEvent *object; s16 playerX; s16 playerY; s16 mewPrevX; - object = &gEventObjects[gPlayerAvatar.eventObjectId]; + object = &gObjectEvents[gPlayerAvatar.objectEventId]; playerX = object->currentCoords.x; playerY = object->currentCoords.y; MoveCoords(direction, &playerX, &playerY); - mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); - if (mewObjectId == EVENT_OBJECTS_COUNT) + mewObjectId = GetObjectEventIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); + if (mewObjectId == OBJECT_EVENTS_COUNT) return FALSE; - object = &gEventObjects[mewObjectId]; + object = &gObjectEvents[mewObjectId]; mewPrevX = object->previousCoords.x; if (mewPrevX == playerX) @@ -821,65 +821,65 @@ static void DoPlayerAvatarTransition(void) for (i = 0; i < 8; i++, flags >>= 1) { if (flags & 1) - gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + gUnknown_084974B8[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } gPlayerAvatar.unk1 = 0; } } -static void PlayerAvatarTransition_Dummy(struct EventObject *eventObj) +static void PlayerAvatarTransition_Dummy(struct ObjectEvent *objEvent) { } -static void PlayerAvatarTransition_Normal(struct EventObject *eventObj) +static void PlayerAvatarTransition_Normal(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } -static void PlayerAvatarTransition_MachBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); BikeClearState(0, 0); } -static void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE); BikeClearState(0, 0); Bike_HandleBumpySlopeJump(); } -static void PlayerAvatarTransition_Surfing(struct EventObject *eventObj) +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *objEvent) { u8 spriteId; - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; spriteId = FieldEffectStart(FLDEFF_SURF_BLOB); - eventObj->fieldEffectSpriteId = spriteId; + objEvent->fieldEffectSpriteId = spriteId; sub_81555AC(spriteId, 1); } -static void PlayerAvatarTransition_Underwater(struct EventObject *eventObj) +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER); - eventObj->fieldEffectSpriteId = sub_8155800(eventObj->spriteId); + objEvent->fieldEffectSpriteId = sub_8155800(objEvent->spriteId); } -static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj) +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent) { gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; } @@ -904,7 +904,7 @@ void sub_808B578(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId; + u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId; if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16) @@ -926,27 +926,27 @@ static bool8 sub_808B618(void) static bool8 PlayerIsAnimActive(void) { - return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventIsMovementOverridden(&gObjectEvents[gPlayerAvatar.objectEventId]); } static bool8 PlayerCheckIfAnimFinishedOrInactive(void) { - return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]); } static void PlayerSetCopyableMovement(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a; + gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement = a; } u8 PlayerGetCopyableMovement(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement; + return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement; } static void sub_808B6BC(u8 a) { - EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a); + ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a); } void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) @@ -954,7 +954,7 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) if (!PlayerIsAnimActive()) { PlayerSetCopyableMovement(copyableMovement); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId); } } @@ -1029,7 +1029,7 @@ void sub_808B864(void) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { if (player_should_look_direction_be_enforced_upon_movement()) - sub_808B6BC(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection)); + sub_808B6BC(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection)); } } @@ -1103,7 +1103,7 @@ void sub_808B9D4(u8 direction) static void PlayCollisionSoundIfNotFacingWarp(u8 a) { s16 x, y; - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior)) { @@ -1120,20 +1120,20 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; MoveCoords(GetPlayerFacingDirection(), x, y); } void PlayerGetDestCoords(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; } u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2]) { @@ -1168,22 +1168,22 @@ u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) u8 GetPlayerFacingDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].facingDirection; } u8 GetPlayerMovementDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection; } u8 PlayerGetZCoord(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation; + return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation; } void sub_808BC90(s16 x, s16 y) { - MoveEventObjectToMapCoords(&gEventObjects[gPlayerAvatar.eventObjectId], x, y); + MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y); } u8 TestPlayerAvatarFlags(u8 a) @@ -1208,10 +1208,10 @@ void sub_808BCE8(void) void sub_808BCF4(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - npc_clear_strange_bits(playerEventObj); - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + npc_clear_strange_bits(playerObjEvent); + SetObjectEventDirection(playerObjEvent, playerObjEvent->facingDirection); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { Bike_HandleBumpySlopeJump(); @@ -1248,14 +1248,14 @@ u8 unref_GetRivalAvatarGenderByGraphicsId(u8 gfxId) { switch (gfxId) { - case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - case EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE: - case EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE: - case EVENT_OBJ_GFX_RIVAL_MAY_SURFING: - case EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE: - case EVENT_OBJ_GFX_MAY_UNDERWATER: - case EVENT_OBJ_GFX_MAY_FISHING: - case EVENT_OBJ_GFX_MAY_WATERING: + case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: + case OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE: + case OBJ_EVENT_GFX_RIVAL_MAY_ACRO_BIKE: + case OBJ_EVENT_GFX_RIVAL_MAY_SURFING: + case OBJ_EVENT_GFX_RIVAL_MAY_FIELD_MOVE: + case OBJ_EVENT_GFX_MAY_UNDERWATER: + case OBJ_EVENT_GFX_MAY_FISHING: + case OBJ_EVENT_GFX_MAY_WATERING: return FEMALE; default: return MALE; @@ -1266,14 +1266,14 @@ u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId) { switch (gfxId) { - case EVENT_OBJ_GFX_MAY_NORMAL: - case EVENT_OBJ_GFX_MAY_MACH_BIKE: - case EVENT_OBJ_GFX_MAY_ACRO_BIKE: - case EVENT_OBJ_GFX_MAY_SURFING: - case EVENT_OBJ_GFX_MAY_FIELD_MOVE: - case EVENT_OBJ_GFX_MAY_UNDERWATER: - case EVENT_OBJ_GFX_MAY_FISHING: - case EVENT_OBJ_GFX_MAY_WATERING: + case OBJ_EVENT_GFX_MAY_NORMAL: + case OBJ_EVENT_GFX_MAY_MACH_BIKE: + case OBJ_EVENT_GFX_MAY_ACRO_BIKE: + case OBJ_EVENT_GFX_MAY_SURFING: + case OBJ_EVENT_GFX_MAY_FIELD_MOVE: + case OBJ_EVENT_GFX_MAY_UNDERWATER: + case OBJ_EVENT_GFX_MAY_FISHING: + case OBJ_EVENT_GFX_MAY_WATERING: return FEMALE; default: return MALE; @@ -1307,12 +1307,12 @@ bool8 IsPlayerSurfingNorth(void) bool8 IsPlayerFacingSurfableFishableWater(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - s16 x = playerEventObj->currentCoords.x; - s16 y = playerEventObj->currentCoords.y; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + s16 x = playerObjEvent->currentCoords.x; + s16 y = playerObjEvent->currentCoords.y; - MoveCoords(playerEventObj->facingDirection, &x, &y); - if (GetCollisionAtCoords(playerEventObj, x, y, playerEventObj->facingDirection) == COLLISION_ELEVATION_MISMATCH + MoveCoords(playerObjEvent->facingDirection, &x, &y); + if (GetCollisionAtCoords(playerObjEvent, x, y, playerObjEvent->facingDirection) == COLLISION_ELEVATION_MISMATCH && PlayerGetZCoord() == 3 && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y))) return TRUE; @@ -1366,87 +1366,87 @@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) { - struct EventObjectTemplate playerEventObjTemplate; - u8 eventObjectId; - struct EventObject *eventObject; - - playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER; - playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); - playerEventObjTemplate.x = x - 7; - playerEventObjTemplate.y = y - 7; - playerEventObjTemplate.elevation = 0; - playerEventObjTemplate.movementType = MOVEMENT_TYPE_PLAYER; - playerEventObjTemplate.movementRangeX = 0; - playerEventObjTemplate.movementRangeY = 0; - playerEventObjTemplate.trainerType = 0; - playerEventObjTemplate.trainerRange_berryTreeId = 0; - playerEventObjTemplate.script = NULL; - playerEventObjTemplate.flagId = 0; - eventObjectId = SpawnSpecialEventObject(&playerEventObjTemplate); - eventObject = &gEventObjects[eventObjectId]; - eventObject->isPlayer = 1; - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); - EventObjectTurn(eventObject, direction); + struct ObjectEventTemplate playerObjEventTemplate; + u8 objectEventId; + struct ObjectEvent *objectEvent; + + playerObjEventTemplate.localId = OBJ_EVENT_ID_PLAYER; + playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); + playerObjEventTemplate.x = x - 7; + playerObjEventTemplate.y = y - 7; + playerObjEventTemplate.elevation = 0; + playerObjEventTemplate.movementType = MOVEMENT_TYPE_PLAYER; + playerObjEventTemplate.movementRangeX = 0; + playerObjEventTemplate.movementRangeY = 0; + playerObjEventTemplate.trainerType = 0; + playerObjEventTemplate.trainerRange_berryTreeId = 0; + playerObjEventTemplate.script = NULL; + playerObjEventTemplate.flagId = 0; + objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate); + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->isPlayer = 1; + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); + ObjectEventTurn(objectEvent, direction); ClearPlayerAvatarInfo(); gPlayerAvatar.runningState = NOT_MOVING; gPlayerAvatar.tileTransitionState = T_NOT_MOVING; - gPlayerAvatar.eventObjectId = eventObjectId; - gPlayerAvatar.spriteId = eventObject->spriteId; + gPlayerAvatar.objectEventId = objectEventId; + gPlayerAvatar.spriteId = objectEvent->spriteId; gPlayerAvatar.gender = gender; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT); } void sub_808C0A8(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].invisible = a; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = a; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a; + gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = a; } void sub_808C114(void) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); } void sub_808C15C(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); } void sub_808C1B4(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1); } void sub_808C228(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction)); } -static void sub_808C280(struct EventObject *eventObject) +static void sub_808C280(struct ObjectEvent *objectEvent) { s16 x; s16 y; u8 direction; - u8 metatileBehavior = eventObject->currentMetatileBehavior; + u8 metatileBehavior = objectEvent->currentMetatileBehavior; for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++) { - if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection) + if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection) { - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - ShowWarpArrowSprite(eventObject->warpArrowSpriteId, direction, x, y); + ShowWarpArrowSprite(objectEvent->warpArrowSpriteId, direction, x, y); return; } } - SetSpriteInvisible(eventObject->warpArrowSpriteId); + SetSpriteInvisible(objectEvent->warpArrowSpriteId); } /* Strength */ @@ -1463,12 +1463,12 @@ static void StartStrengthAnim(u8 a, u8 b) static void Task_BumpBoulder(u8 taskId) { while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId], - &gEventObjects[gPlayerAvatar.eventObjectId], - &gEventObjects[gTasks[taskId].data[1]])) + &gObjectEvents[gPlayerAvatar.objectEventId], + &gObjectEvents[gTasks[taskId].data[1]])) ; } -static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1476,25 +1476,25 @@ static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, st return FALSE; } -static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectIsHeldMovementActive(playerObject)) + if (ObjectEventIsHeldMovementActive(playerObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(playerObject); } - if (EventObjectIsHeldMovementActive(strengthObject)) + if (ObjectEventIsHeldMovementActive(strengthObject)) { - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); } - if (!EventObjectIsMovementOverridden(playerObject) - && !EventObjectIsMovementOverridden(strengthObject)) + if (!ObjectEventIsMovementOverridden(playerObject) + && !ObjectEventIsMovementOverridden(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); - EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); - EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); + ObjectEventSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); + ObjectEventSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); gFieldEffectArguments[0] = strengthObject->currentCoords.x; gFieldEffectArguments[1] = strengthObject->currentCoords.y; gFieldEffectArguments[2] = strengthObject->previousElevation; @@ -1506,13 +1506,13 @@ static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject return FALSE; } -static bool8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectCheckHeldMovementStatus(playerObject) - && EventObjectCheckHeldMovementStatus(strengthObject)) + if (ObjectEventCheckHeldMovementStatus(playerObject) + && ObjectEventCheckHeldMovementStatus(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroyTask(FindTaskIdByFunc(Task_BumpBoulder)); @@ -1529,18 +1529,18 @@ static void DoPlayerMatJump(void) static void DoPlayerAvatarSecretBaseMatJump(u8 taskId) { - while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } // because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump. -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject) +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent) { gPlayerAvatar.preventStep = TRUE; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { PlaySE(SE_DANSA); - EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) { @@ -1563,29 +1563,29 @@ static void DoPlayerMatSpin(void) static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId) { - while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent) { task->data[0]++; - task->data[1] = eventObject->movementDirection; + task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); return TRUE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent) { u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { u8 direction; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(direction = directions[objectEvent->movementDirection - 1])); if (direction == (u8)task->data[1]) task->data[2]++; task->data[0]++; @@ -1595,7 +1595,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct Event return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent) { const u8 actions[] = { MOVEMENT_ACTION_DELAY_1, @@ -1605,19 +1605,19 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct Event MOVEMENT_ACTION_DELAY_8, }; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, actions[task->data[2]]); + ObjectEventSetHeldMovement(objectEvent, actions[task->data[2]]); task->data[0] = 1; } return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); ScriptContext2_Disable(); gPlayerAvatar.preventStep = FALSE; DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin)); @@ -1642,29 +1642,29 @@ static void CreateStopSurfingTask(u8 direction) static void Task_StopSurfingInit(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectIsMovementOverridden(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent)) { - if (!EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent)) return; } - sub_81555AC(playerEventObj->fieldEffectSpriteId, 2); - EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); + sub_81555AC(playerObjEvent->fieldEffectSpriteId, 2); + ObjectEventSetHeldMovement(playerObjEvent, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = Task_WaitStopSurfing; } static void Task_WaitStopSurfing(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - EventObjectSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); + ObjectEventSetGraphicsId(playerObjEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventSetHeldMovement(playerObjEvent, GetFaceDirectionMovementAction(playerObjEvent->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]); + DestroySprite(&gSprites[playerObjEvent->fieldEffectSpriteId]); DestroyTask(taskId); } } @@ -1729,17 +1729,17 @@ static bool8 Fishing1(struct Task *task) static bool8 Fishing2(struct Task *task) { - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; const s16 arr1[] = {1, 1, 1}; const s16 arr2[] = {1, 3, 6}; task->tRoundsPlayed = 0; task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]); - task->tPlayerGfxId = gEventObjects[gPlayerAvatar.eventObjectId].graphicsId; - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(playerEventObj); - playerEventObj->enableAnim = 1; - sub_808C15C(playerEventObj->facingDirection); + task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(playerObjEvent); + playerObjEvent->enableAnim = 1; + sub_808C15C(playerObjEvent->facingDirection); task->tStep++; return FALSE; } @@ -1928,12 +1928,12 @@ static bool8 Fishing11(struct Task *task) { if (!IsTextPrinterActive(0)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId); + ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; ClearDialogWindowAndFrame(0, TRUE); @@ -1988,12 +1988,12 @@ static bool8 Fishing15(struct Task *task) AlignFishingAnimationFrames(); if (gSprites[gPlayerAvatar.spriteId].animEnded) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerObjEvent, task->tPlayerGfxId); + ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; task->tStep++; @@ -2008,7 +2008,7 @@ static bool8 Fishing16(struct Task *task) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ClearDialogWindowAndFrame(0, TRUE); sub_80ED950(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); @@ -2052,7 +2052,7 @@ static void AlignFishingAnimationFrames(void) if (animType == 10 || animType == 11) playerSprite->pos2.y = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } void sub_808D074(u8 a0) @@ -2071,14 +2071,14 @@ static u8 sub_808D080(void) static void sub_808D094(u8 taskId) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; switch (data[0]) { case 0: - if (!EventObjectClearHeldMovementIfFinished(object)) + if (!ObjectEventClearHeldMovementIfFinished(object)) { return; } @@ -2136,7 +2136,7 @@ static const u8 gUnknown_084975BC[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, static void sub_808D1FC(u8 taskId) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; @@ -2144,7 +2144,7 @@ static void sub_808D1FC(u8 taskId) { case 0: data[5] = sub_808D080(); - EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); data[1] = 0; data[2] = 116; data[4] = sprite->pos1.y; @@ -2195,19 +2195,19 @@ static void sub_808D1FC(u8 taskId) } } -static u8 sub_808D38C(struct EventObject *object, s16 *a1) +static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1) { if (*a1 < 8 && ++(*a1) < 8) { return object->facingDirection; } - if (!EventObjectCheckHeldMovementStatus(object)) + if (!ObjectEventCheckHeldMovementStatus(object)) { return object->facingDirection; } - EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); *a1 = 0; return gUnknown_084975BC[object->facingDirection]; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 076859c28..4b2f95ef0 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -5,6 +5,7 @@ #include "field_camera.h" #include "field_door.h" #include "field_effect.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_player_avatar.h" #include "field_screen_effect.h" @@ -17,7 +18,6 @@ #include "main.h" #include "menu.h" #include "mirage_tower.h" -#include "event_obj_lock.h" #include "metatile_behavior.h" #include "palette.h" #include "overworld.h" @@ -27,11 +27,10 @@ #include "start_menu.h" #include "task.h" #include "text.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/songs.h" #include "constants/rgb.h" #include "trainer_hill.h" -#include "event_obj_lock.h" #include "fldeff.h" extern const u16 gOrbEffectBackgroundLayerFlags[]; @@ -327,7 +326,7 @@ static void sub_80AF438(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); task->data[0] = 1; @@ -335,27 +334,27 @@ static void sub_80AF438(u8 taskId) case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); task->data[0] = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 4; } break; @@ -376,24 +375,24 @@ static void task_map_chg_seq_0807E20C(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); task->data[0] = 1; break; case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 3; } break; @@ -409,14 +408,14 @@ static void task_map_chg_seq_0807E2CC(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); gTasks[taskId].data[0]++; break; case 1: if (WaitForWeatherFadeIn()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -452,7 +451,7 @@ static void task_mpl_807E3C8(u8 taskId) { ScriptContext2_Disable(); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); } } @@ -560,7 +559,7 @@ void DoMossdeepGymWarp(void) { sub_8085540(1); ScriptContext2_Enable(); - SaveEventObjects(); + SaveObjectEvents(); TryFadeOutOldMapMusic(); WarpFadeScreen(); PlaySE(SE_TK_WARPIN); @@ -650,7 +649,7 @@ static void sub_80AFA0C(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -683,7 +682,7 @@ static void sub_80AFA88(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); @@ -692,21 +691,21 @@ static void sub_80AFA88(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + u8 objEventId; + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); sub_80AF0F4(0); task->data[0] = 3; } @@ -734,7 +733,7 @@ static void task0A_fade_n_map_maybe(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -1001,7 +1000,7 @@ static void task0A_mpl_807E31C(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); sub_808D194(); gTasks[taskId].data[0]++; @@ -1009,7 +1008,7 @@ static void task0A_mpl_807E31C(u8 taskId) case 1: if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -1024,7 +1023,7 @@ static void sub_80B01BC(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); sub_808D1C8(); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 439b1855a..f5d3abce6 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -14,7 +14,7 @@ #include "sprite.h" #include "task.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_specials.h" #include "constants/songs.h" #include "constants/vars.h" @@ -283,7 +283,7 @@ void Task_HandlePorthole(u8 taskId) case IDLE_CHECK: if (gMain.newKeys & A_BUTTON) data[1] = 1; - if (!ScriptMovement_IsObjectMovementFinished(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup)) + if (!ScriptMovement_IsObjectMovementFinished(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup)) return; if (CountSSTidalStep(1) == TRUE) { @@ -305,12 +305,12 @@ void Task_HandlePorthole(u8 taskId) if (*cruiseState == SS_TIDAL_DEPART_SLATEPORT) { - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailEastMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailEastMovementScript); data[0] = IDLE_CHECK; } else { - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailWestMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, location->mapNum, location->mapGroup, sSSTidalSailWestMovementScript); data[0] = IDLE_CHECK; } break; @@ -326,7 +326,7 @@ void Task_HandlePorthole(u8 taskId) static void ShowSSTidalWhileSailing(void) { - u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; @@ -339,7 +339,7 @@ static void ShowSSTidalWhileSailing(void) void sub_80FB768(void) { ShowSSTidalWhileSailing(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/field_specials.c b/src/field_specials.c index bffb9f591..143e61477 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -48,7 +48,7 @@ #include "constants/battle_frontier.h" #include "constants/decorations.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" #include "constants/field_specials.h" #include "constants/items.h" @@ -87,17 +87,17 @@ static EWRAM_DATA u32 sUnknown_0203AB70 = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; void TryLoseFansFromPlayTime(void); void SetPlayerGotFirstFans(void); u16 GetNumFansOfPlayerInTrainerFanClub(void); static void RecordCyclingRoadResults(u32, u8); -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId); static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId); static void Task_PCTurnOnEffect(u8); @@ -521,7 +521,7 @@ u8 GetLinkPartnerNames(void) return nLinkPlayers; } -void SpawnLinkPartnerEventObject(void) +void SpawnLinkPartnerObjectEvent(void) { u8 j = 0; s16 x = 0; @@ -575,25 +575,25 @@ void SpawnLinkPartnerEventObject(void) case VERSION_RUBY: case VERSION_SAPPHIRE: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_LINK_RS_BRENDAN; + linkSpriteId = OBJ_EVENT_GFX_LINK_RS_BRENDAN; else - linkSpriteId = EVENT_OBJ_GFX_LINK_RS_MAY; + linkSpriteId = OBJ_EVENT_GFX_LINK_RS_MAY; break; case VERSION_EMERALD: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL; else - linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL; break; default: if (gLinkPlayers[i].gender == 0) - linkSpriteId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL; else - linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; + linkSpriteId = OBJ_EVENT_GFX_RIVAL_MAY_NORMAL; break; } - SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); - LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 240 - i, i); + SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); + LoadLinkPartnerObjectEventSpritePalette(linkSpriteId, 240 - i, i); j++; if (j == MAX_LINK_PLAYERS) { @@ -603,36 +603,36 @@ void SpawnLinkPartnerEventObject(void) } } -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) { u8 adjustedPaletteNum; // Note: This temp var is necessary; paletteNum += 6 doesn't match. adjustedPaletteNum = paletteNum + 6; - if (graphicsId == EVENT_OBJ_GFX_LINK_RS_BRENDAN || - graphicsId == EVENT_OBJ_GFX_LINK_RS_MAY || - graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL || - graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) + if (graphicsId == OBJ_EVENT_GFX_LINK_RS_BRENDAN || + graphicsId == OBJ_EVENT_GFX_LINK_RS_MAY || + graphicsId == OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL || + graphicsId == OBJ_EVENT_GFX_RIVAL_MAY_NORMAL) { - u8 obj = GetEventObjectIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (obj != EVENT_OBJECTS_COUNT) + u8 obj = GetObjectEventIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + if (obj != OBJECT_EVENTS_COUNT) { - u8 spriteId = gEventObjects[obj].spriteId; + u8 spriteId = gObjectEvents[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; sprite->oam.paletteNum = adjustedPaletteNum; switch (graphicsId) { - case EVENT_OBJ_GFX_LINK_RS_BRENDAN: - LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_LINK_RS_BRENDAN: + LoadPalette(gObjectEventPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_LINK_RS_MAY: - LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_LINK_RS_MAY: + LoadPalette(gObjectEventPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: - LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL: + LoadPalette(gObjectEventPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); break; - case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); + case OBJ_EVENT_GFX_RIVAL_MAY_NORMAL: + LoadPalette(gObjectEventPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); break; } } @@ -1304,15 +1304,15 @@ void IsGrassTypeInParty(void) void SpawnCameraObject(void) { - u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); - gEventObjects[obj].invisible = TRUE; - CameraObjectSetFollowedObjectId(gEventObjects[obj].spriteId); + u8 obj = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + gObjectEvents[obj].invisible = TRUE; + CameraObjectSetFollowedObjectId(gObjectEvents[obj].spriteId); } void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1585,9 +1585,9 @@ u16 ScriptGetPartyMonSpecies(void) } // Removed for Emerald -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - //TryInitLocalEventObject(6); + //TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) @@ -2843,11 +2843,11 @@ void SetBattleTowerLinkPlayerGfx(void) { if (gLinkPlayers[i].gender == MALE) { - VarSet(VAR_OBJ_GFX_ID_F - i, EVENT_OBJ_GFX_BRENDAN_NORMAL); + VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_BRENDAN_NORMAL); } else { - VarSet(VAR_OBJ_GFX_ID_F - i, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL); + VarSet(VAR_OBJ_GFX_ID_F - i, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL); } } } @@ -3433,9 +3433,9 @@ static void Task_DeoxysRockInteraction(u8 taskId) static void ChangeDeoxysRockLevel(u8 rockLevel) { - u8 eventObjectId; + u8 objectEventId; LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8); - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) PlaySE(SE_W109); @@ -3455,7 +3455,7 @@ static void ChangeDeoxysRockLevel(u8 rockLevel) gFieldEffectArguments[5] = 5; FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK); - Overworld_SetEventObjTemplateCoords(1, sDeoxysRockCoords[rockLevel][0], sDeoxysRockCoords[rockLevel][1]); + Overworld_SetObjEventTemplateCoords(1, sDeoxysRockCoords[rockLevel][0], sDeoxysRockCoords[rockLevel][1]); } static void WaitForDeoxysRockMovement(u8 taskId) diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index a0160344e..88927959e 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -1,5 +1,5 @@ #include "global.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "faraway_island.h" #include "field_camera.h" @@ -145,7 +145,7 @@ bool8 SetUpFieldMove_Cut(void) bool8 cutTiles[CUT_NORMAL_AREA]; bool8 ret; - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE) { // Standing in front of cuttable tree. gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; @@ -580,7 +580,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS); FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); if (IsMewPlayingHideAndSeek() == TRUE) diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 591f61eb7..ab20713d2 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -70,7 +70,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4 static const u8 gUnusedEmptySpace_858DBF8[32] = {0}; -static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"); +static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal"); static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp"); static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp"); static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp"); @@ -82,7 +82,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4 static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp"); static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp"); static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp"); -static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"); +static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal"); static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp"); static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp"); static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp"); @@ -317,7 +317,7 @@ static const struct SpriteTemplate gUnknown_0858E880 = { .tileTag = 0xFFFF, .paletteTag = 0x1000, - .oam = &gEventObjectBaseOam_32x8, + .oam = &gObjectEventBaseOam_32x8, .anims = gSpriteAnimTable_858E87C, .images = gUnknown_0858E84C, .affineAnims = gDummySpriteAffineAnimTable, @@ -1002,8 +1002,8 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) void DoSecretBaseGlitterMatSparkle(void) { - s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + s16 x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + s16 y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; u8 spriteId; sub_80930E0(&x, &y, 8, 4); @@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerEventObj) - || EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventIsMovementOverridden(playerObjEvent) + || ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { sub_808C228(GetPlayerFacingDirection()); - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); else gTasks[taskId].func = Task_WateringBerryTreeAnim_3; diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 18cebdf11..614fa6135 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -13,7 +13,7 @@ #include "sound.h" #include "sprite.h" #include "task.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/field_effects.h" #include "constants/map_types.h" @@ -30,18 +30,18 @@ static void sub_8135714(void); // text bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) { - u8 eventObjId; + u8 objEventId; GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gEventObjects[eventObjId].graphicsId != graphicsId) + objEventId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[objEventId].graphicsId != graphicsId) { return FALSE; } else { - gSpecialVar_LastTalked = gEventObjects[eventObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[objEventId].localId; return TRUE; } } @@ -54,13 +54,13 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { - u8 eventObjId; + u8 objEventId; ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; - eventObjId = gPlayerAvatar.eventObjectId; - if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId]) - || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + objEventId = gPlayerAvatar.objectEventId; + if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) else { sub_808C114(); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); gTasks[taskId].func = sub_813552C; } } @@ -78,7 +78,7 @@ static void task08_080C9820(u8 taskId) static void sub_813552C(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_8135578; @@ -98,7 +98,7 @@ static void sub_8135578(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_813561C; @@ -125,7 +125,7 @@ bool8 SetUpFieldMove_RockSmash(void) gPostMenuFieldCallback = SetUpPuzzleEffectRegirock; return TRUE; } - else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + else if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_81356C4; diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index 47fc7061c..f479ef68d 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -17,7 +17,7 @@ static void sub_8145E74(void); // text bool8 SetUpFieldMove_Strength(void) { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) == TRUE) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/frontier_util.c b/src/frontier_util.c index 084be4fe2..4f7ab1ba6 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -71,7 +71,7 @@ static void RestoreHeldItems(void); static void SaveRecordBattle(void); static void BufferFrontierTrainerName(void); static void ResetSketchedMoves(void); -static void SetFacilityBrainEventObject(void); +static void SetFacilityBrainObjectEvent(void); static void ShowTowerResultsWindow(u8); static void ShowDomeResultsWindow(u8); static void ShowPalaceResultsWindow(u8); @@ -628,7 +628,7 @@ static void (* const sFrontierUtilFuncs[])(void) = [FRONTIER_UTIL_FUNC_SAVE_BATTLE] = SaveRecordBattle, [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName, [FRONTIER_UTIL_FUNC_RESET_SKETCH_MOVES] = ResetSketchedMoves, - [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainEventObject, + [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainObjectEvent, }; static const struct WindowTemplate sFrontierResultsWindowTemplate = @@ -667,13 +667,13 @@ static const struct WindowTemplate sRankingHallRecordsWindowTemplate = // Second field - whether the character is female. static const u8 sFrontierBrainObjEventGfx[NUM_FRONTIER_FACILITIES][2] = { - [FRONTIER_FACILITY_TOWER] = {EVENT_OBJ_GFX_ANABEL, TRUE}, - [FRONTIER_FACILITY_DOME] = {EVENT_OBJ_GFX_TUCKER, FALSE}, - [FRONTIER_FACILITY_PALACE] = {EVENT_OBJ_GFX_SPENSER, FALSE}, - [FRONTIER_FACILITY_ARENA] = {EVENT_OBJ_GFX_GRETA, TRUE}, - [FRONTIER_FACILITY_FACTORY] = {EVENT_OBJ_GFX_NOLAND, FALSE}, - [FRONTIER_FACILITY_PIKE] = {EVENT_OBJ_GFX_LUCY, TRUE}, - [FRONTIER_FACILITY_PYRAMID] = {EVENT_OBJ_GFX_BRANDON, FALSE}, + [FRONTIER_FACILITY_TOWER] = {OBJ_EVENT_GFX_ANABEL, TRUE}, + [FRONTIER_FACILITY_DOME] = {OBJ_EVENT_GFX_TUCKER, FALSE}, + [FRONTIER_FACILITY_PALACE] = {OBJ_EVENT_GFX_SPENSER, FALSE}, + [FRONTIER_FACILITY_ARENA] = {OBJ_EVENT_GFX_GRETA, TRUE}, + [FRONTIER_FACILITY_FACTORY] = {OBJ_EVENT_GFX_NOLAND, FALSE}, + [FRONTIER_FACILITY_PIKE] = {OBJ_EVENT_GFX_LUCY, TRUE}, + [FRONTIER_FACILITY_PYRAMID] = {OBJ_EVENT_GFX_BRANDON, FALSE}, }; const u16 gFrontierBannedSpecies[] = @@ -2214,9 +2214,9 @@ static void ResetSketchedMoves(void) } } -static void SetFacilityBrainEventObject(void) +static void SetFacilityBrainObjectEvent(void) { - SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY)); + SetFrontierBrainObjEventGfx(VarGet(VAR_FRONTIER_FACILITY)); } // Battle Frontier Ranking Hall records. @@ -2478,7 +2478,7 @@ bool8 IsFrontierBrainFemale(void) return sFrontierBrainObjEventGfx[facility][1]; } -void SetFrontierBrainEventObjGfx_2(void) +void SetFrontierBrainObjEventGfx_2(void) { s32 facility = VarGet(VAR_FRONTIER_FACILITY); VarSet(VAR_OBJ_GFX_ID_0, sFrontierBrainObjEventGfx[facility][0]); @@ -2781,7 +2781,7 @@ u16 GetFrontierBrainMonSpecies(u8 monId) return sFrontierBrainsMons[facility][symbol][monId].species; } -void SetFrontierBrainEventObjGfx(u8 facility) +void SetFrontierBrainObjEventGfx(u8 facility) { gTrainerBattleOpponent_A = TRAINER_FRONTIER_BRAIN; VarSet(VAR_OBJ_GFX_ID_0, sFrontierBrainObjEventGfx[facility][0]); diff --git a/src/item_menu.c b/src/item_menu.c index 3c5095551..6c9480d0b 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1891,7 +1891,7 @@ bool8 UseRegisteredKeyItemOnField(void) if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; diff --git a/src/item_use.c b/src/item_use.c index 0b7625054..54169db1c 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -9,6 +9,7 @@ #include "coins.h" #include "data.h" #include "event_data.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "fieldmap.h" #include "field_effect.h" @@ -34,14 +35,13 @@ #include "string_util.h" #include "task.h" #include "text.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/event_objects.h" #include "constants/flags.h" #include "constants/item_effects.h" #include "constants/items.h" #include "constants/songs.h" #include "constants/vars.h" -#include "event_obj_lock.h" extern u8 BerryTree_EventScript_ItemUsePlantBerry[]; extern u8 BerryTree_EventScript_ItemUseWailmerPail[]; @@ -176,7 +176,7 @@ void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) { ClearDialogWindowAndFrame(0, 1); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } @@ -231,7 +231,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) GetOnOffBike(2); else GetOnOffBike(4); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -337,7 +337,7 @@ void sub_80FD504(u8 taskId) void sub_80FD5CC(u8 taskId) { ClearDialogWindowAndFrame(0, 1); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -558,15 +558,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); + UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -574,7 +574,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); @@ -706,8 +706,8 @@ bool8 TryToWaterSudowoodo(void) u8 objId; GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); - objId = GetEventObjectIdByXYZ(x, y, z); - if (objId == EVENT_OBJECTS_COUNT || gEventObjects[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) + objId = GetObjectEventIdByXYZ(x, y, z); + if (objId == OBJECT_EVENTS_COUNT || gObjectEvents[objId].graphicsId != OBJ_EVENT_GFX_SUDOWOODO) return FALSE; else return TRUE; diff --git a/src/load_save.c b/src/load_save.c index 24dfda20c..8459cd96b 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -181,32 +181,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i]; } -void SaveEventObjects(void) +void SaveObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i]; } -void LoadEventObjects(void) +void LoadObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveEventObjects(); + SaveObjectEvents(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadEventObjects(); + LoadObjectEvents(); } void LoadPlayerBag(void) diff --git a/src/match_call.c b/src/match_call.c index 646b14cea..fec01c801 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1114,7 +1114,7 @@ static void StartMatchCall(void) if (!gMatchCallState.triggeredFromScript) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -1288,10 +1288,10 @@ static bool32 sub_81963F0(u8 taskId) if (!gMatchCallState.triggeredFromScript) { sub_81973A4(); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index add48efd8..8fea7c098 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -137,7 +137,7 @@ void SetMauvilleOldMan(void) SetupGiddy(); break; } - ScrSpecial_SetMauvilleOldManEventObjGfx(); + ScrSpecial_SetMauvilleOldManObjEventGfx(); } u8 GetCurrentMauvilleOldMan(void) @@ -407,7 +407,7 @@ void ResetMauvilleOldManFlag(void) case MAUVILLE_MAN_GIDDY: break; } - ScrSpecial_SetMauvilleOldManEventObjGfx(); + ScrSpecial_SetMauvilleOldManObjEventGfx(); } @@ -674,9 +674,9 @@ static void Task_BardSong(u8 taskId) RunTextPrintersAndIsPrinter0Active(); } -void ScrSpecial_SetMauvilleOldManEventObjGfx(void) +void ScrSpecial_SetMauvilleOldManObjEventGfx(void) { - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD); } // Language fixers? diff --git a/src/mevent_client.c b/src/mevent_client.c index 659b772df..9a62bf18e 100644 --- a/src/mevent_client.c +++ b/src/mevent_client.c @@ -216,7 +216,7 @@ static u32 mainseq_4(struct mevent_client * svr) sub_801B508(svr->recvBuffer); break; case 17: - InitRamScript_NoEventObject(svr->recvBuffer, 1000); + InitRamScript_NoObjectEvent(svr->recvBuffer, 1000); break; case 18: memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, svr->recvBuffer, 0xbc); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index bb93bb497..2a6d6d6c4 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -346,16 +346,16 @@ void StartPlayerDescendMirageTower(void) static void PlayerDescendMirageTower(u8 taskId) { - u8 eventObjectId; - struct EventObject *fakePlayerEventObject; - struct EventObject *playerEventObject; - - TryGetEventObjectIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - fakePlayerEventObject = &gEventObjects[eventObjectId]; - gSprites[fakePlayerEventObject->spriteId].pos2.y += 4; - playerEventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((gSprites[fakePlayerEventObject->spriteId].pos1.y + gSprites[fakePlayerEventObject->spriteId].pos2.y) >= - (gSprites[playerEventObject->spriteId].pos1.y + gSprites[playerEventObject->spriteId].pos2.y)) + u8 objectEventId; + struct ObjectEvent *fakePlayerObjectEvent; + struct ObjectEvent *playerObjectEvent; + + TryGetObjectEventIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + fakePlayerObjectEvent = &gObjectEvents[objectEventId]; + gSprites[fakePlayerObjectEvent->spriteId].pos2.y += 4; + playerObjectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((gSprites[fakePlayerObjectEvent->spriteId].pos1.y + gSprites[fakePlayerObjectEvent->spriteId].pos2.y) >= + (gSprites[playerObjectEvent->spriteId].pos1.y + gSprites[playerObjectEvent->spriteId].pos2.y)) { DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/naming_screen.c b/src/naming_screen.c index 04258de0c..480f62064 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1172,7 +1172,7 @@ static void NamingScreen_CreatePlayerIcon(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); - spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } @@ -1199,7 +1199,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(OBJ_EVENT_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index c288f2e00..bb0f40a56 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -141,7 +141,7 @@ static void ResetAllTradingStates(void); static void UpdateHeldKeyCode(u16); static void UpdateAllLinkPlayers(u16*, s32); static u8 FlipVerticalAndClearForced(u8 a1, u8 a2); -static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y); +static u8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 a2, s16 x, s16 y); static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion); static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y); static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId); @@ -149,15 +149,15 @@ static u8 GetLinkPlayerElevation(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId); static u8 GetLinkPlayerIdAt(s16 x, s16 y); static void SetPlayerFacingDirection(u8 linkPlayerId, u8 a2); -static void ZeroEventObject(struct EventObject *eventObj); -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y); +static void ZeroObjectEvent(struct ObjectEvent *objEvent); +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4); +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y); static void sub_80877DC(u8 linkPlayerId, u8 a2); static void sub_808780C(u8 linkPlayerId); static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId); static void sub_8087584(void); static u32 GetLinkSendQueueLength(void); -static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerObjEvent); static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); static u16 GetDirectionForEventScript(const u8 *script); static void sub_8087510(void); @@ -217,7 +217,7 @@ EWRAM_DATA static u16 sLastMapSectionId = 0; EWRAM_DATA static struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0}; EWRAM_DATA static u16 sAmbientCrySpecies = 0; EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE; -EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0}; +EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {0}; // const rom data static const struct WarpData sDummyWarpData = @@ -338,23 +338,23 @@ static const struct ScanlineEffectParams sFlashEffectParams = 0, }; -static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED }; -static u8 FacingHandler_DoNothing(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); // These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. -static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { FacingHandler_DoNothing, FacingHandler_DpadMovement, @@ -369,11 +369,11 @@ static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject * FacingHandler_ForcedFacingChange, }; -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *, struct EventObject *); -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *, struct EventObject *); +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *, struct ObjectEvent *); +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *, struct ObjectEvent *); // These handlers are run after an attempted movement. -static void (*const gMovementStatusHandler[])(struct LinkPlayerEventObject *, struct EventObject *) = +static void (*const gMovementStatusHandler[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) = { // FALSE: MovementStatusHandler_EnterFreeMode, @@ -493,55 +493,55 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey) ApplyNewEncryptionKeyToWord(&gSaveBlock1Ptr->gameStats[i], newKey); } -void LoadEventObjTemplatesFromHeader(void) +void LoadObjEventTemplatesFromHeader(void) { // Clear map object templates - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); // Copy map header events to save block - CpuCopy32(gMapHeader.events->eventObjects, - gSaveBlock1Ptr->eventObjectTemplates, - gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); + CpuCopy32(gMapHeader.events->objectEvents, + gSaveBlock1Ptr->objectEventTemplates, + gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate)); } -void LoadSaveblockEventObjScripts(void) +void LoadSaveblockObjEventScripts(void) { - struct EventObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->eventObjects; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *mapHeaderObjTemplates = gMapHeader.events->objectEvents; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; s32 i; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) savObjTemplates[i].script = mapHeaderObjTemplates[i].script; } -void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) +void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { - struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->x = x; - eventObjectTemplate->y = y; + objectEventTemplate->x = x; + objectEventTemplate->y = y; return; } } } -void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) +void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType) { s32 i; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { - struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; return; } } @@ -814,7 +814,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) ApplyCurrentWarp(); LoadCurrentMapData(); - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); TrySetMapSaveWarpStatus(); ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); @@ -853,11 +853,11 @@ static void mli0_load_map(u32 a1) if (!(sUnknown_020322D8 & 1)) { if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - LoadBattlePyramidEventObjectTemplates(); + LoadBattlePyramidObjectEventTemplates(); else if (InTrainerHill()) - LoadTrainerHillEventObjectTemplates(); + LoadTrainerHillObjectEventTemplates(); else - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); } isOutdoors = IsMapTypeOutdoors(gMapHeader.mapType); @@ -1721,13 +1721,13 @@ void CB2_ContinueSavedGame(void) ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - LoadBattlePyramidFloorEventObjectScripts(); + LoadBattlePyramidFloorObjectEventScripts(); else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) - LoadTrainerHillFloorEventObjectScripts(); + LoadTrainerHillFloorObjectEventScripts(); else - LoadSaveblockEventObjScripts(); + LoadSaveblockObjEventScripts(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DoTimeBasedEvents(); sub_8084788(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) @@ -2143,9 +2143,9 @@ static void sub_8086988(u32 a1) ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); if (!a1) - InitEventObjectPalettes(0); + InitObjectEventPalettes(0); else - InitEventObjectPalettes(1); + InitObjectEventPalettes(1); FieldEffectActiveListClear(); StartWeather(); @@ -2160,8 +2160,8 @@ static void sub_80869DC(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); - TrySpawnEventObjects(0, 0); + ResetObjectEvents(); + TrySpawnObjectEvents(0, 0); TryRunOnWarpIntoMapScript(); } @@ -2172,13 +2172,13 @@ static void mli4_mapscripts_and_other(void) gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); + ResetObjectEvents(); GetCameraFocusCoords(&x, &y); player = GetInitialPlayerAvatarState(); InitPlayerAvatar(x, y, player->direction, gSaveBlock2Ptr->playerGender); SetPlayerAvatarTransitionFlags(player->transitionFlags); ResetInitialPlayerAvatarState(); - TrySpawnEventObjects(0, 0); + TrySpawnObjectEvents(0, 0); TryRunOnWarpIntoMapScript(); } @@ -2191,7 +2191,7 @@ static void sub_8086A68(void) static void sub_8086A80(void) { - gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; + gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -2226,7 +2226,7 @@ static void sub_8086B14(void) for (i = 0; i < gFieldLinkPlayerCount; i++) { - SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender); + SpawnLinkPlayerObjectEvent(i, i + x, y, gLinkPlayers[i].gender); CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } @@ -2702,7 +2702,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo trainer->playerId = linkPlayerId; trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? 1 : 0; - trainer->c = gLinkPlayerEventObjects[linkPlayerId].movementMode; + trainer->c = gLinkPlayerObjectEvents[linkPlayerId].movementMode; trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); GetLinkPlayerCoords(linkPlayerId, &x, &y); trainer->pos.x = x; @@ -2918,110 +2918,110 @@ static u32 GetLinkSendQueueLength(void) return gLink.sendQueue.count; } -static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerObjEvent) { - memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); + memset(linkPlayerObjEvent, 0, sizeof(struct LinkPlayerObjectEvent)); } -void ClearLinkPlayerEventObjects(void) +void ClearLinkPlayerObjectEvents(void) { - memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); + memset(gLinkPlayerObjectEvents, 0, sizeof(gLinkPlayerObjectEvents)); } -static void ZeroEventObject(struct EventObject *eventObj) +static void ZeroObjectEvent(struct ObjectEvent *objEvent) { - memset(eventObj, 0, sizeof(struct EventObject)); + memset(objEvent, 0, sizeof(struct ObjectEvent)); } -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4) { - u8 eventObjId = GetFirstInactiveEventObjectId(); - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + u8 objEventId = GetFirstInactiveObjectEventId(); + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - ZeroLinkPlayerEventObject(linkPlayerEventObj); - ZeroEventObject(eventObj); + ZeroLinkPlayerObjectEvent(linkPlayerObjEvent); + ZeroObjectEvent(objEvent); - linkPlayerEventObj->active = 1; - linkPlayerEventObj->linkPlayerId = linkPlayerId; - linkPlayerEventObj->eventObjId = eventObjId; - linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; + linkPlayerObjEvent->active = 1; + linkPlayerObjEvent->linkPlayerId = linkPlayerId; + linkPlayerObjEvent->objEventId = objEventId; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_FREE; - eventObj->active = 1; - eventObj->singleMovementActive = a4; - eventObj->range.as_byte = 2; - eventObj->spriteId = 64; + objEvent->active = 1; + objEvent->singleMovementActive = a4; + objEvent->range.as_byte = 2; + objEvent->spriteId = 64; - InitLinkPlayerEventObjectPos(eventObj, x, y); + InitLinkPlayerObjectEventPos(objEvent, x, y); } -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y) +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y) { - eventObj->currentCoords.x = x; - eventObj->currentCoords.y = y; - eventObj->previousCoords.x = x; - eventObj->previousCoords.y = y; - SetSpritePosToMapCoords(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - eventObj->initialCoords.x += 8; - EventObjectUpdateZCoord(eventObj); + objEvent->currentCoords.x = x; + objEvent->currentCoords.y = y; + objEvent->previousCoords.x = x; + objEvent->previousCoords.y = y; + SetSpritePosToMapCoords(x, y, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + objEvent->initialCoords.x += 8; + ObjectEventUpdateZCoord(objEvent); } static void sub_80877DC(u8 linkPlayerId, u8 a2) { - if (gLinkPlayerEventObjects[linkPlayerId].active) + if (gLinkPlayerObjectEvents[linkPlayerId].active) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - eventObj->range.as_byte = a2; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + objEvent->range.as_byte = a2; } } static void sub_808780C(u8 linkPlayerId) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (eventObj->spriteId != MAX_SPRITES) - DestroySprite(&gSprites[eventObj->spriteId]); - linkPlayerEventObj->active = 0; - eventObj->active = 0; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + if (objEvent->spriteId != MAX_SPRITES) + DestroySprite(&gSprites[objEvent->spriteId]); + linkPlayerObjEvent->active = 0; + objEvent->active = 0; } // Returns the spriteId corresponding to this player. static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->spriteId; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->spriteId; } static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - *x = eventObj->currentCoords.x; - *y = eventObj->currentCoords.y; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + *x = objEvent->currentCoords.x; + *y = objEvent->currentCoords.y; } static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->range.as_byte; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->range.as_byte; } static u8 GetLinkPlayerElevation(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->currentElevation; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->currentElevation; } static s32 sub_80878E4(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return 16 - (s8)eventObj->directionSequenceIndex; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return 16 - (s8)objEvent->directionSequenceIndex; } static u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -3029,11 +3029,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) u8 i; for (i = 0; i < MAX_LINK_PLAYERS; i++) { - if (gLinkPlayerEventObjects[i].active - && (gLinkPlayerEventObjects[i].movementMode == 0 || gLinkPlayerEventObjects[i].movementMode == 2)) + if (gLinkPlayerObjectEvents[i].active + && (gLinkPlayerObjectEvents[i].movementMode == 0 || gLinkPlayerObjectEvents[i].movementMode == 2)) { - struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; - if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) + struct ObjectEvent *objEvent = &gObjectEvents[gLinkPlayerObjectEvents[i].objEventId]; + if (objEvent->currentCoords.x == x && objEvent->currentCoords.y == y) return i; } } @@ -3042,23 +3042,23 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - if (linkPlayerEventObj->active) + if (linkPlayerObjEvent->active) { if (facing > FACING_FORCED_RIGHT) { - eventObj->triggerGroundEffectsOnMove = 1; + objEvent->triggerGroundEffectsOnMove = 1; } else { // This is a hack to split this code onto two separate lines, without declaring a local variable. // C++ style inline variables would be nice here. - #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, eventObj, facing) + #define TEMP gLinkPlayerMovementModes[linkPlayerObjEvent->movementMode](linkPlayerObjEvent, objEvent, facing) - gMovementStatusHandler[TEMP](linkPlayerEventObj, eventObj); + gMovementStatusHandler[TEMP](linkPlayerObjEvent, objEvent); // Clean up the hack. #undef TEMP @@ -3067,68 +3067,68 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) } -static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerObjEvent, objEvent, a3); } -static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return FACING_UP; } // Duplicate Function -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerObjEvent, objEvent, a3); } -static bool8 FacingHandler_DoNothing(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return FALSE; } -static bool8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { s16 x, y; - eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); - EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); + objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); + ObjectEventMoveDestCoords(objEvent, objEvent->range.as_byte, &x, &y); - if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) + if (LinkPlayerDetectCollision(linkPlayerObjEvent->objEventId, objEvent->range.as_byte, x, y)) { return FALSE; } else { - eventObj->directionSequenceIndex = 16; - ShiftEventObjectCoords(eventObj, x, y); - EventObjectUpdateZCoord(eventObj); + objEvent->directionSequenceIndex = 16; + ShiftObjectEventCoords(objEvent, x, y); + ObjectEventUpdateZCoord(objEvent); return TRUE; } } -static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); + objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); return FALSE; } // This is called every time a free movement happens. Most of the time it's a No-Op. -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_FREE; } -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - eventObj->directionSequenceIndex--; - linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN; - MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - if (!eventObj->directionSequenceIndex) + objEvent->directionSequenceIndex--; + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_FROZEN; + MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + if (!objEvent->directionSequenceIndex) { - ShiftStillEventObjectCoords(eventObj); - linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED; + ShiftStillObjectEventCoords(objEvent); + linkPlayerObjEvent->movementMode = MOVEMENT_MODE_SCRIPTED; } } @@ -3155,15 +3155,15 @@ static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing) return oldFacing; } -static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) +static u8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 a2, s16 x, s16 y) { u8 i; for (i = 0; i < 16; i++) { - if (i != selfEventObjId) + if (i != selfObjEventId) { - if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) - || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y)) + if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) + || (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y)) { return 1; } @@ -3174,51 +3174,51 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerObjEvent->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; struct Sprite *sprite; - if (linkPlayerEventObj->active) + if (linkPlayerObjEvent->active) { switch (gameVersion) { case VERSION_FIRE_RED: case VERSION_LEAF_GREEN: - eventObj->spriteId = AddPseudoEventObject(GetFRLGAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetFRLGAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_RUBY: case VERSION_SAPPHIRE: - eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetRSAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_EMERALD: - eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; } - sprite = &gSprites[eventObj->spriteId]; + sprite = &gSprites[objEvent->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - eventObj->triggerGroundEffectsOnMove = 0; + objEvent->triggerGroundEffectsOnMove = 0; } } static void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]]; - struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId]; - sprite->pos1.x = eventObj->initialCoords.x; - sprite->pos1.y = eventObj->initialCoords.y; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); + struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[sprite->data[0]]; + struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerObjEvent->objEventId]; + sprite->pos1.x = objEvent->initialCoords.x; + sprite->pos1.y = objEvent->initialCoords.y; + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); - if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); + if (!linkPlayerObjEvent->movementMode != MOVEMENT_MODE_FREE) + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); + StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte)); - UpdateEventObjectSpriteVisibility(sprite, 0); - if (eventObj->triggerGroundEffectsOnMove) + UpdateObjectEventSpriteVisibility(sprite, 0); + if (objEvent->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c index 7238ec751..408aa7fef 100644 --- a/src/rotating_tile_puzzle.c +++ b/src/rotating_tile_puzzle.c @@ -4,7 +4,7 @@ #include "malloc.h" #include "rotating_tile_puzzle.h" #include "script_movement.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/metatile_labels.h" @@ -29,7 +29,7 @@ struct RotatingTileObject struct RotatingTilePuzzle { - struct RotatingTileObject objects[EVENT_OBJECTS_COUNT]; + struct RotatingTileObject objects[OBJECT_EVENTS_COUNT]; u8 numObjects; bool8 isTrickHouse; }; @@ -57,23 +57,23 @@ void FreeRotatingTilePuzzle(void) if (sRotatingTilePuzzle != NULL) FREE_AND_SET_NULL(sRotatingTilePuzzle); - id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[id]); - ScriptMovement_UnfreezeEventObjects(); + id = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]); + ScriptMovement_UnfreezeObjectEvents(); } u16 MoveRotatingTileObjects(u8 puzzleNumber) { u8 i; - struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; u16 localId = 0; - for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) + for (i = 0; i < OBJECT_EVENT_TEMPLATES_COUNT; i++) { s32 puzzleTileStart; u8 puzzleTileNum; - s16 x = eventObjects[i].x + 7; - s16 y = eventObjects[i].y + 7; + s16 x = objectEvents[i].x + 7; + s16 y = objectEvents[i].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); if (!sRotatingTilePuzzle->isTrickHouse) @@ -125,12 +125,12 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber) continue; } - eventObjects[i].x += x; - eventObjects[i].y += y; - if (GetEventObjectIdByLocalIdAndMap(eventObjects[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) + objectEvents[i].x += x; + objectEvents[i].y += y; + if (GetObjectEventIdByLocalIdAndMap(objectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != OBJECT_EVENTS_COUNT) { SaveRotatingTileObject(i, puzzleTileNum); - localId = eventObjects[i].localId; + localId = objectEvents[i].localId; ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); } // Never reached in normal gameplay @@ -148,7 +148,7 @@ void TurnRotatingTileObjects(void) { u8 i; s32 puzzleTileStart; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; if (sRotatingTilePuzzle == NULL) return; @@ -158,14 +158,14 @@ void TurnRotatingTileObjects(void) else puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; - eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + objectEvents = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < sRotatingTilePuzzle->numObjects; i++) { s32 rotation; s8 tileDifference; - u8 eventObjectId; - s16 x = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; - s16 y = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; + u8 objectEventId; + s16 x = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; + s16 y = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); // NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE @@ -194,35 +194,35 @@ void TurnRotatingTileObjects(void) rotation = ROTATE_NONE; } - eventObjectId = GetEventObjectIdByLocalIdAndMap(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByLocalIdAndMap(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + if (objectEventId != OBJECT_EVENTS_COUNT) { const u8 *movementScript; - u8 direction = gEventObjects[eventObjectId].facingDirection; + u8 direction = gObjectEvents[objectEventId].facingDirection; if (rotation == ROTATE_COUNTERCLOCKWISE) { switch (direction) { case DIR_EAST: movementScript = RotatingTilePuzzle_Movement_FaceUp; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case DIR_SOUTH: movementScript = RotatingTilePuzzle_Movement_FaceRight; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; case DIR_WEST: movementScript = RotatingTilePuzzle_Movement_FaceDown; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case DIR_NORTH: movementScript = RotatingTilePuzzle_Movement_FaceLeft; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; default: continue; } - ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); @@ -234,24 +234,24 @@ void TurnRotatingTileObjects(void) { case DIR_EAST: movementScript = RotatingTilePuzzle_Movement_FaceDown; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case DIR_SOUTH: movementScript = RotatingTilePuzzle_Movement_FaceLeft; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; case DIR_WEST: movementScript = RotatingTilePuzzle_Movement_FaceUp; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case DIR_NORTH: movementScript = RotatingTilePuzzle_Movement_FaceRight; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; default: continue; } - ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); @@ -274,9 +274,9 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) s32 rotation; s32 puzzleTileStart; u16 movementType; - struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; - s16 x = eventObjects[eventTemplateId].x + 7; - s16 y = eventObjects[eventTemplateId].y + 7; + struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; + s16 x = objectEvents[eventTemplateId].x + 7; + s16 y = objectEvents[eventTemplateId].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); if (!sRotatingTilePuzzle->isTrickHouse) @@ -294,22 +294,22 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) else rotation = ROTATE_NONE; - movementType = eventObjects[eventTemplateId].movementType; + movementType = objectEvents[eventTemplateId].movementType; if (rotation == ROTATE_COUNTERCLOCKWISE) { switch (movementType) { case MOVEMENT_TYPE_FACE_RIGHT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case MOVEMENT_TYPE_FACE_DOWN: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; case MOVEMENT_TYPE_FACE_LEFT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case MOVEMENT_TYPE_FACE_UP: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; default: break; @@ -320,16 +320,16 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) switch (movementType) { case MOVEMENT_TYPE_FACE_RIGHT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case MOVEMENT_TYPE_FACE_DOWN: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; case MOVEMENT_TYPE_FACE_LEFT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case MOVEMENT_TYPE_FACE_UP: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; default: break; diff --git a/src/scrcmd.c b/src/scrcmd.c index a9be5c3ef..f215b8541 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -13,6 +13,7 @@ #include "event_data.h" #include "field_door.h" #include "field_effect.h" +#include "event_object_lock.h" #include "event_object_movement.h" #include "field_message_box.h" #include "field_player_avatar.h" @@ -24,7 +25,6 @@ #include "item.h" #include "lilycove_lady.h" #include "main.h" -#include "event_obj_lock.h" #include "menu.h" #include "money.h" #include "mystery_event_script.h" @@ -1052,7 +1052,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1062,7 +1062,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup); + RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup); return FALSE; } @@ -1070,7 +1070,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); - TrySpawnEventObject(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1080,7 +1080,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - TrySpawnEventObject(objectId, mapNum, mapGroup); + TrySpawnObjectEvent(objectId, mapNum, mapGroup); return FALSE; } @@ -1090,7 +1090,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - TryMoveEventObjectToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); + TryMoveObjectEventToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); return FALSE; } @@ -1100,7 +1100,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - Overworld_SetEventObjTemplateCoords(localId, x, y); + Overworld_SetObjEventTemplateCoords(localId, x, y); return FALSE; } @@ -1108,7 +1108,7 @@ bool8 ScrCmd_copyobjectxytoperm(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - TryOverrideEventObjectTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryOverrideObjectEventTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1155,9 +1155,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], GetPlayerFacingDirection()); } return FALSE; @@ -1168,7 +1168,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); + ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); return FALSE; } @@ -1177,7 +1177,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 movementType = ScriptReadByte(ctx); - Overworld_SetEventObjTemplateMovementType(localId, movementType); + Overworld_SetObjEventTemplateMovementType(localId, movementType); return FALSE; } @@ -1211,7 +1211,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_80983C4); return TRUE; } @@ -1225,14 +1225,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - LockSelectedEventObject(); + LockSelectedObjectEvent(); SetupNativeScript(ctx, sub_809847C); } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_80983C4); } return TRUE; @@ -1244,10 +1244,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); return FALSE; } @@ -1256,12 +1256,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); return FALSE; } @@ -2178,7 +2178,7 @@ bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) { - gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId(); + gSelectedObjectEvent = GetCurrentApproachingTrainerObjectEventId(); return FALSE; } @@ -2190,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { sub_8098630(); SetupNativeScript(ctx, sub_8098734); diff --git a/src/script.c b/src/script.c index 34484561c..9ba1a7429 100644 --- a/src/script.c +++ b/src/script.c @@ -426,7 +426,7 @@ u8 *GetSavedRamScriptIfValid(void) } } -void InitRamScript_NoEventObject(u8 *script, u16 scriptSize) +void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize) { if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); diff --git a/src/script_movement.c b/src/script_movement.c index 03d6b10e8..4eb305980 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -4,50 +4,50 @@ #include "task.h" #include "util.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" // static functions static void ScriptMovement_StartMoveObjects(u8 priority); static u8 GetMoveObjectsTaskId(void); -static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript); -static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId); +static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript); +static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId); static bool8 IsMovementScriptFinished(u8 taskId, u8 moveScrId); -static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); +static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); static void ScriptMovement_UnfreezeActiveObjects(u8 taskId); static void ScriptMovement_MoveObjects(u8 taskId); -static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); +static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); // EWRAM_DATA -static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; +static EWRAM_DATA const u8 *gMovementScripts[OBJECT_EVENTS_COUNT] = {0}; // text bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; if (!FuncIsActiveTask(ScriptMovement_MoveObjects)) ScriptMovement_StartMoveObjects(50); - return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), eventObjId, movementScript); + return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), objEventId, movementScript); } bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjId; + u8 objEventId; u8 taskId; u8 moveScrId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; taskId = GetMoveObjectsTaskId(); - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); - if (moveScrId == EVENT_OBJECTS_COUNT) + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); + if (moveScrId == OBJECT_EVENTS_COUNT) return TRUE; return IsMovementScriptFinished(taskId, moveScrId); } -void ScriptMovement_UnfreezeEventObjects(void) +void ScriptMovement_UnfreezeObjectEvents(void) { u8 taskId; @@ -75,12 +75,12 @@ static u8 GetMoveObjectsTaskId(void) return FindTaskIdByFunc(ScriptMovement_MoveObjects); } -static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript) +static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript) { u8 moveScrId; - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); - if (moveScrId != EVENT_OBJECTS_COUNT) + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); + if (moveScrId != OBJECT_EVENTS_COUNT) { if (IsMovementScriptFinished(taskId, moveScrId) == 0) { @@ -88,59 +88,59 @@ static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 } else { - ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); + ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript); return FALSE; } } - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, EVENT_OBJ_ID_PLAYER); - if (moveScrId == EVENT_OBJECTS_COUNT) + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, OBJ_EVENT_ID_PLAYER); + if (moveScrId == OBJECT_EVENTS_COUNT) { return TRUE; } else { - ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); + ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript); return FALSE; } } -static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId) +static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId) { u8 *moveScriptId; u8 i; moveScriptId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++, moveScriptId++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++, moveScriptId++) { - if (*moveScriptId == eventObjId) + if (*moveScriptId == objEventId) return i; } - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } -static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) +static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pObjEventId) { u8 i; - *pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < moveScrId; i++, (*pEventObjId)++) + *pObjEventId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < moveScrId; i++, (*pObjEventId)++) ; } -static void SetEventObjectIdAtMovementScript(u8 taskId, u8 moveScrId, u8 eventObjId) +static void SetObjectEventIdAtMovementScript(u8 taskId, u8 moveScrId, u8 objEventId) { u8 *ptr; - LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); - *ptr = eventObjId; + LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr); + *ptr = objEventId; } -static void LoadEventObjectIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *eventObjId) +static void LoadObjectEventIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *objEventId) { u8 *ptr; - LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); - *eventObjId = *ptr; + LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr); + *objEventId = *ptr; } static void ClearMovementScriptFinished(u8 taskId, u8 moveScrId) @@ -175,56 +175,56 @@ static const u8 *GetMovementScript(u8 moveScrId) return gMovementScripts[moveScrId]; } -static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) +static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript) { ClearMovementScriptFinished(taskId, moveScrId); SetMovementScript(moveScrId, movementScript); - SetEventObjectIdAtMovementScript(taskId, moveScrId, eventObjId); + SetObjectEventIdAtMovementScript(taskId, moveScrId, objEventId); } static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) { - u8 *pEventObjId; + u8 *pObjEventId; u8 i; - pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++, pEventObjId++) + pObjEventId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++, pObjEventId++) { - if (*pEventObjId != 0xFF) - UnfreezeEventObject(&gEventObjects[*pEventObjId]); + if (*pObjEventId != 0xFF) + UnfreezeObjectEvent(&gObjectEvents[*pObjEventId]); } } static void ScriptMovement_MoveObjects(u8 taskId) { u8 i; - u8 eventObjId; + u8 objEventId; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - LoadEventObjectIdFromMovementScript(taskId, i, &eventObjId); - if (eventObjId != 0xFF) - ScriptMovement_TakeStep(taskId, i, eventObjId, GetMovementScript(i)); + LoadObjectEventIdFromMovementScript(taskId, i, &objEventId); + if (objEventId != 0xFF) + ScriptMovement_TakeStep(taskId, i, objEventId, GetMovementScript(i)); } } -static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) +static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript) { u8 nextMoveActionId; - if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) - && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId]) + && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) return; nextMoveActionId = *movementScript; if (nextMoveActionId == MOVEMENT_ACTION_STEP_END) { SetMovementScriptFinished(taskId, moveScrId); - FreezeEventObject(&gEventObjects[eventObjId]); + FreezeObjectEvent(&gObjectEvents[objEventId]); } else { - if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], nextMoveActionId)) + if (!ObjectEventSetHeldMovement(&gObjectEvents[objEventId], nextMoveActionId)) { movementScript++; SetMovementScript(moveScrId, movementScript); diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 0e191d652..00605d858 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -33,10 +33,10 @@ #include "constants/vars.h" #include "constants/battle_frontier.h" -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; @@ -247,9 +247,9 @@ void SetLinkContestPlayerGfx(void) if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - gContestMons[i].trainerGfxId = EVENT_OBJ_GFX_LINK_RS_BRENDAN; + gContestMons[i].trainerGfxId = OBJ_EVENT_GFX_LINK_RS_BRENDAN; else - gContestMons[i].trainerGfxId = EVENT_OBJ_GFX_LINK_RS_MAY; + gContestMons[i].trainerGfxId = OBJ_EVENT_GFX_LINK_RS_MAY; } } @@ -263,7 +263,7 @@ void SetLinkContestPlayerGfx(void) void LoadLinkContestPlayerPalettes(void) { int i; - u8 eventObjectId; + u8 objectEventId; int version; struct Sprite *sprite; @@ -272,23 +272,23 @@ void LoadLinkContestPlayerPalettes(void) { for (i = 0; i < gNumLinkContestPlayers; i++) { - eventObjectId = GetEventObjectIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->oam.paletteNum = 6 + i; version = (u8)gLinkPlayers[i].version; if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gEventObjectPalette33, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette33, 0x160 + i * 0x10, 0x20); else - LoadPalette(gEventObjectPalette34, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette34, 0x160 + i * 0x10, 0x20); } else { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gEventObjectPalette8, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette8, 0x160 + i * 0x10, 0x20); else - LoadPalette(gEventObjectPalette17, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette17, 0x160 + i * 0x10, 0x20); } } } diff --git a/src/secret_base.c b/src/secret_base.c index b9826a257..b8752b8a6 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -33,7 +33,7 @@ #include "task.h" #include "tv.h" #include "window.h" -#include "constants/bg_event_constants.h" +#include "constants/event_bg.h" #include "constants/decorations.h" #include "constants/event_objects.h" #include "constants/items.h" @@ -147,17 +147,17 @@ static const struct YesNoFuncTable sDeleteRegistryYesNoFuncs = static const u8 sSecretBaseOwnerGfxIds[10] = { // Male - EVENT_OBJ_GFX_YOUNGSTER, - EVENT_OBJ_GFX_BUG_CATCHER, - EVENT_OBJ_GFX_RICH_BOY, - EVENT_OBJ_GFX_CAMPER, - EVENT_OBJ_GFX_MAN_3, + OBJ_EVENT_GFX_YOUNGSTER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_RICH_BOY, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_MAN_3, // Female - EVENT_OBJ_GFX_LASS, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_WOMAN_5, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_5, }; static const struct WindowTemplate sRegistryWindowTemplates[] = @@ -437,7 +437,7 @@ bool8 SecretBaseMapPopupEnabled(void) static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH); if (IsWeatherNotFadingIn() == TRUE) { EnableBothScriptContexts(); @@ -531,13 +531,13 @@ void InitSecretBaseDecorationSprites(void) u8 i; u8 *decorations; u8 *decorationPositions; - u8 eventObjectId; + u8 objectEventId; u8 metatileBehavior; u8 category; u8 permission; u8 numDecorations; - eventObjectId = 0; + objectEventId = 0; if (!CurMapIsSecretBase()) { decorations = gSaveBlock1Ptr->playerRoomDecor; @@ -561,13 +561,13 @@ void InitSecretBaseDecorationSprites(void) category = gDecorations[decorations[i]].category; if (permission == DECORPERM_SPRITE) { - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - if (gMapHeader.events->eventObjects[eventObjectId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[objectEventId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) break; } - if (eventObjectId == gMapHeader.events->eventObjectCount) + if (objectEventId == gMapHeader.events->objectEventCount) continue; gSpecialVar_0x8006 = decorationPositions[i] >> 4; @@ -576,13 +576,13 @@ void InitSecretBaseDecorationSprites(void) if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) { - gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[eventObjectId].graphicsId - EVENT_OBJ_GFX_VAR_0); + gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - OBJ_EVENT_GFX_VAR_0); VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->eventObjects[eventObjectId].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId; FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004); - TrySpawnEventObject(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0) { if (category == DECORCAT_DOLL) @@ -611,16 +611,16 @@ void InitSecretBaseDecorationSprites(void) void HideSecretBaseDecorationSprites(void) { - u8 eventObjectId; + u8 objectEventId; u16 flag; - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - flag = gMapHeader.events->eventObjects[eventObjectId].flagId; + flag = gMapHeader.events->objectEvents[objectEventId].flagId; if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14) { - RemoveEventObjectByLocalIdAndMap( - gMapHeader.events->eventObjects[eventObjectId].localId, + RemoveObjectEventByLocalIdAndMap( + gMapHeader.events->objectEvents[objectEventId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(flag); diff --git a/src/shop.c b/src/shop.c index 324154d2e..5f796f307 100755 --- a/src/shop.c +++ b/src/shop.c @@ -67,13 +67,13 @@ static void BuyMenuRemoveItemIcon(u16, u8); static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet); static void BuyMenuDrawMapGraphics(void); static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void); -static void BuyMenuCollectEventObjectData(void); -static void BuyMenuDrawEventObjects(void); +static void BuyMenuCollectObjectEventData(void); +static void BuyMenuDrawObjectEvents(void); static void BuyMenuDrawMapBg(void); static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int); static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8); static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src); -static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *); +static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *); static void ExitBuyMenu(u8 taskId); static void Task_ExitBuyMenu(u8 taskId); static void BuyMenuTryMakePurchase(u8 taskId); @@ -714,8 +714,8 @@ static void BuyMenuDrawGraphics(void) static void BuyMenuDrawMapGraphics(void) { - BuyMenuCollectEventObjectData(); - BuyMenuDrawEventObjects(); + BuyMenuCollectObjectEventData(); + BuyMenuDrawObjectEvents(); BuyMenuDrawMapBg(); } @@ -787,7 +787,7 @@ static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, con dest[offset1 + offset2 + 33] = src[3]; // bottom right } -static void BuyMenuCollectEventObjectData(void) +static void BuyMenuCollectObjectEventData(void) { s16 facingX; s16 facingY; @@ -797,21 +797,21 @@ static void BuyMenuCollectEventObjectData(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); for (y = 0; y < 16; y++) - gShopDataPtr->viewportObjects[y][EVENT_OBJ_ID] = 16; + gShopDataPtr->viewportObjects[y][OBJ_EVENT_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) { - u8 eventObjId = GetEventObjectIdByXY(facingX - 4 + x, facingY - 2 + y); + u8 objEventId = GetObjectEventIdByXY(facingX - 4 + x, facingY - 2 + y); - if (eventObjId != 16) + if (objEventId != 16) { - gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = eventObjId; + gShopDataPtr->viewportObjects[r8][OBJ_EVENT_ID] = objEventId; gShopDataPtr->viewportObjects[r8][X_COORD] = x; gShopDataPtr->viewportObjects[r8][Y_COORD] = y; gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y); - switch (gEventObjects[eventObjId].facingDirection) + switch (gObjectEvents[objEventId].facingDirection) { case DIR_SOUTH: gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 0; @@ -833,27 +833,27 @@ static void BuyMenuCollectEventObjectData(void) } } -static void BuyMenuDrawEventObjects(void) +static void BuyMenuDrawObjectEvents(void) { u8 i; u8 spriteId; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; for (i = 0; i < 16; i++) // max objects? { - if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16) + if (gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID] == 16) continue; - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID]].graphicsId); - spriteId = AddPseudoEventObject( - gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, + spriteId = AddPseudoObjectEvent( + gObjectEvents[gShopDataPtr->viewportObjects[i][OBJ_EVENT_ID]].graphicsId, SpriteCallbackDummy, (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8, (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, 2); - if (BuyMenuCheckIfEventObjectOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) + if (BuyMenuCheckIfObjectEventOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) { gSprites[spriteId].subspriteTableNum = 4; gSprites[spriteId].subspriteMode = SUBSPRITES_ON; @@ -863,7 +863,7 @@ static void BuyMenuDrawEventObjects(void) } } -static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *object) +static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *object) { if (!BuyMenuCheckForOverlapWithMenuBg(object[X_COORD], object[Y_COORD] + 2) && object[LAYER_TYPE] != MB_SECRET_BASE_WALL) { diff --git a/src/start_menu.c b/src/start_menu.c index c24497d74..de6cec898 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -5,7 +5,7 @@ #include "bg.h" #include "event_data.h" #include "event_object_movement.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "event_scripts.h" #include "fieldmap.h" #include "field_effect.h" @@ -543,7 +543,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s { if (!IsUpdateLinkStateCBActive()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -746,7 +746,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) void sub_809FDD4(void) { ClearDialogWindowAndFrameToTransparent(0, FALSE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); CreateStartMenuTask(sub_809FA34); ScriptContext2_Enable(); } @@ -788,7 +788,7 @@ static bool8 SaveCallback(void) case SAVE_SUCCESS: case SAVE_ERROR: // Close start menu ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); SoftResetInBattlePyramid(); return TRUE; @@ -825,7 +825,7 @@ static bool8 BattlePyramidRetireCallback(void) return FALSE; case SAVE_CANCELED: // Yes (Retire from battle pyramid) ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); return TRUE; @@ -1382,7 +1382,7 @@ static void HideStartMenuWindow(void) { ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index c339a56e0..11ac49e3a 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -23,7 +23,7 @@ #include "window.h" #include "util.h" #include "constants/battle_ai.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/event_objects.h" #include "constants/items.h" #include "constants/layouts.h" @@ -251,9 +251,9 @@ static const u8 *const sTagMatchStrings[] = gText_ExpertTagMatch, }; -static const struct EventObjectTemplate sTrainerEventObjectTemplate = +static const struct ObjectEventTemplate sTrainerObjectEventTemplate = { - .graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, + .graphicsId = OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL, .elevation = 3, .movementType = MOVEMENT_TYPE_LOOK_AROUND, .movementRangeX = 1, @@ -629,25 +629,25 @@ static void SetTimerValue(u32 *dst, u32 val) *dst = val; } -void LoadTrainerHillEventObjectTemplates(void) +void LoadTrainerHillObjectEventTemplates(void) { u8 i, floorId; - struct EventObjectTemplate *eventTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *eventTemplates = gSaveBlock1Ptr->objectEventTemplates; - if (!LoadTrainerHillFloorEventObjectScripts()) + if (!LoadTrainerHillFloorObjectEventScripts()) return; SetUpDataStruct(); for (i = 0; i < 2; i++) gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); floorId = GetFloorId(); for (i = 0; i < 2; i++) { u8 bits; - eventTemplates[i] = sTrainerEventObjectTemplate; + eventTemplates[i] = sTrainerObjectEventTemplate; eventTemplates[i].localId = i + 1; eventTemplates[i].graphicsId = FacilityClassToGraphicsId(sHillData->floors[floorId].trainers[i].facilityClass); eventTemplates[i].x = sHillData->floors[floorId].display.coords[i] & 0xF; @@ -662,7 +662,7 @@ void LoadTrainerHillEventObjectTemplates(void) FreeDataStruct(); } -bool32 LoadTrainerHillFloorEventObjectScripts(void) +bool32 LoadTrainerHillFloorObjectEventScripts(void) { SetUpDataStruct(); // Something may have been dummied here @@ -860,10 +860,10 @@ u16 LocalIdToHillTrainerId(u8 localId) return gSaveBlock2Ptr->frontier.trainerIds[localId - 1]; } -bool8 GetHillTrainerFlag(u8 eventObjectId) +bool8 GetHillTrainerFlag(u8 objectEventId) { u32 floorId = GetFloorId() * 2; - u8 bitId = gEventObjects[eventObjectId].localId - 1 + floorId; + u8 bitId = gObjectEvents[objectEventId].localId - 1 + floorId; return gSaveBlock2Ptr->frontier.trainerFlags & gBitTable[bitId]; } diff --git a/src/trainer_see.c b/src/trainer_see.c index 5e843164d..b34b8f106 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -15,35 +15,35 @@ #include "battle_pyramid.h" #include "constants/battle_setup.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/field_effects.h" // this file's functions -static u8 CheckTrainer(u8 eventObjectId); -static u8 GetTrainerApproachDistance(struct EventObject *trainerObj); -static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); -static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range); +static u8 CheckTrainer(u8 objectEventId); +static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj); +static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction); +static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range); static void Task_RunTrainerSeeFuncList(u8 taskId); static void Task_DestroyTrainerApproachTask(u8 taskId); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); - -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); + +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); static void SpriteCB_TrainerIcons(struct Sprite *sprite); @@ -62,7 +62,7 @@ static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); -static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *trainerObj, s16 range, s16 x, s16 y) = +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) = { GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceNorth, @@ -70,7 +70,7 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train GetTrainerApproachDistanceEast, }; -static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { sub_80B4178, TrainerExclamationMark, @@ -86,7 +86,7 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct WaitRevealHiddenTrainer, }; -static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { RevealHiddenTrainer, PopOutOfAshHiddenTrainer, @@ -179,13 +179,13 @@ bool8 CheckForTrainersWantingBattle(void) gNoOfApproachingTrainers = 0; gApproachingTrainerId = 0; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { u8 retVal; - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) continue; - if (gEventObjects[i].trainerType != 1 && gEventObjects[i].trainerType != 3) + if (gObjectEvents[i].trainerType != 1 && gObjectEvents[i].trainerType != 3) continue; retVal = CheckTrainer(i); @@ -204,7 +204,7 @@ bool8 CheckForTrainersWantingBattle(void) if (gNoOfApproachingTrainers == 1) { ResetTrainerOpponentIds(); - ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId, + ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].objectEventId, gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); gTrainerApproachedPlayer = TRUE; return TRUE; @@ -214,7 +214,7 @@ bool8 CheckForTrainersWantingBattle(void) ResetTrainerOpponentIds(); for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++) { - ConfigureTwoTrainersBattle(gApproachingTrainers[i].eventObjectId, + ConfigureTwoTrainersBattle(gApproachingTrainers[i].objectEventId, gApproachingTrainers[i].trainerScriptPtr); } SetUpTwoTrainersBattle(); @@ -229,7 +229,7 @@ bool8 CheckForTrainersWantingBattle(void) } } -static u8 CheckTrainer(u8 eventObjectId) +static u8 CheckTrainer(u8 objectEventId) { const u8 *scriptPtr; u8 ret = 1; @@ -238,16 +238,16 @@ static u8 CheckTrainer(u8 eventObjectId) if (InTrainerHill() == TRUE) scriptPtr = GetTrainerHillTrainerScript(); else - scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + scriptPtr = GetObjectEventScriptPointerByObjectEventId(objectEventId); if (InBattlePyramid()) { - if (GetBattlePyramidTrainerFlag(eventObjectId)) + if (GetBattlePyramidTrainerFlag(objectEventId)) return 0; } else if (InTrainerHill() == TRUE) { - if (GetHillTrainerFlag(eventObjectId)) + if (GetHillTrainerFlag(objectEventId)) return 0; } else @@ -256,7 +256,7 @@ static u8 CheckTrainer(u8 eventObjectId) return 0; } - approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]); + approachDistance = GetTrainerApproachDistance(&gObjectEvents[objectEventId]); if (approachDistance != 0) { @@ -270,10 +270,10 @@ static u8 CheckTrainer(u8 eventObjectId) ret = 2; } - gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId = eventObjectId; + gApproachingTrainers[gNoOfApproachingTrainers].objectEventId = objectEventId; gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr; gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance; - TrainerApproachPlayer(&gEventObjects[eventObjectId], approachDistance - 1); + TrainerApproachPlayer(&gObjectEvents[objectEventId], approachDistance - 1); gNoOfApproachingTrainers++; return ret; @@ -282,7 +282,7 @@ static u8 CheckTrainer(u8 eventObjectId) return 0; } -static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) +static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj) { s16 x, y; u8 i; @@ -308,7 +308,7 @@ static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) } // Returns how far south the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y > trainerObj->currentCoords.y @@ -319,7 +319,7 @@ static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 ra } // Returns how far north the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y < trainerObj->currentCoords.y @@ -330,7 +330,7 @@ static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 ra } // Returns how far west the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x < trainerObj->currentCoords.x @@ -341,7 +341,7 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran } // Returns how far east the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x > trainerObj->currentCoords.x @@ -353,7 +353,7 @@ static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 ran #define COLLISION_MASK (~1) -static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) +static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction) { s16 x, y; u8 unk19_temp; @@ -394,16 +394,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 ap #define tFuncId data[0] #define tTrainerRange data[3] #define tOutOfAshSpriteId data[4] -#define tTrainerEventObjectId data[7] +#define tTrainerObjectEventId data[7] -static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range) +static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range) { struct Task *task; gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50); task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId]; task->tTrainerRange = range; - task->tTrainerEventObjectId = gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId; + task->tTrainerObjectEventId = gApproachingTrainers[gNoOfApproachingTrainers].objectEventId; } static void sub_80B40C8(TaskFunc followupFunc) @@ -425,7 +425,7 @@ static void sub_80B40C8(TaskFunc followupFunc) static void Task_RunTrainerSeeFuncList(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *trainerObj = &gEventObjects[task->tTrainerEventObjectId]; + struct ObjectEvent *trainerObj = &gObjectEvents[task->tTrainerObjectEventId]; if (!trainerObj->active) { @@ -437,24 +437,24 @@ static void Task_RunTrainerSeeFuncList(u8 taskId) } } -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { return FALSE; } -static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { u8 direction; - EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); direction = GetFaceDirectionMovementAction(trainerObj->facingDirection); - EventObjectSetHeldMovement(trainerObj, direction); + ObjectEventSetHeldMovement(trainerObj, direction); task->tFuncId++; return TRUE; } -static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -471,88 +471,88 @@ static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct Eve } } -static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) { if (task->tTrainerRange) { - EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); + ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); task->tTrainerRange--; } else { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } } return FALSE; } -static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj; + struct ObjectEvent *playerObj; - if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj)) return FALSE; SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - TryOverrideTemplateCoordsForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - OverrideTemplateCoordsForEventObject(trainerObj); + TryOverrideTemplateCoordsForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + OverrideTemplateCoordsForObjectEvent(trainerObj); - playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj)) + playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; sub_808BCE8(); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; return FALSE; } -static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerObj) - || EventObjectClearHeldMovementIfFinished(playerObj)) + if (!ObjectEventIsMovementOverridden(playerObj) + || ObjectEventClearHeldMovementIfFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } -static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); task->tFuncId++; } return FALSE; } -static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; return FALSE; } -static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } return FALSE; } -static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectCheckHeldMovementStatus(trainerObj)) + if (ObjectEventCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -564,7 +564,7 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Event return FALSE; } -static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { struct Sprite *sprite; @@ -575,15 +575,15 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Event sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - EventObjectClearHeldMovementIfFinished(trainerObj); - EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); + ObjectEventClearHeldMovementIfFinished(trainerObj); + ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); task->tFuncId++; } return FALSE; } -static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->tFuncId = 3; @@ -594,34 +594,34 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventO #undef tFuncId #undef tTrainerRange #undef tOutOfAshSpriteId -#undef tTrainerEventObjectId +#undef tTrainerObjectEventId static void sub_80B44C8(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *eventObj; + struct ObjectEvent *objEvent; - // another eventObj loaded into by loadword? - LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); + // another objEvent loaded into by loadword? + LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent); if (!task->data[7]) { - EventObjectClearHeldMovement(eventObj); + ObjectEventClearHeldMovement(objEvent); task->data[7]++; } - sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); + sTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); - TryOverrideTemplateCoordsForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); + SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); + TryOverrideTemplateCoordsForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); DestroyTask(taskId); } else { - eventObj->heldMovementFinished = 0; + objEvent->heldMovementFinished = 0; } } -void sub_80B4578(struct EventObject *var) +void sub_80B4578(struct ObjectEvent *var) { StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); } @@ -645,8 +645,8 @@ void TryPrepareSecondApproachingTrainer(void) { gApproachingTrainerId++; gSpecialVar_Result = TRUE; - UnfreezeEventObjects(); - FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); + UnfreezeObjectEvents(); + FreezeObjectEventsExceptOne(gApproachingTrainers[1].objectEventId); } else { @@ -718,21 +718,21 @@ static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnim static void SpriteCB_TrainerIcons(struct Sprite *sprite) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &eventObjId) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &objEventId) || sprite->animEnded) { FieldEffectStop(sprite, sprite->sFldEffId); } else { - struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; + struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId]; sprite->sData4 += sprite->sData3; - sprite->pos1.x = eventObjSprite->pos1.x; - sprite->pos1.y = eventObjSprite->pos1.y - 16; - sprite->pos2.x = eventObjSprite->pos2.x; - sprite->pos2.y = eventObjSprite->pos2.y + sprite->sData4; + sprite->pos1.x = objEventSprite->pos1.x; + sprite->pos1.y = objEventSprite->pos1.y - 16; + sprite->pos2.x = objEventSprite->pos2.x; + sprite->pos2.y = objEventSprite->pos2.y + sprite->sData4; if (sprite->sData4) sprite->sData3++; else @@ -747,42 +747,42 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite) #undef sData4 #undef sFldEffId -u8 GetCurrentApproachingTrainerEventObjectId(void) +u8 GetCurrentApproachingTrainerObjectEventId(void) { if (gApproachingTrainerId == 0) - return gApproachingTrainers[0].eventObjectId; + return gApproachingTrainers[0].objectEventId; else - return gApproachingTrainers[1].eventObjectId; + return gApproachingTrainers[1].objectEventId; } -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId) +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId) { if (arrayId >= ARRAY_COUNT(gApproachingTrainers)) return 0; else if (arrayId == 0) - return gApproachingTrainers[0].eventObjectId; + return gApproachingTrainers[0].objectEventId; else - return gApproachingTrainers[1].eventObjectId; + return gApproachingTrainers[1].objectEventId; } void PlayerFaceTrainerAfterBattle(void) { - struct EventObject *eventObj; + struct ObjectEvent *objEvent; if (gTrainerApproachedPlayer == TRUE) { - eventObj = &gEventObjects[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].eventObjectId]; - gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(eventObj->facingDirection)); + objEvent = &gObjectEvents[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].objectEventId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(objEvent->facingDirection)); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } else { - eventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(eventObj->facingDirection); + objEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(objEvent->facingDirection); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; - ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); + ScriptMovement_StartObjectMovementScript(OBJ_EVENT_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } - SetMovingNpcId(EVENT_OBJ_ID_PLAYER); + SetMovingNpcId(OBJ_EVENT_ID_PLAYER); } @@ -1035,7 +1035,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) return 0; } -void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) +void GabbyAndTySetScriptVarsToObjectEventLocalIds(void) { switch (GabbyAndTyGetBattleNum()) { @@ -3594,7 +3594,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80F01B8(void) { VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); - RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); } diff --git a/src/union_room.c b/src/union_room.c index d6b712558..ada2f0b46 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -10,7 +10,7 @@ #include "dynamic_placeholder_text_util.h" #include "easy_chat.h" #include "event_data.h" -#include "event_obj_lock.h" +#include "event_object_lock.h" #include "field_control_avatar.h" #include "field_player_avatar.h" #include "field_screen_effect.h" @@ -4249,7 +4249,7 @@ void sub_801818C(bool32 arg0) void sub_80181CC(void) { ScriptContext2_Enable(); - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); } u8 sub_80181DC(struct UnkStruct_URoom *arg0) diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 0b7324366..7f8d6066f 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -7,7 +7,7 @@ #include "task.h" #include "union_room.h" #include "constants/event_objects.h" -#include "constants/event_object_movement_constants.h" +#include "constants/event_object_movement.h" #include "constants/flags.h" EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL; @@ -124,30 +124,30 @@ static void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId) VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId); } -static void CreateUnionRoomPlayerEventObject(u32 playerIdx) +static void CreateUnionRoomPlayerObjectEvent(u32 playerIdx) { - TrySpawnEventObject(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } -static void RemoveUnionRoomPlayerEventObject(u32 playerIdx) +static void RemoveUnionRoomPlayerObjectEvent(u32 playerIdx) { - RemoveEventObjectByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement) { u8 objectId; - struct EventObject * object; - if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) + struct ObjectEvent * object; + if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) { return FALSE; } - object = &gEventObjects[objectId]; - if (EventObjectIsMovementOverridden(object)) + object = &gObjectEvents[objectId]; + if (ObjectEventIsMovementOverridden(object)) { return FALSE; } - if (EventObjectSetHeldMovement(object, *movement)) + if (ObjectEventSetHeldMovement(object, *movement)) { return FALSE; } @@ -157,23 +157,23 @@ static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * move static bool32 sub_8019B3C(u32 playerIdx) { u8 objectId; - struct EventObject * object; - if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) + struct ObjectEvent * object; + if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) { return TRUE; } - object = &gEventObjects[objectId]; - if (!EventObjectClearHeldMovementIfFinished(object)) + object = &gObjectEvents[objectId]; + if (!ObjectEventClearHeldMovementIfFinished(object)) { return FALSE; } if (!ScriptContext2_IsEnabled()) { - UnfreezeEventObject(object); + UnfreezeObjectEvent(object); } else { - FreezeEventObject(object); + FreezeObjectEvent(object); } return TRUE; } @@ -208,7 +208,7 @@ static bool32 sub_8019BDC(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr case 1: if (sub_8019B3C(playerIdx)) { - RemoveUnionRoomPlayerEventObject(playerIdx); + RemoveUnionRoomPlayerObjectEvent(playerIdx); HideUnionRoomPlayer(playerIdx); *a0 = 0; return TRUE; @@ -240,7 +240,7 @@ static bool32 sub_8019C38(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr break; } SetUnionRoomPlayerGfx(playerIdx, ptr->field_1); - CreateUnionRoomPlayerEventObject(playerIdx); + CreateUnionRoomPlayerObjectEvent(playerIdx); ShowUnionRoomPlayer(playerIdx); (*a0)++; // fallthrough @@ -310,7 +310,7 @@ static void sub_8019D44(u32 playerIdx, struct UnkStruct_8019BA8 * ptr) { ptr->field_0 = 0; ptr->field_2 = 0; - RemoveUnionRoomPlayerEventObject(playerIdx); + RemoveUnionRoomPlayerObjectEvent(playerIdx); HideUnionRoomPlayer(playerIdx); } else if (sub_8019C38(&ptr->field_2, playerIdx, ptr) == 1) @@ -376,7 +376,7 @@ void sub_8019E3C(void) { if (!IsUnionRoomPlayerHidden(i)) { - RemoveUnionRoomPlayerEventObject(i); + RemoveUnionRoomPlayerObjectEvent(i); HideUnionRoomPlayer(i); } } @@ -391,7 +391,7 @@ void sub_8019E70(u8 * sp8, s32 r9) for (r7 = 0; r7 < 5; r7++) { s32 r5 = 5 * r9 + r7; - sp8[r5] = sprite_new(EVENT_OBJ_GFX_MAN_4, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1); + sp8[r5] = sprite_new(OBJ_EVENT_GFX_MAN_4, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1); sub_8097C44(r5 - 0x38, TRUE); } } diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 1cf196fda..baa93233b 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -149,7 +149,7 @@ string generate_map_events_text(Json map_data) { string objects_label, warps_label, coords_label, bgs_label; if (map_data["object_events"].array_items().size() > 0) { - objects_label = map_data["name"].string_value() + "_EventObjects"; + objects_label = map_data["name"].string_value() + "_ObjectEvents"; text << objects_label << ":\n"; for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i]; |
