diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-21 01:15:34 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-12 18:35:27 -0600 |
| commit | 98ca62cf91e7e0bd33f09edfc848a62061015aee (patch) | |
| tree | 6902d9b2183b6f0a379bf141ed3f88b1e2a36598 | |
| parent | 6356dc03c1736df6ba25f2bc999e211d8e30a9f0 (diff) | |
Standardize Event Object to Object Event
742 files changed, 11800 insertions, 11800 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 7d5e284f1..0c6034410 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1847,11 +1847,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E end RustboroCity_EventScript_1A0166:: @ 81A0166 - 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 RustboroCity_EventScript_1A016C:: @ 81A016C - 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 LavaridgeTown_EventScript_1A0172:: @ 81A0172 @@ -1865,11 +1865,11 @@ Route119_EventScript_1A0172:: @ 81A0172 end LavaridgeTown_EventScript_1A018A:: @ 81A018A - 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 LavaridgeTown_EventScript_1A0190:: @ 81A0190 - 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 AquaHideout_1F_EventScript_1A0196:: @ 81A0196 @@ -1896,30 +1896,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_MAXIE .else - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_ARCHIE .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1 - setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2 + setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_KYOGRE_1 + setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_KYOGRE_2 .else - setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1 - setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2 + setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_GROUDON_1 + setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_GROUDON_2 .endif return diff --git a/data/event_scripts.s b/data/event_scripts.s index b2622e181..ac5507d51 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1841,11 +1841,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E end RustboroCity_EventScript_1A0166:: @ 81A0166 - 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 RustboroCity_EventScript_1A016C:: @ 81A016C - 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 LavaridgeTown_EventScript_1A0172:: @ 81A0172 @@ -1859,11 +1859,11 @@ Route119_EventScript_1A0172:: @ 81A0172 end LavaridgeTown_EventScript_1A018A:: @ 81A018A - 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 LavaridgeTown_EventScript_1A0190:: @ 81A0190 - 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 AquaHideout_1F_EventScript_1A0196:: @ 81A0196 @@ -1890,30 +1890,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_MAXIE .else - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE - setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_ARCHIE .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1 - setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2 + setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_KYOGRE_1 + setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_KYOGRE_2 .else - setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1 - setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2 + setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_GROUDON_1 + setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_GROUDON_2 .endif return diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 0c1480c47..3c792cb58 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3322,4 +3322,4 @@ "blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9ba54183a..b1c4086c0 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 96d49a702..c65a79fdc 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 5, "y": 10, "elevation": 3, @@ -126,4 +126,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 2461f4f46..7c100a73e 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 9, "y": 6, "elevation": 3, @@ -107,4 +107,4 @@ "script": "AbandonedShip_Corridors_B1F_EventScript_15E9D3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index f6cd97821..73c3a0e96 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -50,4 +50,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 1f91ea0e6..78abf1e20 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -90,4 +90,4 @@ "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC98" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 1e7250a37..243d83bdf 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 11, "elevation": 3, @@ -212,4 +212,4 @@ "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" } ] -}
\ 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 179130662..abbe32342 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -12,7 +12,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, @@ -43,4 +43,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 792287b70..1d9d75c42 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -76,4 +76,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 d41973d6c..ce39a1b79 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, @@ -70,4 +70,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 dbff0fb56..e78ef41b1 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, @@ -84,4 +84,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 276c9af99..5ae694e61 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 7, "elevation": 3, @@ -63,4 +63,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 a3e1bafb6..8e891b65d 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -29,4 +29,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 ddffa3ccd..72b161120 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -22,4 +22,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 b9f8d49df..c9286da84 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "graphics_id": "OBJ_EVENT_GFX_REGISTEEL", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "AncientTomb_EventScript_15F042" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 711a88409..d9fac11ab 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 4, "elevation": 3, @@ -76,4 +76,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 1bf19ee24..a5a26ae9b 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 27, "y": 18, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 20, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -295,4 +295,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 c15429c2a..11dcc1a40 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 13, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 19, "y": 20, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -170,4 +170,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_BattleRoom/map.json b/data/maps/BattleTower_BattleRoom/map.json index e01643833..848b03946 100644 --- a/data/maps/BattleTower_BattleRoom/map.json +++ b/data/maps/BattleTower_BattleRoom/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Corridor/map.json b/data/maps/BattleTower_Corridor/map.json index bc61ba6e5..eec8217c8 100644 --- a/data/maps/BattleTower_Corridor/map.json +++ b/data/maps/BattleTower_Corridor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 2, "elevation": 3, @@ -28,4 +28,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Elevator/map.json b/data/maps/BattleTower_Elevator/map.json index fa1eed087..43e78ec05 100644 --- a/data/maps/BattleTower_Elevator/map.json +++ b/data/maps/BattleTower_Elevator/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, @@ -28,4 +28,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Lobby/map.json b/data/maps/BattleTower_Lobby/map.json index 8a155bb78..8b630bfdd 100644 --- a/data/maps/BattleTower_Lobby/map.json +++ b/data/maps/BattleTower_Lobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 12, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 4, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_REPORTER_BATTLE_TOWER" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 6, "elevation": 3, @@ -124,4 +124,4 @@ "script": "BattleTower_Lobby_EventScript_160727" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index c510f0232..bac2dff05 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -19,7 +19,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C compare VAR_0x8007, 50 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special TryInitBattleTowerAwardManEventObject + special TryInitBattleTowerAwardManObjectEvent return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD @@ -27,7 +27,7 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD compare VAR_0x8007, 100 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special TryInitBattleTowerAwardManEventObject + special TryInitBattleTowerAwardManObjectEvent return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 diff --git a/data/maps/BattleTower_Outside/map.json b/data/maps/BattleTower_Outside/map.json index 8fe21534b..761dc2a10 100644 --- a/data/maps/BattleTower_Outside/map.json +++ b/data/maps/BattleTower_Outside/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 18, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 10, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 19, "y": 26, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 24, "elevation": 3, @@ -97,4 +97,4 @@ "script": "BattleTower_Outside_EventScript_16025A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 1c5957605..0a12aa36e 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -57,4 +57,4 @@ } ], "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 d0c378768..ed873116c 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json index 793424743..9c35a6ad3 100644 --- a/data/maps/CaveOfOrigin_B2F/map.json +++ b/data/maps/CaveOfOrigin_B2F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index d6989c689..8dce96798 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 5, "elevation": 3, @@ -71,4 +71,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 31376fa77..8ab4aa087 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 10, "elevation": 3, @@ -64,4 +64,4 @@ } ], "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 160d8f11f..12df1094b 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 6f9f801eb..6e8529525 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "graphics_id": "OBJ_EVENT_GFX_REGIROCK", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "DesertRuins_EventScript_15CB77" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 12baca163..9fe0e921d 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 12, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 9, "elevation": 3, @@ -49,7 +49,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, @@ -62,7 +62,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, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 6, "elevation": 3, @@ -168,4 +168,4 @@ "script": "DewfordTown_EventScript_14E0BD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 8d466ac25..eec89848c 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "graphics_id": "OBJ_EVENT_GFX_BRAWLY", "x": 14, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 1, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 5, "y": 24, "elevation": 3, @@ -128,4 +128,4 @@ "script": "DewfordTown_Gym_EventScript_15326E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 0f82fb6d0..ff4fa0065 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 1, "y": 5, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 4, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 3, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 5, "y": 2, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 14, "y": 7, "elevation": 0, @@ -90,7 +90,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, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 15, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -164,4 +164,4 @@ "script": "DewfordTown_Hall_EventScript_153363" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index ea60b5b2a..d4774d408 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 4, "y": 2, "elevation": 3, @@ -69,4 +69,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 502361cc0..87ab4a86b 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 3, "elevation": 3, @@ -56,4 +56,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 6d45f5e01..bf90976b0 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 0, @@ -76,4 +76,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 68322ae20..67ce247cc 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index b7c3bad8f..3ce7e8570 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -80,4 +80,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 5b45d25af..643d4db3d 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -190,4 +190,4 @@ "script": "EverGrandeCity_EventScript_1A00EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 4b581716c..67025f33f 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_RIVAL_CHAMPIONS_ROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 12, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor1/map.json b/data/maps/EverGrandeCity_Corridor1/map.json index d22b9db11..86723c0f2 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.json +++ b/data/maps/EverGrandeCity_Corridor1/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor2/map.json b/data/maps/EverGrandeCity_Corridor2/map.json index 6d87a7667..692e6daa7 100644 --- a/data/maps/EverGrandeCity_Corridor2/map.json +++ b/data/maps/EverGrandeCity_Corridor2/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor3/map.json b/data/maps/EverGrandeCity_Corridor3/map.json index f83993e77..aa5544f4d 100644 --- a/data/maps/EverGrandeCity_Corridor3/map.json +++ b/data/maps/EverGrandeCity_Corridor3/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor4/map.json b/data/maps/EverGrandeCity_Corridor4/map.json index c74147e67..9c0daf82f 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.json +++ b/data/maps/EverGrandeCity_Corridor4/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor5/map.json b/data/maps/EverGrandeCity_Corridor5/map.json index c1968cd1e..c310da938 100644 --- a/data/maps/EverGrandeCity_Corridor5/map.json +++ b/data/maps/EverGrandeCity_Corridor5/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index e26096649..c027a16f6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "graphics_id": "OBJ_EVENT_GFX_DRAKE", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 364c524e2..286bfdd39 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "graphics_id": "OBJ_EVENT_GFX_GLACIA", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index f4b7c36c8..297d66426 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 6, "y": 16, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 71b7eba91..36a42757d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "graphics_id": "OBJ_EVENT_GFX_PHOEBE", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 719252e66..2de6531f9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 7, "elevation": 3, @@ -76,4 +76,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 c52dcb52c..dca22233b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index c5cfa4062..0a74924fc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 16, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 2, "elevation": 3, @@ -96,4 +96,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 a3e51d8de..72ff929f6 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "graphics_id": "OBJ_EVENT_GFX_SIDNEY", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 2241e06b3..0d37b1514 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 11, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 9, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 15, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 12, "elevation": 3, @@ -179,4 +179,4 @@ "flag": "FLAG_HIDDEN_ITEM_1C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index 0c40a8767..40294eafb 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 19, "y": 8, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 7, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 0, "y": 15, "elevation": 0, @@ -86,4 +86,4 @@ "script": "FallarborTown_ContestHall_EventScript_153AEA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index cc0849449..d814c1b3c 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 2, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 0, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_FALLARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 2, "elevation": 3, @@ -148,4 +148,4 @@ "script": "FallarborTown_ContestLobby_EventScript_153AC2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index d2a9e287d..94a3ea653 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_PROF_COSMO_FALLARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index fa3cee306..b113df4ea 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -12,7 +12,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, @@ -43,4 +43,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 bb9f173d5..a2ef49c03 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 5, "elevation": 3, @@ -82,4 +82,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 d5c94de23..7642da9bb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, @@ -89,4 +89,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 9fab7e284..0279f1562 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -90,4 +90,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 7db7c586a..1af09e409 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_FIERY_PATH_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, @@ -38,7 +38,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, @@ -51,7 +51,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, @@ -64,7 +64,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, @@ -77,7 +77,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, @@ -90,7 +90,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, @@ -103,7 +103,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, @@ -134,4 +134,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 8e51423b3..79177c4c6 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 31, "y": 3, "elevation": 4, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 32, "y": 16, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 32, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 14, "elevation": 4, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 8, "y": 10, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 9, "y": 16, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 8, "elevation": 3, @@ -230,4 +230,4 @@ "script": "FortreeCity_EventScript_1A00E1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 6d3ea3a85..9dcd666c3 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 2, "elevation": 3, @@ -82,4 +82,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 d2b78027e..d2a9b517e 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WINONA", + "graphics_id": "OBJ_EVENT_GFX_WINONA", "x": 4, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 12, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 9, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 18, "y": 19, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 18, "y": 1, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 19, "elevation": 3, @@ -125,4 +125,4 @@ "script": "FortreeCity_Gym_EventScript_157FED" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 47f18883c..b1dfbf2d7 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 7, "y": 4, "elevation": 3, @@ -69,4 +69,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 6285e9693..5f14237e1 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 2, "y": 3, "elevation": 3, @@ -43,4 +43,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 7859f5942..3f23b0ada 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,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, @@ -56,4 +56,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 544c5e153..a217711ba 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 1, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 3, "elevation": 3, @@ -69,4 +69,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 5f8ecdcde..1b3535ddf 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 6, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -69,4 +69,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 b12606304..366dd8d69 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 6, "elevation": 3, @@ -82,4 +82,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 11d44415e..c18237db4 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 3, "elevation": 3, @@ -89,4 +89,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 56d6484bb..7a19eb100 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 6d83020d3..be6ec6372 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 7, "elevation": 3, @@ -70,4 +70,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 92c124cff..65c55e08d 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -12,7 +12,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, @@ -78,4 +78,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 4c76d1534..5060b2f3b 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 14, "elevation": 3, @@ -51,7 +51,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, @@ -64,7 +64,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, @@ -77,7 +77,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, @@ -90,7 +90,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, @@ -103,7 +103,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, @@ -116,7 +116,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, @@ -185,4 +185,4 @@ "flag": "FLAG_HIDDEN_ITEM_31" } ] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 2a9c53104..28d6e9e8c 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 7, "y": 8, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 04065d10b..23d0d9acc 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 3, "elevation": 8, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 2, "y": 3, "elevation": 8, @@ -145,4 +145,4 @@ "script": "InsideOfTruck_EventScript_15FC8B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index f519a7003..93fbe62c9 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGICE", + "graphics_id": "OBJ_EVENT_GFX_REGICE", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "IslandCave_EventScript_15EF7C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 63de6d018..562ba58ed 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 18, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 16, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 24, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_JAGGED_PASS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 35, "elevation": 3, @@ -149,4 +149,4 @@ "flag": "FLAG_HIDDEN_ITEM_4C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index ef3ec701f..5f3efd98d 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -18,7 +18,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 7, "elevation": 3, @@ -31,7 +31,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 1, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 8, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 10, "y": 13, "elevation": 3, @@ -70,7 +70,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, @@ -83,7 +83,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, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 6, "y": 16, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 12, "y": 15, "elevation": 0, @@ -122,7 +122,7 @@ "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 4, "y": 7, "elevation": 3, @@ -256,4 +256,4 @@ "flag": "FLAG_HIDDEN_ITEM_0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 8abb700fe..8abc65dc9 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "graphics_id": "OBJ_EVENT_GFX_FLANNERY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 10, "y": 19, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 4, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 2, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 6, "y": 23, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 6, "y": 2, "elevation": 3, @@ -278,4 +278,4 @@ "script": "LavaridgeTown_Gym_1F_EventScript_153888" } ] -}
\ 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 5b43c5bcb..4f11e429f 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -155,4 +155,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 041a08509..651ec648b 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 3, "elevation": 3, @@ -69,4 +69,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 30a9e1505..4035f889a 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 2, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 6, "y": 6, "elevation": 3, @@ -56,4 +56,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 cd194d233..060d69e0c 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 9, "y": 5, "elevation": 3, @@ -69,4 +69,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 c6257850c..b823fcabe 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 6, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 3, "elevation": 3, @@ -96,4 +96,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 6e32a6da9..ec48712c6 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -90,4 +90,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 8e40cf42a..678e72a1f 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 32, "y": 20, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 15, "y": 18, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 28, "y": 28, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 21, "y": 15, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 16, "y": 9, "elevation": 5, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 35, "y": 27, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 35, "y": 37, "elevation": 5, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 34, "y": 37, "elevation": 5, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 17, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 73, "y": 15, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 61, "y": 36, "elevation": 5, @@ -166,7 +166,7 @@ "flag": "FLAG_ITEM_LILYCOVE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 43, "y": 18, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 46, "y": 12, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 45, "y": 12, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 38, "y": 9, "elevation": 5, @@ -218,7 +218,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 50, "y": 7, "elevation": 5, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 27, "y": 7, "elevation": 5, @@ -458,4 +458,4 @@ "flag": "FLAG_HIDDEN_ITEM_4B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 31d149109..b77a43092 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 11, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 40, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 12, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 15, "y": 22, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 25, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 25, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 25, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 16, "y": 25, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 24, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 18, "y": 24, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 24, "y": 10, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 27, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 22, "y": 13, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 24, "y": 13, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 26, "y": 13, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 28, "y": 13, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, "y": 10, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 30, "y": 11, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 8, "elevation": 3, @@ -285,7 +285,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 20, "elevation": 3, @@ -298,7 +298,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 36, "y": 22, "elevation": 3, @@ -311,7 +311,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 39, "y": 22, "elevation": 3, @@ -324,7 +324,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 34, "y": 25, "elevation": 3, @@ -337,7 +337,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 36, "y": 25, "elevation": 3, @@ -350,7 +350,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 38, "y": 25, "elevation": 3, @@ -363,7 +363,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 40, "y": 25, "elevation": 3, @@ -376,7 +376,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 32, "y": 23, "elevation": 3, @@ -389,7 +389,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 37, "y": 20, "elevation": 3, @@ -402,7 +402,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 42, "y": 24, "elevation": 3, @@ -415,7 +415,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 26, "elevation": 3, @@ -509,4 +509,4 @@ "script": "LilycoveCity_ContestHall_EventScript_159315" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 6d87bca77..ec02f26f1 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 1, "y": 1, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 14, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 20, "y": 2, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 8, "y": 10, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 18, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 19, "y": 9, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 1, "elevation": 0, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_ARTIST_LILCOVE_CONTEST" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 6, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 7, "elevation": 3, @@ -275,4 +275,4 @@ "script": "LilycoveCity_ContestLobby_EventScript_15908D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 92c382057..c7ef3cb00 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -12,7 +12,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, @@ -60,4 +60,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index a24cad6ad..6d5093142 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 3, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 7, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -101,4 +101,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 146a13d89..9ea7fd933 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 5, "elevation": 3, @@ -43,4 +43,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 cb8b47317..0ec2ad64b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,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, @@ -79,4 +79,4 @@ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD" } ] -}
\ 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 7dea79e10..1d88cb7ae 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 4, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 6, "elevation": 3, @@ -131,4 +131,4 @@ "script": "LilycoveCity_DepartmentStore_1F_EventScript_159F05" } ] -}
\ 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 77c1c429d..fa87aaa80 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 0, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 6, "elevation": 3, @@ -102,4 +102,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 5734db8d1..a8b94d162 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 13, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 8, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 2, "elevation": 3, @@ -102,4 +102,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 62b267e00..17aa1c20c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 6, "elevation": 3, @@ -102,4 +102,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 32233acd4..23da6139d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 1, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 15, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 17, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 5, "elevation": 3, @@ -128,4 +128,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_EmptyMap/map.json b/data/maps/LilycoveCity_EmptyMap/map.json index c762be1ef..555c36be7 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.json +++ b/data/maps/LilycoveCity_EmptyMap/map.json @@ -22,4 +22,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 a39d10445..1c58a59a7 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 13, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 10, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 436108db1..efc66e267 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,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 5bbf047eb..47d919218 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -12,7 +12,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, @@ -43,4 +43,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 b9a6565ba..ee0bd57b5 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 1, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 2, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 2, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -108,4 +108,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 7b0393b39..7645f5564 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,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 d24a66165..07ef68f64 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 12, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 2, "elevation": 3, @@ -38,7 +38,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, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 2, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 3, "y": 8, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 11, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 19, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 6, "y": 2, "elevation": 3, @@ -296,4 +296,4 @@ "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15854F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index e463c2b09..64b70f3d1 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 10, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 19, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 14, "y": 6, "elevation": 3, @@ -172,4 +172,4 @@ "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15853D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index d84c669f7..97b012072 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,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 f9c5e37ec..cca7088ee 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 8, "elevation": 3, @@ -76,4 +76,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 bbc4ebb00..549fe96df 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 1e0fe952d..7310a5ed5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 8, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 5, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 11, "elevation": 3, @@ -77,7 +77,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, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_FANCLUB_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 3, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_FANCLUB_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 10, "y": 10, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 9eb06baa0..f66009546 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 4527b75c2..ba40fea8f 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 7, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 8, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 2, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 4, "y": 2, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 5, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 10, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 12, "y": 5, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 2, "y": 5, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_LINK_CONTEST_ROOM_POKEBALL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 7, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 6, "elevation": 3, @@ -210,4 +210,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index b5b6a92ce..870eeb331 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - 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 FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - 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/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json index bc020148a..c018394a4 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/LinkContestRoom2/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json index 9a7446dad..2cd4ac89e 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/LinkContestRoom3/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json index efd3fbedb..0c1bd764f 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/LinkContestRoom4/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json index 042f5286e..c2360ee23 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/LinkContestRoom5/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json index e73501882..cc556b5ca 100644 --- a/data/maps/LinkContestRoom6/map.json +++ b/data/maps/LinkContestRoom6/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index f012ff56f..2a432f363 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -18,7 +18,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_3", "x": 16, "y": 10, "elevation": 3, @@ -31,7 +31,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 13, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_FAT_MAN_LITTLEROOT" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 14, "y": 17, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 5, "y": 8, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "FLAG_HIDE_MOM_LITTLEROOT" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 2, "y": 10, "elevation": 4, @@ -83,7 +83,7 @@ "flag": "FLAG_HIDE_MOVING_TRUCK_BRENDAN" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 11, "y": 10, "elevation": 4, @@ -236,4 +236,4 @@ "script": "LittlerootTown_EventScript_14D834" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index fa1ac38ad..166451028 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 2, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX", "x": 1, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_FACING_AWAY", "x": 4, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_BRENDAN_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -112,4 +112,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 40ef52b9a..bb38b7c46 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 0, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BRENDAN_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 0, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 4, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 0, "elevation": 0, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 1, "elevation": 0, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 3, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 4, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 5, "elevation": 0, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 7, "y": 1, "elevation": 3, @@ -238,4 +238,4 @@ "script": "LittlerootTown_BrendansHouse_2F_EventScript_152870" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index f2416f54c..15b502ef3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MAY_MOM_DOWNSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_FACING_AWAY", "x": 6, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX", "x": 9, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_MAY_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -112,4 +112,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index db982aaf5..8c1861439 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MAY_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 6, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 2, "y": 6, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 4, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 5, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 7, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 7, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 2, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 3, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 4, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 5, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 1, "y": 1, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_MOM_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL", "x": 3, "y": 4, "elevation": 4, @@ -251,4 +251,4 @@ "script": "LittlerootTown_MaysHouse_2F_EventScript_152C39" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 11681f61e..cef892407 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BIRCH_IN_LAB" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 3, @@ -190,4 +190,4 @@ "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 37996e6e8..b4df38381 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 19, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index 4a63a0bd8..e2b9bf84b 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 33, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 41, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 33, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -323,4 +323,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index 121b86c48..e1a03b59c 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 31, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 12, "y": 20, "elevation": 1, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 13, "y": 3, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 20, "elevation": 3, @@ -174,4 +174,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index fb3887037..deef6ac38 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 29, "y": 16, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 24, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 6, "elevation": 3, @@ -85,7 +85,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, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 8, "y": 6, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "FLAG_HIDE_WALLY_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 6, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 29, "y": 9, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "FLAG_HIDE_WATTSON_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 19, "elevation": 3, @@ -268,4 +268,4 @@ "script": "MauvilleCity_EventScript_14C099" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 2d33f59b1..05872fbc9 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 7, "y": 6, "elevation": 3, @@ -73,4 +73,4 @@ "script": "MauvilleCity_BikeShop_EventScript_156988" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 710a912a2..f28ad929e 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 19, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 20, "y": 8, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 13, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 9, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 6, "elevation": 3, @@ -379,4 +379,4 @@ "script": "MauvilleCity_GameCorner_EventScript_1C40AC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index d68b4ac5b..e63936ff8 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 4, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WATTSON_MAUVILLE_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 6, "y": 9, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 2, "y": 15, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 20, "elevation": 3, @@ -153,4 +153,4 @@ "script": "MauvilleCity_Gym_EventScript_156771" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index ad7d843c0..ebf7c9319 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -12,7 +12,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, @@ -43,4 +43,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 58d88282f..2385d61b3 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 4, "y": 5, "elevation": 3, @@ -43,4 +43,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 14e637a85..e4179a323 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 3, @@ -69,4 +69,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 cf578fc29..551ad0e4d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 8, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 11, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 8, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index e8fca6505..d4a8e42ab 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 7, "elevation": 3, @@ -103,4 +103,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 d27e4ba7d..ab56a3c4f 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 20, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 21, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 6, "y": 20, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 6, "y": 20, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 6, "y": 21, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 23, "elevation": 3, @@ -208,4 +208,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 24c133810..4580e9b23 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 13, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 7, "y": 12, "elevation": 3, @@ -100,4 +100,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 2e7a33686..293d0da4f 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -57,4 +57,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 7fb77ab10..d1c02e53a 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -12,7 +12,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, @@ -36,4 +36,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 3a62d9ace..392e7ebd4 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 42, "y": 24, "elevation": 5, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 34, "elevation": 5, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 32, "y": 12, "elevation": 5, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 26, "y": 21, "elevation": 5, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 45, "y": 18, "elevation": 7, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 62, "y": 35, "elevation": 5, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 53, "y": 5, "elevation": 7, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 56, "y": 21, "elevation": 7, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 23, "y": 13, "elevation": 5, @@ -321,4 +321,4 @@ "script": "MossdeepCity_EventScript_14CFE4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index a06d123a8..1c79748c3 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ "script": "MossdeepCity_GameCorner_1F_EventScript_15AE4C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index b67e47009..8eda40f65 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -12,7 +12,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, @@ -36,4 +36,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 390abe349..72b0499c4 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TATE", + "graphics_id": "OBJ_EVENT_GFX_TATE", "x": 8, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 2, "y": 24, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 17, "y": 18, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 17, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 11, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 0, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 8, "y": 29, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LIZA", + "graphics_id": "OBJ_EVENT_GFX_LIZA", "x": 9, "y": 3, "elevation": 3, @@ -206,4 +206,4 @@ "script": "MossdeepCity_Gym_EventScript_15A80A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 5935872d6..fcb0a5455 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,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 85d4a3770..5a43747ff 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 4, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 4, "y": 5, "elevation": 3, @@ -69,4 +69,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 897ce3fa0..b5f4dd201 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,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 27c0640f0..f7bafeb6a 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 4, "elevation": 3, @@ -69,4 +69,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 d42689305..0cc9d7f28 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 1, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 5, "y": 3, "elevation": 3, @@ -82,4 +82,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 467a5150b..4b8a9b59c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 8, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 3, "y": 5, "elevation": 3, @@ -76,4 +76,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 89a6bfddc..bb0bd4786 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 6, "elevation": 3, @@ -103,4 +103,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 1f2d73745..f73363201 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 7, "elevation": 3, @@ -102,4 +102,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 eed6b9e62..b2ddc566f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 5, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index f2659f369..1f3be9321 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 9, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_STEVEN_STEVENS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 4, "elevation": 3, @@ -115,4 +115,4 @@ "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 61497ff7d..f432ddc41 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 24, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 13, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 32, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 28, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 19, "y": 39, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 31, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 16, "y": 37, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 22, "y": 39, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 19, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 18, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 17, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 20, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 22, "y": 19, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 21, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 19, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 12, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 29, "y": 12, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 5, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 31, "y": 5, "elevation": 3, @@ -285,7 +285,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 15, "elevation": 3, @@ -298,7 +298,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 20, "y": 39, "elevation": 3, @@ -311,7 +311,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 21, "y": 39, "elevation": 3, @@ -324,7 +324,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 16, "y": 18, "elevation": 3, @@ -337,7 +337,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 7, "elevation": 3, @@ -350,7 +350,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 7, "elevation": 3, @@ -363,7 +363,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 27, "y": 17, "elevation": 3, @@ -425,4 +425,4 @@ "script": "MtChimney_EventScript_15D1DA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index e0bdbc99c..0fd291caa 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 5e96cc77f..5747b70d1 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 21, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 17, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 13, "y": 10, "elevation": 3, @@ -97,4 +97,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 fe048207c..dba85a8fa 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_MT_PYRE_2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 5, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 8, "elevation": 3, @@ -129,4 +129,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 aa22262f3..594e6bf08 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 12, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 3, @@ -97,4 +97,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 ce16ca88d..a47ced86c 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -84,4 +84,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 98ac6cfc2..465ed07f7 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 3, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -77,4 +77,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 aa7dcbb8b..f95bc310d 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 9, "elevation": 3, @@ -56,4 +56,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 a7bebab0b..e58591664 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 40, "elevation": 3, @@ -126,4 +126,4 @@ "flag": "FLAG_HIDDEN_ITEM_4E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 1b6007fc3..c57858d45 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 22, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 23, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LEADER_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 23, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 25, "y": 15, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 11, "elevation": 3, @@ -187,4 +187,4 @@ "flag": "FLAG_HIDDEN_ITEM_50" } ] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 0d519bcd0..4162f2bfb 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -39,4 +39,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 787a05e2d..53f6cd305 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_5" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 18, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 10, "elevation": 3, @@ -283,4 +283,4 @@ "script": "NewMauville_Inside_EventScript_15E8E0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 5653cd4ad..55c96ca33 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 13, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 19, "elevation": 3, @@ -190,4 +190,4 @@ "script": "OldaleTown_EventScript_1A00E1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index cfae29190..51c124e99 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -12,7 +12,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, @@ -43,4 +43,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 792d74c52..e9e477ca1 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,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, @@ -56,4 +56,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 d8d8d9154..5ef397b20 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 4, "elevation": 3, @@ -69,4 +69,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 f33bfda02..5f27f1af7 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 7, "elevation": 3, @@ -89,4 +89,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 2797b36de..2da8b5347 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 a8cff836a..e2d2c51e0 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 23, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 11, "y": 14, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 9, "y": 16, "elevation": 3, @@ -133,4 +133,4 @@ "script": "PacifidlogTown_EventScript_1A00EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8593de30f..8d8f7872f 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 4, "elevation": 3, @@ -56,4 +56,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 d63c501c4..c0ec16e14 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 1, "y": 7, "elevation": 3, @@ -69,4 +69,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 1585a2133..b42480887 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 2, "elevation": 3, @@ -56,4 +56,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 1d61f1cb8..20fdcc9f7 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 4, "elevation": 3, @@ -69,4 +69,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 ea88241c2..541cac276 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -56,4 +56,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 807c25cc7..629093f52 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 3, @@ -89,4 +89,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 312f2debf..aaa4c37c9 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 700132ab2..f9e9029a1 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 18, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "FLAG_HIDE_WALLY_MOM_PETALBURG_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 15, "y": 10, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_WALLY_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 20, "y": 10, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 15, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 11, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_WALLY_MOTHER_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_ITEM_PETALBURG_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 28, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_ITEM_PETALBURG_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 15, "elevation": 3, @@ -288,4 +288,4 @@ "flag": "FLAG_HIDDEN_ITEM_5F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 92ee7ca46..f18ca8549 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 4, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_NORMAN_PETALBURG_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 94, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 81, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 42, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 55, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 68, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 29, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 109, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_GUIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 4, "y": 111, "elevation": 3, @@ -525,4 +525,4 @@ "script": "PetalburgCity_Gym_EventScript_1551BA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 975013262..306e3b6aa 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,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 54c64bd0f..795a86244 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 5, "elevation": 3, @@ -25,7 +25,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, @@ -56,4 +56,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 1c687123a..1cc632844 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 6, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -82,4 +82,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 bc88e34fd..ac27f67a3 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 11, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 4, "elevation": 3, @@ -102,4 +102,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 92c27f737..9f32c5995 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 924f08084..2eb5e8ce3 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 7, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index d93e6e2f7..619808a48 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 26, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 26, "y": 20, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_DEVON_PETALBURG_WOODS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 20, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 8, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 15, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 32, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 14, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 30, "y": 34, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_4" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 33, "y": 5, "elevation": 3, @@ -295,4 +295,4 @@ "script": "PetalburgWoods_EventScript_15CF1E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 9170a1bbe..513fe058c 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 10, "y": 5, "elevation": 3, @@ -94,4 +94,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index cd5cf9c6c..58f046257 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 16, "y": 8, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 13, "elevation": 0, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_BIRCH_BATTLE_POOCHYENA" }, { - "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", "x": 7, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_HIDE_BIRCH_STARTERS_BAG" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 10, "y": 13, "elevation": 0, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_POOCHYENA_ROUTE101" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 5, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_BIRCH_ROUTE101" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 13, "elevation": 3, @@ -195,4 +195,4 @@ "script": "Route101_EventScript_14EA76" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 8a270897c..a08922258 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 18, "y": 11, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 14, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 15, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 37, "y": 4, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 15, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_ITEM_ROUTE102_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 2, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 4, "elevation": 3, @@ -160,4 +160,4 @@ "script": "Route102_EventScript_14EAE3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 6b2419465..02f9b30c3 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 49, "y": 12, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE103" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 71, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 65, "y": 11, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 64, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 50, "y": 8, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 58, "y": 5, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 59, "y": 5, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 60, "y": 5, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 20, "y": 10, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 7, "y": 3, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_BIRCH_ROUTE103" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 56, "y": 12, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 63, "y": 8, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_ITEM_ROUTE103_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 67, "y": 7, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 69, "y": 7, "elevation": 3, @@ -230,4 +230,4 @@ "script": "Route103_EventScript_14ED8B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 3be9b9c9d..402186fe0 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 60, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 25, "y": 49, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 31, "y": 24, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 27, "y": 63, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 30, "y": 50, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 28, "y": 74, "elevation": 3, @@ -106,7 +106,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, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 51, "elevation": 4, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 29, "y": 8, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 6, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 6, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 41, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 41, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 41, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 37, "y": 8, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 22, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 23, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 24, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 25, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 15, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_ITEM_ROUTE104_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 8, "y": 19, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 27, "y": 15, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 28, "y": 15, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 11, "y": 44, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 22, "y": 25, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_ITEM_ROUTE104_2" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 67, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 22, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_ITEM_ROUTE104_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 22, "elevation": 3, @@ -418,7 +418,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, @@ -431,7 +431,7 @@ "flag": "FLAG_ITEM_ROUTE104_4" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 26, "elevation": 3, @@ -585,4 +585,4 @@ "flag": "FLAG_HIDDEN_ITEM_58" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 55e841a63..c63adc21d 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,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 6dbcdeb34..43be93d0c 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 11, "y": 6, "elevation": 4, @@ -69,4 +69,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 ba74f5320..5d3ecfb4a 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 27, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 13, "y": 9, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 13, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 25, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 16, "y": 30, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 34, "y": 2, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 14, "y": 4, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 27, "y": 29, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 26, "y": 29, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 17, "y": 37, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 28, "elevation": 3, @@ -196,4 +196,4 @@ "script": "Route104_Prototype_EventScript_160D25" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 3b43b7439..98e93f16a 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 2, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "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 9b23945b3..9a4119af2 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 60, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 10, "y": 44, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 26, "y": 36, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 19, "y": 9, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 73, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE105_1" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 51, "elevation": 3, @@ -121,4 +121,4 @@ "flag": "FLAG_HIDDEN_ITEM_59" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 72ecc9cd7..db91a4888 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 29, "y": 11, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 5, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 51, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 65, "y": 14, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 14, "elevation": 3, @@ -132,4 +132,4 @@ "script": "Route106_EventScript_14F32F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 9d92a48c6..38aeaa80a 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 27, "y": 10, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 38, "y": 11, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 50, "y": 6, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 16, "y": 11, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 4, "elevation": 1, @@ -88,7 +88,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,4 +104,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 505462bb1..c4589064e 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 17, "y": 13, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 6, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 50, "y": 10, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 36, "y": 12, "elevation": 1, @@ -95,4 +95,4 @@ "flag": "FLAG_HIDDEN_ITEM_56" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index f6ba28567..520b0590a 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -23,7 +23,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, @@ -36,7 +36,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 24, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE109" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 12, "y": 36, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 25, "y": 42, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 19, "y": 19, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 11, "elevation": 4, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 21, "y": 11, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 8, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 11, "y": 6, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 48, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE109_1" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 29, "y": 32, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 31, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 15, "y": 52, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 24, "y": 17, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 25, "y": 17, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 30, "y": 32, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 41, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 9, "y": 41, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 33, "y": 6, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 32, "y": 6, "elevation": 3, @@ -359,4 +359,4 @@ "flag": "FLAG_HIDDEN_ITEM_5B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index f13c989a7..f5ab2fc3b 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 14, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 5, "elevation": 3, @@ -82,4 +82,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 39771ce64..900b7b0e9 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 17, "y": 90, "elevation": 3, @@ -41,7 +41,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, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 14, "y": 69, "elevation": 3, @@ -67,7 +67,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, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 11, "elevation": 3, @@ -93,7 +93,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, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 15, "y": 7, "elevation": 3, @@ -119,7 +119,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, @@ -132,7 +132,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, @@ -145,7 +145,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, @@ -158,7 +158,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, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 5, "y": 39, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 15, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 23, "y": 40, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 10, "y": 19, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 11, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 11, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 11, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 69, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_ITEM_ROUTE110_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 47, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_ITEM_ROUTE110_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 27, "y": 92, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 7, "y": 83, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 83, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 83, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 10, "y": 83, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 82, "elevation": 0, @@ -366,7 +366,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 21, "y": 78, "elevation": 4, @@ -379,7 +379,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 34, "y": 54, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 34, "y": 54, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 69, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 73, "elevation": 3, @@ -658,4 +658,4 @@ "script": "Route110_EventScript_14F9E6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 9cbe4c81e..f5aa399d1 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -12,7 +12,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, @@ -76,4 +76,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index ab14ffdb0..1c101fb14 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -12,7 +12,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, @@ -76,4 +76,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 027edb4dc..116e0994d 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -43,4 +43,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 588dd24c6..fb2b69f8d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -12,7 +12,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, @@ -62,4 +62,4 @@ "flag": "FLAG_HIDDEN_ITEM_1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 115382d52..91fe0ca4d 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -12,7 +12,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, @@ -96,4 +96,4 @@ "script": "Route110_TrickHouseEntrance_EventScript_16158A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 328d1130c..7e751f290 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 21, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 3, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 7, "y": 21, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 12, "y": 18, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 10, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 12, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 3, "y": 12, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 14, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 6, "y": 10, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 9, "y": 8, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 4, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 6, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 6, "y": 4, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 4, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 12, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 14, "y": 14, "elevation": 3, @@ -293,4 +293,4 @@ "script": "Route110_TrickHousePuzzle1_EventScript_161D14" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index a06a5713a..f7cbe12c5 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 16, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 0, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 19, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 2, "elevation": 3, @@ -148,4 +148,4 @@ "script": "Route110_TrickHousePuzzle2_EventScript_161DC3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index e938dbea0..09e65aab2 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 16, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 1, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -142,7 +142,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, @@ -253,4 +253,4 @@ "script": "Route110_TrickHousePuzzle3_EventScript_1626EB" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 383bd64da..43e1e81f6 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 2, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 9, "elevation": 3, @@ -116,7 +116,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, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 8, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 13, "elevation": 3, @@ -168,7 +168,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, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 9, "elevation": 3, @@ -241,4 +241,4 @@ "script": "Route110_TrickHousePuzzle4_EventScript_16274E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index feb75a963..9ce88d3b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 12, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 12, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 1, "y": 6, "elevation": 3, @@ -238,4 +238,4 @@ "script": "Route110_TrickHousePuzzle5_EventScript_1627D5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 289c15127..a6394d018 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 14, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 0, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 2, "elevation": 3, @@ -98,4 +98,4 @@ "script": "Route110_TrickHousePuzzle6_EventScript_1630EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index c599fd181..373b30748 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 9, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 10, "elevation": 3, @@ -148,4 +148,4 @@ "script": "Route110_TrickHousePuzzle7_EventScript_163375" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 58fd42a74..936925f86 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 12, "y": 21, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 12, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -98,4 +98,4 @@ "script": "Route110_TrickHousePuzzle8_EventScript_16341C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index a759b157c..5a5c23e2e 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 13, "y": 114, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_VICTOR_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 13, "y": 113, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_VICTORIA_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 113, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_VIVI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 13, "y": 113, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_VICKI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 51, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 91, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 24, "y": 60, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 69, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 21, "y": 47, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 32, "y": 72, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 101, "elevation": 3, @@ -223,7 +223,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, @@ -236,7 +236,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, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 105, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_ITEM_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 54, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_ITEM_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 114, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "FLAG_ITEM_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 22, "y": 21, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 82, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 71, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 32, "y": 29, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 11, "y": 12, "elevation": 3, @@ -431,7 +431,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 27, "elevation": 3, @@ -444,7 +444,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 20, "elevation": 3, @@ -457,7 +457,7 @@ "flag": "FLAG_HIDE_SECRET_POWER_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 32, "y": 38, "elevation": 3, @@ -470,7 +470,7 @@ "flag": "FLAG_HIDE_ROOT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 33, "y": 38, "elevation": 3, @@ -483,7 +483,7 @@ "flag": "FLAG_HIDE_CLAW_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 20, "y": 114, "elevation": 3, @@ -957,4 +957,4 @@ "flag": "FLAG_HIDDEN_ITEM_39" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 1359d68cc..8269b34f6 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 6, "y": 3, "elevation": 3, @@ -43,4 +43,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 a66ac4543..3241998c5 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 4, "y": 4, "elevation": 3, @@ -82,4 +82,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 b2eef42bc..e6876a2d9 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 26, "y": 30, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 24, "y": 34, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 49, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 46, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 40, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 27, "y": 30, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 27, "y": 6, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 28, "y": 6, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 6, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 50, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 43, "elevation": 3, @@ -255,4 +255,4 @@ "script": "Route112_EventScript_150537" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index c6ed9d9a8..3f9a7377e 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 3a03a4f74..8a49c686c 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 66, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 36, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 62, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 21, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 51, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 7, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_ROUTE113_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 78, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_ITEM_ROUTE113_2" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 66, "y": 3, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 29, "y": 6, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 45, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 46, "y": 6, "elevation": 3, @@ -372,4 +372,4 @@ "flag": "FLAG_HIDDEN_ITEM_1E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 25b73fcff..5e8e6d5a9 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 5, "y": 4, "elevation": 3, @@ -56,4 +56,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 c72be9b6f..9980ae967 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 43, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 44, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 65, "elevation": 7, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 72, "elevation": 5, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 22, "y": 50, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 35, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 20, "y": 56, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 45, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_ITEM_ROUTE114_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 37, "elevation": 4, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE114_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 43, "elevation": 4, @@ -166,7 +166,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 19, "y": 11, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 19, "y": 12, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 27, "y": 42, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 23, "y": 20, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 19, "y": 26, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 30, "y": 58, "elevation": 5, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 53, "elevation": 5, @@ -257,7 +257,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, @@ -270,7 +270,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, @@ -283,7 +283,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, @@ -296,7 +296,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 24, "y": 44, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 23, "y": 44, "elevation": 3, @@ -437,4 +437,4 @@ "flag": "FLAG_HIDDEN_ITEM_2A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 58d91f253..fc6608a89 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 3, "y": 2, "elevation": 3, @@ -83,4 +83,4 @@ "script": "Route114_FossilManiacsHouse_EventScript_15C205" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index bbd151d1d..7a7f76711 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index f959007e4..abde113c6 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 4, "elevation": 3, @@ -68,4 +68,4 @@ "script": "Route114_LanettesHouse_EventScript_15C2D5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 98588d46f..cc2f976d9 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 18, "y": 68, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 15, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 27, "y": 53, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 13, "y": 5, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 50, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 17, "y": 17, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 25, "y": 61, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 60, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE115_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 5, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_ITEM_ROUTE115_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 29, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_ITEM_ROUTE115_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 64, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 65, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 50, "elevation": 3, @@ -218,7 +218,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, @@ -344,4 +344,4 @@ "flag": "FLAG_HIDDEN_ITEM_61" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 615b94d98..8e466e012 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 2, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 7, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 21, "y": 6, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 33, "y": 8, "elevation": 3, @@ -88,7 +88,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, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 6, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_ITEM_ROUTE116_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 17, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_ITEM_ROUTE116_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 20, "y": 2, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 21, "y": 2, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 46, "y": 9, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_BRINEY_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 30, "y": 6, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 15, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 24, "y": 9, "elevation": 3, @@ -205,7 +205,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, @@ -218,7 +218,7 @@ "flag": "FLAG_ITEM_ROUTE116_4" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 22, "y": 16, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 25, "y": 4, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 31, "y": 9, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 46, "y": 11, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 56, "y": 12, "elevation": 4, @@ -283,7 +283,7 @@ "flag": "FLAG_ITEM_ROUTE116_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 38, "y": 9, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_HIDE_TUNNER_DIGGER_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 74, "y": 13, "elevation": 3, @@ -429,4 +429,4 @@ "flag": "FLAG_HIDDEN_ITEM_BLACK_GLASSES" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index d298eedd1..f5927d4b0 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 2, "elevation": 3, @@ -69,4 +69,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 09336cb04..58f8875a2 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 13, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 26, "y": 13, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 47, "y": 4, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 33, "y": 3, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 39, "y": 4, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 42, "y": 2, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 49, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 35, "y": 7, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 31, "y": 11, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 9, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 41, "y": 13, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 42, "y": 13, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 43, "y": 13, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_ITEM_ROUTE117_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 2, "elevation": 3, @@ -218,7 +218,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, @@ -231,7 +231,7 @@ "flag": "FLAG_ITEM_ROUTE117_2" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 21, "y": 1, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 12, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 46, "y": 15, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 45, "y": 15, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 48, "y": 10, "elevation": 3, @@ -340,4 +340,4 @@ "flag": "FLAG_HIDDEN_ITEM_48" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 02b70db9c..abf33dae3 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 2, "y": 2, "elevation": 3, @@ -43,4 +43,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 2ec9a3578..e5c9690e3 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 37, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 64, "y": 10, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 12, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 38, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 8, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 10, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 14, "y": 14, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 56, "y": 7, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 39, "y": 15, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 17, "y": 11, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 44, "y": 7, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE118" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 69, "y": 7, "elevation": 3, @@ -387,4 +387,4 @@ "flag": "FLAG_HIDDEN_ITEM_42" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 74b0263ae..65f784333 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 5, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 5, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 26, "y": 5, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 123, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 26, "y": 123, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 125, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 74, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 116, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 83, "elevation": 4, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 34, "y": 122, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 17, "y": 128, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 28, "y": 16, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 19, "y": 49, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 10, "y": 50, "elevation": 4, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 8, "y": 62, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 25, "y": 32, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE119" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 121, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "FLAG_ITEM_ROUTE119_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 96, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_ITEM_ROUTE119_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_ITEM_ROUTE119_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 76, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_ITEM_ROUTE119_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 18, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_ITEM_ROUTE119_5" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 117, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE119_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 33, "elevation": 4, @@ -322,7 +322,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 34, "elevation": 4, @@ -335,7 +335,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 17, "y": 33, "elevation": 4, @@ -348,7 +348,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 31, "y": 109, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 8, "y": 23, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 23, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 90, "elevation": 3, @@ -400,7 +400,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 90, "elevation": 3, @@ -413,7 +413,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, @@ -426,7 +426,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 56, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "FLAG_ITEM_ROUTE119_7" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 35, "y": 93, "elevation": 4, @@ -452,7 +452,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 29, "y": 6, "elevation": 3, @@ -465,7 +465,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 31, "y": 6, "elevation": 3, @@ -478,7 +478,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE119_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 13, "elevation": 4, @@ -491,7 +491,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE119_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 104, "elevation": 3, @@ -850,4 +850,4 @@ "script": "Route119_EventScript_151605" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 471d9c40f..7c5395d29 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 1, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 0, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 8, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 5, "y": 3, "elevation": 3, @@ -121,4 +121,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 048366667..ef0477682 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 2, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 14, "y": 11, "elevation": 3, @@ -135,4 +135,4 @@ "script": "Route119_WeatherInstitute_1F_EventScript_163C83" } ] -}
\ 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 9d59bb48d..2893c39e8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 10, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 4, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 0, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 7, "elevation": 3, @@ -101,4 +101,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index f8d8e334d..c9a163922 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 4, "y": 79, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 79, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 79, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 79, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 24, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 24, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 24, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 92, "elevation": 5, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 10, "y": 92, "elevation": 5, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 92, "elevation": 5, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 5, "y": 22, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 32, "y": 14, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 27, "y": 51, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 36, "y": 45, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 19, "y": 80, "elevation": 5, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 55, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_ITEM_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 32, "elevation": 3, @@ -296,7 +296,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, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 92, "elevation": 5, @@ -322,7 +322,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 28, "y": 35, "elevation": 3, @@ -335,7 +335,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 60, "elevation": 3, @@ -348,7 +348,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 16, "y": 6, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 18, "y": 34, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 13, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "FLAG_ITEM_ROUTE120_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 82, "elevation": 5, @@ -400,7 +400,7 @@ "flag": "FLAG_ITEM_ROUTE120_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 12, "y": 16, "elevation": 4, @@ -413,7 +413,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 13, "y": 15, "elevation": 4, @@ -426,7 +426,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE120" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 20, "y": 1, "elevation": 3, @@ -439,7 +439,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, @@ -452,7 +452,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 10, "y": 72, "elevation": 3, @@ -465,7 +465,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 19, "y": 28, "elevation": 3, @@ -478,7 +478,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_2", "x": 12, "y": 16, "elevation": 3, @@ -491,7 +491,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 11, "elevation": 3, @@ -504,7 +504,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 27, "y": 2, "elevation": 3, @@ -517,7 +517,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_4" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 77, "elevation": 3, @@ -530,7 +530,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_5" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 7, "y": 51, "elevation": 3, @@ -543,7 +543,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_7" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 19, "y": 48, "elevation": 3, @@ -813,4 +813,4 @@ "secret_base_id": "SECRET_BASE_SHRUB1_4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 8fb438a87..de0def82e 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 29, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 16, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 2, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 64, "y": 14, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 65, "y": 14, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 66, "y": 14, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 67, "y": 14, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 9, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 9, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 7, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 31, "y": 7, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 5, "elevation": 3, @@ -223,7 +223,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, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 63, "y": 5, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 55, "y": 8, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 10, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 22, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 10, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_ITEM_ROUTE121_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 26, "y": 12, "elevation": 3, @@ -431,4 +431,4 @@ "flag": "FLAG_HIDDEN_ITEM_49" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 9664da26a..1bde0de82 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 17, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 2, "elevation": 3, @@ -102,4 +102,4 @@ "script": "Route121_SafariZoneEntrance_EventScript_15C487" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 5f98fcab7..1037df207 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -33,4 +33,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 bfbb21685..3d7914161 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 3, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 3, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 3, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 3, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 81, "y": 1, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 82, "y": 1, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 83, "y": 1, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 70, "y": 12, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 58, "y": 7, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 5, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 5, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 5, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 3, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 3, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 101, "y": 13, "elevation": 3, @@ -257,7 +257,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, @@ -270,7 +270,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, @@ -283,7 +283,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, @@ -296,7 +296,7 @@ "flag": "FLAG_ITEM_ROUTE123_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 139, "y": 18, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE123_2" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 108, "y": 13, "elevation": 3, @@ -322,7 +322,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 109, "y": 13, "elevation": 3, @@ -335,7 +335,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 110, "y": 13, "elevation": 3, @@ -348,7 +348,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 111, "y": 13, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 16, "y": 9, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 38, "y": 13, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 37, "y": 13, "elevation": 3, @@ -400,7 +400,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 138, "y": 12, "elevation": 3, @@ -413,7 +413,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 50, "y": 16, "elevation": 3, @@ -426,7 +426,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 87, "y": 14, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 18, "elevation": 3, @@ -452,7 +452,7 @@ "flag": "FLAG_ITEM_ROUTE123_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 75, "y": 9, "elevation": 3, @@ -701,4 +701,4 @@ "flag": "FLAG_HIDDEN_ITEM_4A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 60abf6aec..2de87d68a 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,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 0c2746806..07c6c35ac 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -38,7 +38,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 58, "y": 59, "elevation": 1, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 33, "y": 25, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 14, "y": 27, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 49, "y": 45, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 60, "y": 74, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_ITEM_ROUTE124_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 53, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_ITEM_ROUTE124_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 11, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_ITEM_ROUTE124_1" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 44, "elevation": 1, @@ -155,7 +155,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, @@ -188,4 +188,4 @@ "script": "Route124_EventScript_151DEF" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 90f82b109..365faa9d2 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 5, "y": 4, "elevation": 0, @@ -52,4 +52,4 @@ "script": "Route124_DivingTreasureHuntersHouse_EventScript_164335" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index daa715f90..1257bc3f3 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 46, "y": 9, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 9, "y": 32, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 31, "y": 33, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 39, "y": 20, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 28, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 20, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 21, "y": 21, "elevation": 3, @@ -154,4 +154,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 568a30c4d..0b1f067d0 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 55, "y": 22, "elevation": 1, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 33, "y": 63, "elevation": 1, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 49, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 64, "y": 44, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -96,4 +96,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 d7aeede26..cf1d10919 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 68, "elevation": 1, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 44, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 7, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "FLAG_ITEM_ROUTE127_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 39, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_ITEM_ROUTE127_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 53, "y": 13, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 52, "y": 25, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 64, "y": 19, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 12, "y": 18, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 63, "y": 63, "elevation": 3, @@ -189,4 +189,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 f660ca061..ffeeea577 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 77, "y": 24, "elevation": 1, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 40, "y": 22, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 37, "y": 22, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_HIDE_EVIL_LEADER_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 38, "y": 21, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "FLAG_HIDE_OTHER_LEADER_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 63, "y": 28, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 24, "y": 8, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 47, "y": 9, "elevation": 3, @@ -165,4 +165,4 @@ "flag": "FLAG_HIDDEN_ITEM_5E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 2e82703ce..49c90b05f 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 15, "y": 23, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 9, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 14, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 28, "y": 16, "elevation": 1, @@ -78,4 +78,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 9dee253e1..050f1dd3b 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 26, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 22, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 52, "y": 9, "elevation": 3, @@ -65,4 +65,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 cedfcb2a5..b8475d8e7 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 17, "y": 25, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 36, "y": 26, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 28, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 23, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 16, "elevation": 1, @@ -88,7 +88,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, @@ -112,4 +112,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 0bbc25537..126e33093 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 3, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 41, "y": 16, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 11, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_ITEM_ROUTE132_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 46, "y": 28, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 9, "y": 16, "elevation": 3, @@ -91,4 +91,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 d0f5c04a1..a62b50133 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 6, "y": 4, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 24, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 69, "y": 24, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 15, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_ITEM_ROUTE133_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE133_2" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 37, "y": 16, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 14, "elevation": 3, @@ -117,4 +117,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 1db9b4559..13cef0f1b 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 9, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 5, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 41, "y": 23, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 65, "y": 14, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 56, "y": 16, "elevation": 3, @@ -91,4 +91,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 eed60f018..f08944375 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 22, "y": 34, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 25, "y": 37, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 21, "y": 46, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 45, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 26, "y": 23, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 24, "y": 51, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 25, "y": 51, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 30, "y": 10, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_DEVON_RUSTBORO" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 21, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GRUNT_RUSTBORO" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 13, "y": 34, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 51, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_ITEM_RUSTBORO_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 19, "y": 27, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 16, "y": 50, "elevation": 3, @@ -497,4 +497,4 @@ "script": "RustboroCity_EventScript_14C440" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index d3de8eede..275bbdf3f 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 2, "elevation": 3, @@ -56,4 +56,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 8958b1f0d..79c98cb82 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 2, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 15, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 5, "y": 3, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ 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 fa0083821..366aa436f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 8, "elevation": 3, @@ -95,4 +95,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 f0ee24e39..cf7d992ee 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 15, "y": 5, "elevation": 3, @@ -79,4 +79,4 @@ "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index c31c09f47..d8e7ffa22 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 12, "y": 4, "elevation": 3, @@ -63,4 +63,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 357559246..b262445ea 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 6, "elevation": 3, @@ -36,4 +36,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 e458782d3..1477e2433 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 11, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -63,4 +63,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 08c2f98b6..c99e411c5 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 11, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 3, "elevation": 3, @@ -56,4 +56,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 1bc864ba9..5a5be9a55 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 7, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 2, "elevation": 3, @@ -49,4 +49,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 2593b63a1..e20a3125b 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "graphics_id": "OBJ_EVENT_GFX_ROXANNE", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 17, "elevation": 3, @@ -99,4 +99,4 @@ "script": "RustboroCity_Gym_EventScript_1579BD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index d0a4a6952..5886df257 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 2, "elevation": 3, @@ -56,4 +56,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 bb13d157c..32e0585bc 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 4, "y": 5, "elevation": 3, @@ -56,4 +56,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 4c85ea665..5aa5ad3cb 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -69,4 +69,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 b8ec482f2..ddd770acc 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 8, "y": 2, "elevation": 3, @@ -82,4 +82,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 84658ac3d..0db82f965 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 3, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -89,4 +89,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 b15b76dee..d4c0a47f8 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 c313a32a8..c83fe43e1 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 8, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 9, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 3, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 8, "elevation": 3, @@ -64,7 +64,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, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 3, "elevation": 3, @@ -149,4 +149,4 @@ "script": "RustboroCity_PokemonSchool_EventScript_157AC5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 735f458e9..517180038 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 5, "elevation": 3, @@ -38,7 +38,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, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 4, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_BRINEY_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNT_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 14, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_PEEKO_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 4, "elevation": 3, @@ -116,7 +116,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, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 25, "y": 4, "elevation": 3, @@ -213,4 +213,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 96a71a548..a9dc2e319 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 7, "y": 2, "elevation": 3, @@ -228,4 +228,4 @@ "script": "SSTidalCorridor_EventScript_15FDCD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 32427e217..2d39a4738 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 7, "y": 4, "elevation": 3, @@ -58,4 +58,4 @@ "flag": "FLAG_HIDDEN_ITEM_23" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index dae890edb..26b8ea700 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 34, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 21, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 22, "y": 11, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 5, "elevation": 3, @@ -221,4 +221,4 @@ "script": "SSTidalRooms_EventScript_15FF47" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index b55b4b17d..162bab045 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 22, "y": 9, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 6, "y": 29, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 10, "elevation": 3, @@ -62,7 +62,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, @@ -75,7 +75,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, @@ -88,7 +88,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, @@ -101,7 +101,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, @@ -114,7 +114,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, @@ -127,7 +127,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, @@ -143,4 +143,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 7ce5e066a..a978577ff 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 8, "elevation": 5, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 7, "elevation": 3, @@ -52,4 +52,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 75441b275..e1e4f1376 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 4, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 8, "y": 4, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 4a221659e..c21f3a5ee 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 32, "y": 34, "elevation": 4, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 26, "y": 28, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 6, "elevation": 5, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 15, "y": 31, "elevation": 3, @@ -86,4 +86,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index aa8783ee7..149fb1d6d 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 22, "y": 9, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 37, "elevation": 3, @@ -69,4 +69,4 @@ "script": "SafariZone_Southwest_EventScript_16002D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 21620a3ff..d77f55591 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -12,7 +12,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, @@ -36,4 +36,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 0aadf9e82..36b4b7c67 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -29,4 +29,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 a112c7687..1ff3e10d6 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -38,7 +38,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, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 10, "elevation": 3, @@ -102,4 +102,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 bfaaa3348..6f118a1b6 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 14, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 9, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 15, "y": 11, "elevation": 3, @@ -161,4 +161,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 c2e2e3ecf..f31764448 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 9, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 5, "elevation": 3, @@ -167,4 +167,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 98bd188b9..28f00360b 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -12,7 +12,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, @@ -57,4 +57,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 111cbb4cd..85ba5add7 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -38,7 +38,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, @@ -51,7 +51,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, @@ -64,7 +64,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, @@ -77,7 +77,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, @@ -115,4 +115,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 b94b49f3f..a554c7531 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -36,4 +36,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 2ec32dfe6..700c3107f 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -29,4 +29,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 0025aa4ff..4c143b175 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -38,7 +38,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, @@ -51,7 +51,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, @@ -64,7 +64,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, @@ -77,7 +77,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, @@ -90,7 +90,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, @@ -103,7 +103,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, @@ -116,7 +116,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, @@ -129,7 +129,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, @@ -142,7 +142,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, @@ -155,7 +155,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, @@ -186,4 +186,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 922ca110b..e308633ec 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 17, "y": 38, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 9, "y": 42, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 9, "y": 42, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 8, "y": 41, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 8, "y": 42, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 17, "y": 38, "elevation": 3, @@ -124,4 +124,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index f7665694e..585bb90d0 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -95,4 +95,4 @@ "script": "SealedChamber_InnerRoom_EventScript_15F1E8" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index f689c055d..c2c74b930 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -255,4 +255,4 @@ "script": "SealedChamber_OuterRoom_EventScript_15F1D9" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index b537b704e..1100ada56 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 52c57c24b..8b3b35721 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 09728d252..11ab94ef5 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 50ee51d18..ce0338ac4 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 cb5e4a4ad..4df7c9b36 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 14970984c..f96c7ac37 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 2bf0b85f3..b1c136f37 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 3430a9beb..348b19024 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 5d07a9a75..8ef1182dc 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 a9aede8fe..9746434b2 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 b7540e17e..4ea1ae21f 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 8e2720d9e..458d8e469 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 e026ff3c4..4b314b856 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 c74be4345..10463cf97 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 b31391a90..cbbf64305 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 adab91085..487c0f09f 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 643829a91..9fcb78bc3 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 943cca9d4..b7c0da914 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 6120fc2a5..349e340eb 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 40cffa28f..c6c0856cf 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 3c9a7af7c..ab18d10de 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 e88ca5209..07481867c 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 ab9b876b7..d1060d26d 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 0fbff9fb6..f717b2c88 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,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 c6d66b6c3..3ae268fa1 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -14,4 +14,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 7226401ef..ef1f1487c 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -14,4 +14,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 51848cfb4..cb85bc9d3 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 18, "y": 15, "elevation": 3, @@ -70,4 +70,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 e0f2701b5..614b0bd45 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 21, "elevation": 4, @@ -49,4 +49,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 8b9fbc81e..cb71337b8 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -12,7 +12,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, @@ -134,4 +134,4 @@ "script": "ShoalCave_LowTideInnerRoom_EventScript_15E2F7" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 4488b4dfa..4caad9c19 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -79,4 +79,4 @@ "script": "ShoalCave_LowTideLowerRoom_EventScript_15E413" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 315d7b271..945c23cf5 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -12,7 +12,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, @@ -52,4 +52,4 @@ "script": "ShoalCave_LowTideStairsRoom_EventScript_15E3B7" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index e961fcfc2..8d401f04f 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 9, "y": 3, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index dee61d817..dc120c3b6 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -36,4 +36,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 a46aea2de..9dc7b05de 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -29,4 +29,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 02ade47fd..712c1c490 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -36,4 +36,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 2c6b535ea..7d25f8c81 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -36,4 +36,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 3aff1cb3a..007456bfc 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -29,4 +29,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 8a2810482..d0d984329 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -29,4 +29,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 1985cc5e2..1d5b0d633 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index f64a9bf89..edb7cb344 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA", "x": 14, "y": 6, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 1207a96fd..537b4fbd3 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 35, "y": 27, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 15, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 26, "y": 29, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 31, "y": 27, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 5, "y": 43, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 20, "y": 37, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 42, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 29, "y": 13, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 28, "y": 14, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 28, "y": 13, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_STERN_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 35, "y": 36, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 28, "y": 46, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 50, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 16, "y": 46, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 18, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 24, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 15, "y": 31, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 27, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 29, "y": 27, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 38, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 5, "y": 51, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 34, "y": 51, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 47, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 11, "y": 47, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_TM_SALESMAN_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 47, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 22, "y": 27, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 27, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 24, "y": 27, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 26, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 26, "elevation": 3, @@ -609,4 +609,4 @@ "script": "SlateportCity_EventScript_14BC3C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index a6c98a621..1b5592f22 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index e9d393dc4..6084fcd54 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 15, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 1, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 12, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 9, "y": 11, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 5, "y": 10, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 0, "y": 17, "elevation": 3, @@ -216,4 +216,4 @@ "script": "SlateportCity_ContestHall_EventScript_155671" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 9daed7053..bcb51b116 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 0, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 9, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 1, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 2, "elevation": 3, @@ -174,4 +174,4 @@ "script": "SlateportCity_ContestLobby_EventScript_15908D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 9dce77426..43aa2334c 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_STERN_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 7, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 8, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 7, "y": 9, "elevation": 1, @@ -185,4 +185,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index 795ccbcbe..596a3c7ad 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index 0cbf020dc..93ff24a83 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,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 e9d3cf528..cf4541605 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 3, @@ -69,4 +69,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 d2cbbf046..7e88562c9 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 7, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 18, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 3, "y": 4, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 17, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 18, "y": 8, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 4, "elevation": 3, @@ -343,4 +343,4 @@ "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C0D" } ] -}
\ 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 9a1696b6e..0495e2b3c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 02de2a32f..578249d64 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 6, "y": 1, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 1, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 1, "y": 3, "elevation": 3, @@ -283,4 +283,4 @@ "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 1c4799881..67c8eb1e3 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 7, "elevation": 3, @@ -76,4 +76,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 8b6acc885..0b97403b1 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 ea2e9c2dd..0226b2688 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 1, "y": 5, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 5, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 4, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 3, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 8, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 10, "y": 8, "elevation": 3, @@ -134,4 +134,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 fc07ddcc4..d506e68aa 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 11, "elevation": 3, @@ -89,4 +89,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 c7e9f2f69..75caaada4 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 9, "elevation": 3, @@ -62,4 +62,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 74f275db9..6a7d8bda2 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -12,7 +12,7 @@ "connections": [], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 20, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 33, "y": 20, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 47, "y": 42, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 32, "y": 21, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 9, "y": 43, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 51, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 43, "y": 26, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 30, "y": 21, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_STEVEN_SOOTOPOLIS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 49, "y": 34, "elevation": 3, @@ -302,4 +302,4 @@ "script": "SootopolisCity_EventScript_14D2F6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 90afefed7..541c548a1 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 24, "elevation": 3, @@ -80,4 +80,4 @@ "script": "SootopolisCity_Gym_1F_EventScript_15B0B3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 37b40f491..1c1f356e7 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -127,4 +127,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 b66dd5768..2bf4bd5ef 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 2, "y": 3, "elevation": 3, @@ -56,4 +56,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 0b4ffb2d6..608a9a9bb 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 3, "y": 3, "elevation": 3, @@ -43,4 +43,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 d2a01f18e..915a3b63a 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 4, "elevation": 3, @@ -56,4 +56,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 f68c71213..33dd96c46 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 3, "elevation": 3, @@ -69,4 +69,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 32bf9dc1f..dd424dcf1 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,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 586979fcf..b7c3a0874 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 3, "elevation": 3, @@ -43,4 +43,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 796901032..9d98555d9 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index e645c2dd5..d4bc31546 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, @@ -73,4 +73,4 @@ "script": "SootopolisCity_House8_EventScript_15B531" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index bb2231ba1..36435f04c 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index bed5ed911..944e7afda 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 7, "elevation": 3, @@ -76,4 +76,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 134e3d67b..83f4627fc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 9863ed343..abac82272 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 23, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 25, "elevation": 1, @@ -65,4 +65,4 @@ "script": "SouthernIsland_Exterior_EventScript_160B4A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 0c925de3f..80c109755 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_LATIOS_OR_LATIAS_FLYING" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 2, "elevation": 0, @@ -65,4 +65,4 @@ "script": "SouthernIsland_Interior_EventScript_160B9B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 4183964ba..1cd1d6f13 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -13,9 +13,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIOS .else - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -29,11 +29,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - 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_160B95:: @ 8160B95 - 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_160B9B:: @ 8160B9B diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index a3351b84f..f80e362be 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 9, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index 4315d5adf..b5da6e8f3 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -82,4 +82,4 @@ "flag": "FLAG_HIDDEN_ITEM_26" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 317a9aaa0..19bb67c63 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -103,4 +103,4 @@ "flag": "FLAG_HIDDEN_ITEM_C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 20b8acfe9..5166a403c 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -63,4 +63,4 @@ "flag": "FLAG_HIDDEN_ITEM_18" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index ce04b09ea..a963da647 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -50,4 +50,4 @@ "flag": "FLAG_HIDDEN_ITEM_1A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index 53d5ee607..d435556ee 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -22,4 +22,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 cd02aeebd..030de2c7e 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 4, "elevation": 3, @@ -75,4 +75,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 109e01432..4a31edb43 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -31,4 +31,4 @@ "script": "Underwater_SealedChamber_EventScript_15F0B8" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index a0cadda64..8250b2a32 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json index 83ca5ce0c..eba4d0b48 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownMap_25_29/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json index c43f27759..4a8343163 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownMap_25_30/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json index a4dc2582a..932a48899 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownMap_25_31/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json index 2f1000c45..32d15dbdc 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownMap_25_32/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json index e0a3cd273..14d6589b6 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownMap_25_33/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json index 7db383760..b4d5c7bab 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownMap_25_34/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 56da57485..c79294e3a 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 17, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 9, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 9, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 6, "y": 10, "elevation": 3, @@ -193,4 +193,4 @@ "script": "VerdanturfTown_EventScript_14E8E5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 9a8c4abe3..80225a30d 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 0, "y": 7, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 20, "y": 15, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 9, "y": 8, "elevation": 3, @@ -86,4 +86,4 @@ "script": "VerdanturfTown_ContestHall_EventScript_153EB2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index a6a1b79fe..feb2dfbed 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 14, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_VERDANTURF" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 0, "y": 3, "elevation": 3, @@ -148,4 +148,4 @@ "script": "VerdanturfTown_ContestLobby_EventScript_153E89" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 52ef96351..21d102b64 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,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 1a345f0e7..dacece217 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,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 ff9a09f9d..367f8e510 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -12,7 +12,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, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 2, "elevation": 3, @@ -82,4 +82,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 5bf660e2d..41945575a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 2, "elevation": 3, @@ -76,4 +76,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 8850238f5..c5dddc69c 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,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 57b32a20c..599bfe697 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 14, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WALLY_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -95,4 +95,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 d7e721397..c26c4fc51 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 33, "y": 22, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 6, "y": 15, "elevation": 4, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 27, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 39, "elevation": 4, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 9, "elevation": 3, @@ -179,4 +179,4 @@ "flag": "FLAG_HIDDEN_ITEM_51" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index a833aaea5..a33cf522a 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -12,7 +12,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, @@ -25,7 +25,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, @@ -38,7 +38,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, @@ -51,7 +51,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, @@ -64,7 +64,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, @@ -77,7 +77,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, @@ -90,7 +90,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, @@ -103,7 +103,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, @@ -116,7 +116,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, @@ -129,7 +129,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, @@ -142,7 +142,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, @@ -155,7 +155,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, @@ -168,7 +168,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, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 37, "y": 12, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 26, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 21, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 34, "y": 3, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_VICTORY_ROAD_ROCK" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 8, "elevation": 4, @@ -246,7 +246,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 3, "elevation": 3, @@ -312,4 +312,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 a8d0480ca..58f5d73fc 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 15, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 43, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 2, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 35, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 8, "elevation": 3, @@ -126,4 +126,4 @@ "flag": "FLAG_HIDDEN_ITEM_53" } ] -}
\ No newline at end of file +} diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e804c8968..8b455060d 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -557,4 +557,4 @@ "SafariZone_Southwest", "SafariZone_Southeast" ] -}
\ No newline at end of file +} diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 17897223a..1a72316bc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ S_BerryTree:: @ 81A14DD - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData switch VAR_0x8004 case 255, BerryTree_EventScript_1A1533 case 0, BerryTree_EventScript_1A153D @@ -107,10 +107,10 @@ BerryTree_EventScript_1A15F9:: @ 81A15F9 goto_if_eq BerryTree_EventScript_1A164B BerryTree_EventScript_1A161D:: @ 81A161D - special EventObjectInteractionPickBerryTree + special ObjectEventInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_1A1642 - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message Route102_Text_1A17FD playfanfare MUS_ME_KINOMI waitmessage @@ -138,7 +138,7 @@ BerryTree_EventScript_1A164B:: @ 81A164B S_PlantBerryTreeFromBag:: @ 81A1654 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call S_PlantBerryTree releaseall end @@ -157,12 +157,12 @@ BerryTree_EventScript_1A168D:: @ 81A168D end S_WaterBerryTreeFromBag:: @ 81A168F - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall S_WaterBerryTree:: @ 81A1693 message Route102_Text_1A1912 waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 @@ -172,7 +172,7 @@ S_WaterBerryTree:: @ 81A1693 end S_PlantBerryTree:: @ 81A16A9 - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 29e05c513..f8d57f084 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 @@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare VAR_FACING, 1 diff --git a/data/specials.inc b/data/specials.inc index a59cae339..86e62455c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -51,12 +51,12 @@ gSpecials:: def_special LoadPlayerParty def_special sub_80C5568 def_special sub_8083BDC - def_special EventObjectInteractionGetBerryTreeData + def_special ObjectEventInteractionGetBerryTreeData def_special Berry_FadeAndGoToBerryBagMenu - 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 ScrSpecial_GetTrainerBattleMode @@ -187,7 +187,7 @@ gSpecials:: def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToEventObjectLocalIds + def_special GabbyAndTySetScriptVarsToObjectEventLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -337,7 +337,7 @@ gSpecials:: def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special TryInitBattleTowerAwardManEventObject + def_special TryInitBattleTowerAwardManObjectEvent def_special MoveSecretBase def_special LoadPlayerBag def_special sub_8081924 diff --git a/graphics/event_objects/palettes/00.pal b/graphics/object_events/palettes/00.pal index 7bb5bd9ed..7bb5bd9ed 100644 --- a/graphics/event_objects/palettes/00.pal +++ b/graphics/object_events/palettes/00.pal diff --git a/graphics/event_objects/palettes/01.pal b/graphics/object_events/palettes/01.pal index 558095bda..558095bda 100644 --- a/graphics/event_objects/palettes/01.pal +++ b/graphics/object_events/palettes/01.pal diff --git a/graphics/event_objects/palettes/02.pal b/graphics/object_events/palettes/02.pal index b84930395..b84930395 100644 --- a/graphics/event_objects/palettes/02.pal +++ b/graphics/object_events/palettes/02.pal diff --git a/graphics/event_objects/palettes/03.pal b/graphics/object_events/palettes/03.pal index 6c53450ba..6c53450ba 100644 --- a/graphics/event_objects/palettes/03.pal +++ b/graphics/object_events/palettes/03.pal diff --git a/graphics/event_objects/palettes/04.pal b/graphics/object_events/palettes/04.pal index 7b1e30115..7b1e30115 100644 --- a/graphics/event_objects/palettes/04.pal +++ b/graphics/object_events/palettes/04.pal diff --git a/graphics/event_objects/palettes/05.pal b/graphics/object_events/palettes/05.pal index bcea45b22..bcea45b22 100644 --- a/graphics/event_objects/palettes/05.pal +++ b/graphics/object_events/palettes/05.pal diff --git a/graphics/event_objects/palettes/06.pal b/graphics/object_events/palettes/06.pal index a94b5acd4..a94b5acd4 100644 --- a/graphics/event_objects/palettes/06.pal +++ b/graphics/object_events/palettes/06.pal diff --git a/graphics/event_objects/palettes/07.pal b/graphics/object_events/palettes/07.pal index 3dc56e918..3dc56e918 100644 --- a/graphics/event_objects/palettes/07.pal +++ b/graphics/object_events/palettes/07.pal diff --git a/graphics/event_objects/palettes/08.pal b/graphics/object_events/palettes/08.pal index e7717d74e..e7717d74e 100644 --- a/graphics/event_objects/palettes/08.pal +++ b/graphics/object_events/palettes/08.pal diff --git a/graphics/event_objects/palettes/09.pal b/graphics/object_events/palettes/09.pal index 758b59c4f..758b59c4f 100644 --- a/graphics/event_objects/palettes/09.pal +++ b/graphics/object_events/palettes/09.pal diff --git a/graphics/event_objects/palettes/10.pal b/graphics/object_events/palettes/10.pal index 0cebd6c4d..0cebd6c4d 100644 --- a/graphics/event_objects/palettes/10.pal +++ b/graphics/object_events/palettes/10.pal diff --git a/graphics/event_objects/palettes/11.pal b/graphics/object_events/palettes/11.pal index b28799ed8..b28799ed8 100644 --- a/graphics/event_objects/palettes/11.pal +++ b/graphics/object_events/palettes/11.pal diff --git a/graphics/event_objects/palettes/12.pal b/graphics/object_events/palettes/12.pal index b36c29ab1..b36c29ab1 100644 --- a/graphics/event_objects/palettes/12.pal +++ b/graphics/object_events/palettes/12.pal diff --git a/graphics/event_objects/palettes/13.pal b/graphics/object_events/palettes/13.pal index b69e9ac0a..b69e9ac0a 100644 --- a/graphics/event_objects/palettes/13.pal +++ b/graphics/object_events/palettes/13.pal diff --git a/graphics/event_objects/palettes/14.pal b/graphics/object_events/palettes/14.pal index 61947264f..61947264f 100644 --- a/graphics/event_objects/palettes/14.pal +++ b/graphics/object_events/palettes/14.pal diff --git a/graphics/event_objects/palettes/15.pal b/graphics/object_events/palettes/15.pal index 9cce740df..9cce740df 100644 --- a/graphics/event_objects/palettes/15.pal +++ b/graphics/object_events/palettes/15.pal diff --git a/graphics/event_objects/palettes/16.pal b/graphics/object_events/palettes/16.pal index 5ce2f4728..5ce2f4728 100644 --- a/graphics/event_objects/palettes/16.pal +++ b/graphics/object_events/palettes/16.pal diff --git a/graphics/event_objects/palettes/17.pal b/graphics/object_events/palettes/17.pal index e106ce693..e106ce693 100644 --- a/graphics/event_objects/palettes/17.pal +++ b/graphics/object_events/palettes/17.pal diff --git a/graphics/event_objects/palettes/18.pal b/graphics/object_events/palettes/18.pal index aeb04ccf8..aeb04ccf8 100644 --- a/graphics/event_objects/palettes/18.pal +++ b/graphics/object_events/palettes/18.pal diff --git a/graphics/event_objects/palettes/19.pal b/graphics/object_events/palettes/19.pal index 53de0c383..53de0c383 100644 --- a/graphics/event_objects/palettes/19.pal +++ b/graphics/object_events/palettes/19.pal diff --git a/graphics/event_objects/palettes/20.pal b/graphics/object_events/palettes/20.pal index 64985f6da..64985f6da 100644 --- a/graphics/event_objects/palettes/20.pal +++ b/graphics/object_events/palettes/20.pal diff --git a/graphics/event_objects/palettes/21.pal b/graphics/object_events/palettes/21.pal index 5e68e105d..5e68e105d 100644 --- a/graphics/event_objects/palettes/21.pal +++ b/graphics/object_events/palettes/21.pal diff --git a/graphics/event_objects/palettes/22.pal b/graphics/object_events/palettes/22.pal index 21fa9999d..21fa9999d 100644 --- a/graphics/event_objects/palettes/22.pal +++ b/graphics/object_events/palettes/22.pal diff --git a/graphics/event_objects/palettes/23.pal b/graphics/object_events/palettes/23.pal index 73b0b1d41..73b0b1d41 100644 --- a/graphics/event_objects/palettes/23.pal +++ b/graphics/object_events/palettes/23.pal diff --git a/graphics/event_objects/palettes/24.pal b/graphics/object_events/palettes/24.pal index d710b6830..d710b6830 100644 --- a/graphics/event_objects/palettes/24.pal +++ b/graphics/object_events/palettes/24.pal diff --git a/graphics/event_objects/palettes/25.pal b/graphics/object_events/palettes/25.pal index f48038d41..f48038d41 100644 --- a/graphics/event_objects/palettes/25.pal +++ b/graphics/object_events/palettes/25.pal diff --git a/graphics/event_objects/palettes/26.pal b/graphics/object_events/palettes/26.pal index fe4c1c112..fe4c1c112 100644 --- a/graphics/event_objects/palettes/26.pal +++ b/graphics/object_events/palettes/26.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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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/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/breakable_rock.png b/graphics/object_events/pics/misc/breakable_rock.png Binary files differindex c5054da41..c5054da41 100755 --- 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 100755 --- 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 100755 --- 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/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 8dc1762ad..8dc1762ad 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/aqua_member_f.png b/graphics/object_events/pics/people/aqua_member_f.png Binary files differindex cba3e0d06..cba3e0d06 100755 --- a/graphics/event_objects/pics/people/aqua_member_f.png +++ b/graphics/object_events/pics/people/aqua_member_f.png diff --git a/graphics/event_objects/pics/people/aqua_member_m.png b/graphics/object_events/pics/people/aqua_member_m.png Binary files differindex 5a74d1a0f..5a74d1a0f 100755 --- a/graphics/event_objects/pics/people/aqua_member_m.png +++ b/graphics/object_events/pics/people/aqua_member_m.png diff --git a/graphics/event_objects/pics/people/archie.png b/graphics/object_events/pics/people/archie.png Binary files differindex 6ece66e06..6ece66e06 100755 --- a/graphics/event_objects/pics/people/archie.png +++ b/graphics/object_events/pics/people/archie.png diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/object_events/pics/people/artist.png Binary files differindex 1a98032a7..1a98032a7 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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/boy_4.png b/graphics/object_events/pics/people/boy_4.png Binary files differindex 6536d2c23..6536d2c23 100755 --- a/graphics/event_objects/pics/people/boy_4.png +++ b/graphics/object_events/pics/people/boy_4.png diff --git a/graphics/event_objects/pics/people/boy_5.png b/graphics/object_events/pics/people/boy_5.png Binary files differindex b0b742651..b0b742651 100755 --- a/graphics/event_objects/pics/people/boy_5.png +++ b/graphics/object_events/pics/people/boy_5.png diff --git a/graphics/event_objects/pics/people/brawly.png b/graphics/object_events/pics/people/brawly.png Binary files differindex 58fdc532a..58fdc532a 100755 --- a/graphics/event_objects/pics/people/brawly.png +++ b/graphics/object_events/pics/people/brawly.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 e3c5f93b3..e3c5f93b3 100755 --- 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 81eccea11..81eccea11 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 a7e583b4c..a7e583b4c 100755 --- 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 440734776..440734776 100755 --- 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 efd7474aa..efd7474aa 100755 --- 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/normal.png b/graphics/object_events/pics/people/brendan/normal.png Binary files differindex a4ea93191..a4ea93191 100755 --- a/graphics/event_objects/pics/people/brendan/normal.png +++ b/graphics/object_events/pics/people/brendan/normal.png diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/object_events/pics/people/brendan/surfing.png Binary files differindex 9eac596f8..9eac596f8 100755 --- 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 100755 --- 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/watering.png b/graphics/object_events/pics/people/brendan/watering.png Binary files differindex 8fcff0925..8fcff0925 100755 --- 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 100755 --- 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 10f74faa6..10f74faa6 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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/drake.png b/graphics/object_events/pics/people/drake.png Binary files differindex 9fde008ff..9fde008ff 100755 --- a/graphics/event_objects/pics/people/drake.png +++ b/graphics/object_events/pics/people/drake.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 100755 --- 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 100755 --- a/graphics/event_objects/pics/people/fisherman.png +++ b/graphics/object_events/pics/people/fisherman.png diff --git a/graphics/event_objects/pics/people/flannery.png b/graphics/object_events/pics/people/flannery.png Binary files differindex 6d944c5e9..6d944c5e9 100755 --- a/graphics/event_objects/pics/people/flannery.png +++ b/graphics/object_events/pics/people/flannery.png diff --git a/graphics/event_objects/pics/people/gentleman.png b/graphics/object_events/pics/people/gentleman.png Binary files differindex 2f6341f83..2f6341f83 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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/glacia.png b/graphics/object_events/pics/people/glacia.png Binary files differindex fcf6dbde2..fcf6dbde2 100755 --- a/graphics/event_objects/pics/people/glacia.png +++ b/graphics/object_events/pics/people/glacia.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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- a/graphics/event_objects/pics/people/lass.png +++ b/graphics/object_events/pics/people/lass.png diff --git a/graphics/event_objects/pics/people/little_boy_1.png b/graphics/object_events/pics/people/little_boy_1.png Binary files differindex ce4f3e92c..ce4f3e92c 100755 --- a/graphics/event_objects/pics/people/little_boy_1.png +++ b/graphics/object_events/pics/people/little_boy_1.png diff --git a/graphics/event_objects/pics/people/little_boy_2.png b/graphics/object_events/pics/people/little_boy_2.png Binary files differindex 1b62a36d0..1b62a36d0 100755 --- a/graphics/event_objects/pics/people/little_boy_2.png +++ b/graphics/object_events/pics/people/little_boy_2.png diff --git a/graphics/event_objects/pics/people/little_boy_3.png b/graphics/object_events/pics/people/little_boy_3.png Binary files differindex 41bc20afb..41bc20afb 100755 --- a/graphics/event_objects/pics/people/little_boy_3.png +++ b/graphics/object_events/pics/people/little_boy_3.png diff --git a/graphics/event_objects/pics/people/little_girl_1.png b/graphics/object_events/pics/people/little_girl_1.png Binary files differindex 5ce59ea1b..5ce59ea1b 100755 --- a/graphics/event_objects/pics/people/little_girl_1.png +++ b/graphics/object_events/pics/people/little_girl_1.png diff --git a/graphics/event_objects/pics/people/little_girl_2.png b/graphics/object_events/pics/people/little_girl_2.png Binary files differindex 2540d84af..2540d84af 100755 --- a/graphics/event_objects/pics/people/little_girl_2.png +++ b/graphics/object_events/pics/people/little_girl_2.png diff --git a/graphics/event_objects/pics/people/liza.png b/graphics/object_events/pics/people/liza.png Binary files differindex 6a1eec536..6a1eec536 100755 --- a/graphics/event_objects/pics/people/liza.png +++ b/graphics/object_events/pics/people/liza.png diff --git a/graphics/event_objects/pics/people/magma_member_f.png b/graphics/object_events/pics/people/magma_member_f.png Binary files differindex 0041c83aa..0041c83aa 100755 --- a/graphics/event_objects/pics/people/magma_member_f.png +++ b/graphics/object_events/pics/people/magma_member_f.png diff --git a/graphics/event_objects/pics/people/magma_member_m.png b/graphics/object_events/pics/people/magma_member_m.png Binary files differindex f4c9e1fcf..f4c9e1fcf 100755 --- a/graphics/event_objects/pics/people/magma_member_m.png +++ b/graphics/object_events/pics/people/magma_member_m.png diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/object_events/pics/people/man_1.png Binary files differindex 32c3c643d..32c3c643d 100755 --- 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 5bf3f1405..5bf3f1405 100755 --- 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 a41a1ee9b..a41a1ee9b 100755 --- 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 05a87d4dd..05a87d4dd 100755 --- 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 234d67924..234d67924 100755 --- 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/man_6.png b/graphics/object_events/pics/people/man_6.png Binary files differindex f86aff0e4..f86aff0e4 100755 --- a/graphics/event_objects/pics/people/man_6.png +++ b/graphics/object_events/pics/people/man_6.png diff --git a/graphics/event_objects/pics/people/man_7.png b/graphics/object_events/pics/people/man_7.png Binary files differindex 3da80a760..3da80a760 100755 --- a/graphics/event_objects/pics/people/man_7.png +++ b/graphics/object_events/pics/people/man_7.png diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/object_events/pics/people/maniac.png Binary files differindex 29829c309..29829c309 100755 --- 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 100755 --- 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 0950dc209..0950dc209 100755 --- 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 cb1c47d62..cb1c47d62 100755 --- 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/maxie.png b/graphics/object_events/pics/people/maxie.png Binary files differindex cc8b180ed..cc8b180ed 100755 --- a/graphics/event_objects/pics/people/maxie.png +++ b/graphics/object_events/pics/people/maxie.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 2743624b1..2743624b1 100755 --- 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 1f20f1a52..1f20f1a52 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 22e315f1c..22e315f1c 100755 --- 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 b404d6fac..b404d6fac 100755 --- 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 b84f1142a..b84f1142a 100755 --- 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/normal.png b/graphics/object_events/pics/people/may/normal.png Binary files differindex a644db880..a644db880 100755 --- a/graphics/event_objects/pics/people/may/normal.png +++ b/graphics/object_events/pics/people/may/normal.png diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/object_events/pics/people/may/surfing.png Binary files differindex a5e0bda9b..a5e0bda9b 100755 --- 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 100755 --- 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/watering.png b/graphics/object_events/pics/people/may/watering.png Binary files differindex d892d6306..d892d6306 100755 --- 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 100755 --- a/graphics/event_objects/pics/people/mom.png +++ b/graphics/object_events/pics/people/mom.png diff --git a/graphics/event_objects/pics/people/norman.png b/graphics/object_events/pics/people/norman.png Binary files differindex 48755d3bd..48755d3bd 100755 --- a/graphics/event_objects/pics/people/norman.png +++ b/graphics/object_events/pics/people/norman.png diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/object_events/pics/people/nurse.png Binary files differindex e6cb474ac..e6cb474ac 100755 --- 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_1.png b/graphics/object_events/pics/people/old_man_1.png Binary files differindex b5f66e745..b5f66e745 100755 --- a/graphics/event_objects/pics/people/old_man_1.png +++ b/graphics/object_events/pics/people/old_man_1.png diff --git a/graphics/event_objects/pics/people/old_man_2.png b/graphics/object_events/pics/people/old_man_2.png Binary files differindex f8c965895..f8c965895 100755 --- a/graphics/event_objects/pics/people/old_man_2.png +++ b/graphics/object_events/pics/people/old_man_2.png diff --git a/graphics/event_objects/pics/people/old_woman_1.png b/graphics/object_events/pics/people/old_woman_1.png Binary files differindex 1213f3afc..1213f3afc 100755 --- a/graphics/event_objects/pics/people/old_woman_1.png +++ b/graphics/object_events/pics/people/old_woman_1.png diff --git a/graphics/event_objects/pics/people/old_woman_2.png b/graphics/object_events/pics/people/old_woman_2.png Binary files differindex c2fc0d4e4..c2fc0d4e4 100755 --- a/graphics/event_objects/pics/people/old_woman_2.png +++ b/graphics/object_events/pics/people/old_woman_2.png diff --git a/graphics/event_objects/pics/people/phoebe.png b/graphics/object_events/pics/people/phoebe.png Binary files differindex 243057ae2..243057ae2 100755 --- a/graphics/event_objects/pics/people/phoebe.png +++ b/graphics/object_events/pics/people/phoebe.png diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/object_events/pics/people/picnicker.png Binary files differindex a15eeb644..a15eeb644 100755 --- a/graphics/event_objects/pics/people/picnicker.png +++ b/graphics/object_events/pics/people/picnicker.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 100755 --- 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 100755 --- 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 100755 --- 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/reporter_f.png b/graphics/object_events/pics/people/reporter_f.png Binary files differindex 289aef6d9..289aef6d9 100755 --- 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 100755 --- 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/rooftop_sale_woman.png b/graphics/object_events/pics/people/rooftop_sale_woman.png Binary files differindex f1f9bc72b..f1f9bc72b 100755 --- 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/roxanne.png b/graphics/object_events/pics/people/roxanne.png Binary files differindex c1a1421a0..c1a1421a0 100755 --- a/graphics/event_objects/pics/people/roxanne.png +++ b/graphics/object_events/pics/people/roxanne.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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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/sidney.png b/graphics/object_events/pics/people/sidney.png Binary files differindex de9d08719..de9d08719 100755 --- a/graphics/event_objects/pics/people/sidney.png +++ b/graphics/object_events/pics/people/sidney.png diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/object_events/pics/people/steven.png Binary files differindex da692f51d..da692f51d 100755 --- 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 100755 --- 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 100755 --- 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/tate.png b/graphics/object_events/pics/people/tate.png Binary files differindex f73ee136b..f73ee136b 100755 --- a/graphics/event_objects/pics/people/tate.png +++ b/graphics/object_events/pics/people/tate.png diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/object_events/pics/people/teala.png Binary files differindex cfc47b112..cfc47b112 100755 --- a/graphics/event_objects/pics/people/teala.png +++ b/graphics/object_events/pics/people/teala.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 100755 --- 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 100755 --- 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 100755 --- 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/wallace.png b/graphics/object_events/pics/people/wallace.png Binary files differindex 7ca572a18..7ca572a18 100755 --- 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 100755 --- a/graphics/event_objects/pics/people/wally.png +++ b/graphics/object_events/pics/people/wally.png diff --git a/graphics/event_objects/pics/people/wattson.png b/graphics/object_events/pics/people/wattson.png Binary files differindex 73ab5e8fc..73ab5e8fc 100755 --- a/graphics/event_objects/pics/people/wattson.png +++ b/graphics/object_events/pics/people/wattson.png diff --git a/graphics/event_objects/pics/people/winona.png b/graphics/object_events/pics/people/winona.png Binary files differindex 9a1ce83eb..9a1ce83eb 100755 --- a/graphics/event_objects/pics/people/winona.png +++ b/graphics/object_events/pics/people/winona.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 100755 --- 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 c97fc3507..c97fc3507 100755 --- 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 8d35b1653..8d35b1653 100755 --- 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 2a29acae3..2a29acae3 100755 --- 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 95dfc76da..95dfc76da 100755 --- 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/woman_6.png b/graphics/object_events/pics/people/woman_6.png Binary files differindex 2ffdd5af6..2ffdd5af6 100755 --- a/graphics/event_objects/pics/people/woman_6.png +++ b/graphics/object_events/pics/people/woman_6.png diff --git a/graphics/event_objects/pics/people/woman_7.png b/graphics/object_events/pics/people/woman_7.png Binary files differindex b526e9bc6..b526e9bc6 100755 --- a/graphics/event_objects/pics/people/woman_7.png +++ b/graphics/object_events/pics/people/woman_7.png diff --git a/graphics/event_objects/pics/people/woman_8.png b/graphics/object_events/pics/people/woman_8.png Binary files differindex d69514e5f..d69514e5f 100755 --- a/graphics/event_objects/pics/people/woman_8.png +++ b/graphics/object_events/pics/people/woman_8.png diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/object_events/pics/people/youngster.png Binary files differindex c17e7c6cf..c17e7c6cf 100755 --- 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 100755 --- 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 100755 --- a/graphics/event_objects/pics/pokemon/azurill.png +++ b/graphics/object_events/pics/pokemon/azurill.png diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/object_events/pics/pokemon/groudon.png Binary files differindex fc9ded1f9..fc9ded1f9 100755 --- a/graphics/event_objects/pics/pokemon/groudon.png +++ b/graphics/object_events/pics/pokemon/groudon.png diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/object_events/pics/pokemon/kecleon.png Binary files differindex 47ae584b7..47ae584b7 100755 --- a/graphics/event_objects/pics/pokemon/kecleon.png +++ b/graphics/object_events/pics/pokemon/kecleon.png diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/object_events/pics/pokemon/kyogre.png Binary files differindex 420c034b8..420c034b8 100755 --- 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 fb3f75f54..fb3f75f54 100755 --- 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/machoke_carrying_box.png b/graphics/object_events/pics/pokemon/machoke_carrying_box.png Binary files differindex d23aa5204..d23aa5204 100755 --- a/graphics/event_objects/pics/pokemon/machoke_carrying_box.png +++ b/graphics/object_events/pics/pokemon/machoke_carrying_box.png diff --git a/graphics/event_objects/pics/pokemon/machoke_facing_away.png b/graphics/object_events/pics/pokemon/machoke_facing_away.png Binary files differindex 1a824432e..1a824432e 100755 --- a/graphics/event_objects/pics/pokemon/machoke_facing_away.png +++ b/graphics/object_events/pics/pokemon/machoke_facing_away.png diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/object_events/pics/pokemon/pikachu.png Binary files differindex ee742fc87..ee742fc87 100755 --- 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 100755 --- 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 713d7852d..713d7852d 100755 --- a/graphics/event_objects/pics/pokemon/rayquaza.png +++ b/graphics/object_events/pics/pokemon/rayquaza.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 100755 --- a/graphics/event_objects/pics/pokemon/skitty.png +++ b/graphics/object_events/pics/pokemon/skitty.png diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/object_events/pics/pokemon/wingull.png Binary files differindex 149733830..149733830 100755 --- 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 100755 --- a/graphics/event_objects/pics/pokemon/zigzagoon.png +++ b/graphics/object_events/pics/pokemon/zigzagoon.png diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 5dae99ecd..695daabbc 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -193,4 +193,4 @@ void BtlController_EmitLinkStandbyMsg(u8 a, u8 b); void BtlController_EmitResetActionMoveSelection(u8 a, u8 b); void BtlController_EmitCmd55(u8 a, u8 b); -#endif // GUARD_BATTLE_CONTROLLERS_H
\ No newline at end of file +#endif // GUARD_BATTLE_CONTROLLERS_H diff --git a/include/berry.h b/include/berry.h index 259ada634..9a7773779 100644 --- a/include/berry.h +++ b/include/berry.h @@ -39,7 +39,7 @@ void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); -bool32 EventObjectInteractionWaterBerryTree(void); +bool32 ObjectEventInteractionWaterBerryTree(void); bool8 IsPlayerFacingUnplantedSoil(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -51,11 +51,11 @@ u8 GetStageByBerryTreeId(u8); u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); -void EventObjectInteractionGetBerryTreeData(void); +void ObjectEventInteractionGetBerryTreeData(void); void Berry_FadeAndGoToBerryBagMenu(void); -void EventObjectInteractionPlantBerryTree(void); -void EventObjectInteractionPickBerryTree(void); -void EventObjectInteractionRemoveBerryTree(void); +void ObjectEventInteractionPlantBerryTree(void); +void ObjectEventInteractionPickBerryTree(void); +void ObjectEventInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness); diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 32c7b7625..eeb18e7cb 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,244 +1,244 @@ -#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H -#define GUARD_CONSTANTS_EVENT_OBJECTS_H +#ifndef GUARD_CONSTANTS_OBJECT_EVENTS_H +#define GUARD_CONSTANTS_OBJECT_EVENTS_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_LITTLE_BOY_1 5 -#define EVENT_OBJ_GFX_LITTLE_GIRL_1 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_2 11 -#define EVENT_OBJ_GFX_LITTLE_GIRL_2 12 -#define EVENT_OBJ_GFX_BOY_3 13 -#define EVENT_OBJ_GFX_GIRL_3 14 -#define EVENT_OBJ_GFX_BOY_4 15 -#define EVENT_OBJ_GFX_WOMAN_1 16 -#define EVENT_OBJ_GFX_FAT_MAN 17 -#define EVENT_OBJ_GFX_WOMAN_2 18 -#define EVENT_OBJ_GFX_MAN_1 19 -#define EVENT_OBJ_GFX_WOMAN_3 20 -#define EVENT_OBJ_GFX_OLD_MAN_1 21 -#define EVENT_OBJ_GFX_OLD_WOMAN_1 22 -#define EVENT_OBJ_GFX_MAN_2 23 -#define EVENT_OBJ_GFX_WOMAN_4 24 -#define EVENT_OBJ_GFX_MAN_3 25 -#define EVENT_OBJ_GFX_WOMAN_5 26 -#define EVENT_OBJ_GFX_COOK 27 -#define EVENT_OBJ_GFX_WOMAN_6 28 -#define EVENT_OBJ_GFX_OLD_MAN_2 29 -#define EVENT_OBJ_GFX_OLD_WOMAN_2 30 -#define EVENT_OBJ_GFX_CAMPER 31 -#define EVENT_OBJ_GFX_PICNICKER 32 -#define EVENT_OBJ_GFX_MAN_4 33 -#define EVENT_OBJ_GFX_WOMAN_7 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_WOMAN_8 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_5 65 -#define EVENT_OBJ_GFX_MAN_6 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_HIPSTER 70 -#define EVENT_OBJ_GFX_TRADER 71 -#define EVENT_OBJ_GFX_STORYTELLER 72 -#define EVENT_OBJ_GFX_GIDDY 73 -#define EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74 -#define EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2 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_MACHOKE_CARRYING_BOX 95 -#define EVENT_OBJ_GFX_MACHOKE_FACING_AWAY 96 -#define EVENT_OBJ_GFX_BIRCHS_BAG 97 -#define EVENT_OBJ_GFX_POOCHYENA 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_MAN_7 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_BOY_5 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 207 -#define EVENT_OBJ_GFX_ZIGZAGOON 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 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_LITTLE_BOY_1 5 +#define OBJ_EVENT_GFX_LITTLE_GIRL_1 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_2 11 +#define OBJ_EVENT_GFX_LITTLE_GIRL_2 12 +#define OBJ_EVENT_GFX_BOY_3 13 +#define OBJ_EVENT_GFX_GIRL_3 14 +#define OBJ_EVENT_GFX_BOY_4 15 +#define OBJ_EVENT_GFX_WOMAN_1 16 +#define OBJ_EVENT_GFX_FAT_MAN 17 +#define OBJ_EVENT_GFX_WOMAN_2 18 +#define OBJ_EVENT_GFX_MAN_1 19 +#define OBJ_EVENT_GFX_WOMAN_3 20 +#define OBJ_EVENT_GFX_OLD_MAN_1 21 +#define OBJ_EVENT_GFX_OLD_WOMAN_1 22 +#define OBJ_EVENT_GFX_MAN_2 23 +#define OBJ_EVENT_GFX_WOMAN_4 24 +#define OBJ_EVENT_GFX_MAN_3 25 +#define OBJ_EVENT_GFX_WOMAN_5 26 +#define OBJ_EVENT_GFX_COOK 27 +#define OBJ_EVENT_GFX_WOMAN_6 28 +#define OBJ_EVENT_GFX_OLD_MAN_2 29 +#define OBJ_EVENT_GFX_OLD_WOMAN_2 30 +#define OBJ_EVENT_GFX_CAMPER 31 +#define OBJ_EVENT_GFX_PICNICKER 32 +#define OBJ_EVENT_GFX_MAN_4 33 +#define OBJ_EVENT_GFX_WOMAN_7 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_WOMAN_8 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_5 65 +#define OBJ_EVENT_GFX_MAN_6 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_HIPSTER 70 +#define OBJ_EVENT_GFX_TRADER 71 +#define OBJ_EVENT_GFX_STORYTELLER 72 +#define OBJ_EVENT_GFX_GIDDY 73 +#define OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74 +#define OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_2 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_MACHOKE_CARRYING_BOX 95 +#define OBJ_EVENT_GFX_MACHOKE_FACING_AWAY 96 +#define OBJ_EVENT_GFX_BIRCHS_BAG 97 +#define OBJ_EVENT_GFX_POOCHYENA 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_MAN_7 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_BOY_5 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 207 +#define OBJ_EVENT_GFX_ZIGZAGOON 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 // 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 NUM_OBJECT_GRAPHICS_INFO 217 #define SPRITE_VAR 239 @@ -252,4 +252,4 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 -#endif // GUARD_CONSTANTS_EVENT_OBJECTS_H +#endif // GUARD_CONSTANTS_OBJECT_EVENTS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 753024403..a6fa4c806 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -357,7 +357,7 @@ #define FLAG_HIDDEN_ITEM_61 0x2B9 -// event object hide/show flags +// object event hide/show flags #define FLAG_HIDE_BIRCH_STARTERS_BAG 0x2BC #define FLAG_HIDE_BIRCH_BATTLE_POOCHYENA 0x2D0 diff --git a/include/constants/vars.h b/include/constants/vars.h index de62e4e8a..795498212 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -25,9 +25,9 @@ #define VAR_TEMP_F 0x400F // object gfx id vars -// These 0x10 vars are used to dynamically control a event object's sprite. +// These 0x10 vars are used to dynamically control an object event'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/decoration.h b/include/decoration.h index 7676c0add..9f78bc491 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -182,7 +182,7 @@ bool8 sub_80FEFA4(void); void sub_80FF394(u16, u16, u16); void sub_80FF6AC(u8); void sub_80FF960(u8); -void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 *, u8); +void AddDecorationIconObjectFromObjectEvent(struct UnkStruct_02038900 *, u8); void SetUpPlacingDecorationPlayerAvatar(u8, struct UnkStruct_02038900 *); void sub_8100038(u8); void sub_81000A0(u8); diff --git a/include/event_data.h b/include/event_data.h index 44d1e8e41..50a26a437 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -19,7 +19,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 index 538edc579..7a293cc01 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -1,16 +1,16 @@ -#ifndef GUARD_EVENT_OBJ_LOCK_H -#define GUARD_EVENT_OBJ_LOCK_H +#ifndef GUARD_OBJ_EVENT_LOCK_H +#define GUARD_OBJ_EVENT_LOCK_H bool8 walkrun_is_standing_still(void); void sub_8064CDC(u8 taskId); bool8 sub_8064CFC(void); -void ScriptFreezeEventObjects(void); +void ScriptFreezeObjectEvents(void); void sub_8064D38(u8 taskId); bool8 sub_8064DB4(void); -void LockSelectedEventObject(void); -void ScriptUnfreezeEventObjects(void); +void LockSelectedObjectEvent(void); +void ScriptUnfreezeObjectEvents(void); void unref_sub_8064E5C(void); void sub_8064EAC(void); void sub_8064ED4(void); -#endif // GUARD_EVENT_OBJ_LOCK_H +#endif // GUARD_OBJ_EVENT_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index b3040d6df..949fb87d2 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -27,23 +27,23 @@ extern const u8 gReflectionEffectPaletteMap[]; #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;\ } @@ -54,18 +54,18 @@ struct ReflectionPaletteSet const u16 *reflectionPaletteTags; }; -extern const u16 gEventObjectPalette19[]; +extern const u16 gObjectEventPalette19[]; -extern const u32 gEventObjectPic_MovingBox[32]; -extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; +extern const u32 gObjectEventPic_MovingBox[32]; +extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[]; extern const u8 gFieldEffectPic_CutGrass[]; extern const u16 gFieldEffectObjectPalette6[]; -void sub_805C058(struct EventObject *eventObject, s16 a, s16 b); -void SetEventObjectDirection(struct EventObject *pObject, u8 unk_18); +void sub_805C058(struct ObjectEvent *objectEvent, s16 a, s16 b); +void SetObjectEventDirection(struct ObjectEvent *pObject, u8 unk_18); void MoveCoords(u8 direction, s16 *x, s16 *y); -void UpdateEventObjectCurrentMovement(struct EventObject *pObject, struct Sprite *pSprite, u8 (*d8)(struct EventObject *, struct Sprite *)); +void UpdateObjectEventCurrentMovement(struct ObjectEvent *pObject, struct Sprite *pSprite, u8 (*d8)(struct ObjectEvent *, struct Sprite *)); u8 GetVectorDirection(s16 a0, s16 a1, s16 a2, s16 a3); u8 GetLimitedVectorDirection_SouthNorth(s16 a0, s16 a1, s16 a2, s16 a3); @@ -79,15 +79,15 @@ u8 GetLimitedVectorDirection_SouthNorthEast(s16 a0, s16 a1, s16 a2, s16 a3); u8 GetLimitedVectorDirection_NorthWestEast(s16 a0, s16 a1, s16 a2, s16 a3); u8 GetLimitedVectorDirection_SouthWestEast(s16 a0, s16 a1, s16 a2, s16 a3); -u8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); extern struct FieldCamera gFieldCamera; extern u16 gTotalCameraPixelOffsetY; @@ -150,189 +150,189 @@ void MovementType_JogInPlace(struct Sprite *); void MovementType_RunInPlace(struct Sprite *); void MovementType_Invisible(struct Sprite *); -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_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_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(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 *); -u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step2(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_JogInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(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_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 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_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(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 *); +u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(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_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(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 *); u8 GetMoveDirectionAnimNum(u8); u8 GetMoveDirectionFastAnimNum(u8); @@ -342,24 +342,24 @@ u8 GetMoveDirectionFastestAnimNum(u8); u32 state_to_direction(u8, u32, u32); -void ResetEventObjects(); -u8 GetFirstInactiveEventObjectId(void); -u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetEventObjectIdByXY(s16, s16); -void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); -u8 SpawnSpecialEventObject(struct EventObjectTemplate *); +void ResetObjectEvents(); +u8 GetFirstInactiveObjectEventId(void); +u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetObjectEventIdByXY(s16, s16); +void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); u8 show_sprite(u8, u8, u8); -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); u8 sub_805B410(u8, u8, s16, s16, u8, u8); -void TrySpawnEventObjects(s16, s16); +void TrySpawnObjectEvents(s16, s16); void sub_805B710(u16 i, u16 i1); -void EventObjectSetGraphicsId(struct EventObject *, u8); -void EventObjectTurn(struct EventObject *, u8); -void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8); +void ObjectEventSetGraphicsId(struct ObjectEvent *, u8); +void ObjectEventTurn(struct ObjectEvent *, u8); +void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); -void EventObjectGetLocalIdAndMap(struct EventObject *, void *, void *, void *); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, void *, void *, void *); void sub_805BCC0(s16 x, s16 y); void sub_805BCF0(u8, u8, u8, u8); void sub_805BD48(u8, u8, u8); @@ -369,44 +369,44 @@ void sub_805BDF8(u16); void PatchObjectPalette(u16, u8); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); -void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y); +void ShiftObjectEventCoords(struct ObjectEvent *pObject, s16 x, s16 y); void sub_805C0F8(u8, u8, u8, s16, s16); -void ShiftStillEventObjectCoords(struct EventObject *pObject); -u8 GetEventObjectIdByXYZ(u16, u16, u8); -void UpdateEventObjectsForCameraUpdate(s16, s16); +void ShiftStillObjectEventCoords(struct ObjectEvent *pObject); +u8 GetObjectEventIdByXYZ(u16, u16, u8); +void UpdateObjectEventsForCameraUpdate(s16, s16); u8 AddCameraObject(u8); void CameraObjectReset1(void); -const u8 *GetEventObjectScriptPointerByEventObjectId(u8); -u8 EventObjectGetBerryTreeId(u8); -struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); -void OverrideTemplateCoordsForEventObject(struct EventObject *pObject); -void OverrideMovementTypeForEventObject(struct EventObject *, u8); -void TryOverrideTemplateCoordsForEventObject(u8, u8, u8); -void InitEventObjectPalettes(u8); +const u8 *GetObjectEventScriptPointerByObjectEventId(u8); +u8 ObjectEventGetBerryTreeId(u8); +struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); +void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *pObject); +void OverrideMovementTypeForObjectEvent(struct ObjectEvent *, u8); +void TryOverrideTemplateCoordsForObjectEvent(u8, u8, u8); +void InitObjectEventPalettes(u8); u8 GetFaceDirectionAnimNum(u8); u8 GetMoveDirectionAnimNum(u8 unk_19); u8 GetAcroWheelieDirectionAnimNum(u8); u8 GetFishingDirectionAnimNum(u8); u8 GetFishingNoCatchDirectionAnimNum(u8); u8 GetFishingBiteDirectionAnimNum(u8); -void SetTrainerMovementType(struct EventObject *, u8); +void SetTrainerMovementType(struct ObjectEvent *, u8); u8 GetTrainerFacingDirectionMovementType(u8); -u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); -u8 GetCollisionFlagsAtCoords(struct EventObject *, s16, s16, u8); +u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32); +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *, s16, s16, u8); bool8 IsBerryTreeSparkling(u8, u8, u8); void sub_8060288(u8, u8, u8); void sub_8060388(s16, s16, s16 *, s16 *); void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1); -void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); -bool8 EventObjectIsMovementOverridden(struct EventObject *); -bool8 EventObjectIsHeldMovementActive(struct EventObject *); -bool8 EventObjectSetHeldMovement(struct EventObject *, u8); -void EventObjectForceSetHeldMovement(struct EventObject *pObject, u8 a); -void EventObjectClearHeldMovementIfActive(struct EventObject *); -void EventObjectClearHeldMovement(struct EventObject *); -bool8 EventObjectCheckHeldMovementStatus(struct EventObject *); -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); -u8 EventObjectGetHeldMovementActionId(struct EventObject *); +void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *); +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *); +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8); +void ObjectEventForceSetHeldMovement(struct ObjectEvent *pObject, u8 a); +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); +void ObjectEventClearHeldMovement(struct ObjectEvent *); +bool8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *); +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *); u8 GetFaceDirectionMovementAction(u32); u8 GetWalkSlowMovementAction(u32); u8 GetWalkNormalMovementAction(u32); @@ -424,7 +424,7 @@ u8 GetWalkInPlaceSlowMovementAction(u32); u8 GetWalkInPlaceNormalMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceFastestMovementAction(u32); -u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); u8 GetAcroWheelieFaceDirectionMovementAction(u8); u8 GetAcroPopWheelieFaceDirectionMovementAction(u8); u8 GetAcroEndWheelieFaceDirectionMovementAction(u8); @@ -436,23 +436,23 @@ u8 GetAcroPopWheelieMoveDirectionMovementAction(u8); u8 GetAcroWheelieMoveDirectionMovementAction(u8); u8 GetAcroEndWheelieMoveDirectionMovementAction(u8); u8 GetOppositeDirection(u8); -u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8); +u8 SpawnSpecialObjectEventParametrized(u8, u8, u8, s16, s16, u8); void CameraObjectSetFollowedObjectId(u8); -u8 TryInitLocalEventObject(u8); +u8 TryInitLocalObjectEvent(u8); u8 CreateCopySpriteAt(struct Sprite *, s16, s16, u8); u16 GetObjectPaletteTag(u8); void sub_8060470(s16 *, s16 *, s16, s16); -bool8 FreezeEventObject(struct EventObject *); -void FreezeEventObjects(void); -void FreezeEventObjectsExceptOne(u8); -void UnfreezeEventObjects(void); -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); -void TurnEventObject(u8, u8); -void UnfreezeEventObject(struct EventObject *eventObject); +bool8 FreezeObjectEvent(struct ObjectEvent *); +void FreezeObjectEvents(void); +void FreezeObjectEventsExceptOne(u8); +void UnfreezeObjectEvents(void); +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); +void TurnObjectEvent(u8, u8); +void UnfreezeObjectEvent(struct ObjectEvent *objectEvent); void sub_806467C(struct Sprite *sprite, u8 direction); bool8 sub_806468C(struct Sprite *sprite); void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4); -void DoShadowFieldEffect(struct EventObject *eventObject); +void DoShadowFieldEffect(struct ObjectEvent *objectEvent); u8 sub_8064704(struct Sprite *); u8 sub_806478C(struct Sprite *); void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3); @@ -460,7 +460,7 @@ bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y); bool8 AreZCoordsCompatible(u8 z1, u8 z2); u8 GetLedgeJumpDirection(s16, s16, u8); u8 ZCoordToPriority(u8); -void EventObjectUpdateZCoord(struct EventObject *pObject); +void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); #endif // GUARD_EVENTOBJMV_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index df6482688..bcb2b449e 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -30,7 +30,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *, u8, u8); void ClearPoisonStepCounter(void); void RestartWildEncounterImmunitySteps(void); u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *); -const u8 *GetEventObjectScriptPointerPlayerFacing(void); +const u8 *GetObjectEventScriptPointerPlayerFacing(void); u8 TrySetDiveWarp(void); bool8 dive_warp(struct MapPosition*, u16); diff --git a/include/field_effect.h b/include/field_effect.h index a1c175eb8..6bf98d4f7 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -88,11 +88,11 @@ bool8 sub_8086E50(struct Task *); bool8 sub_8086EB0(struct Task *); bool8 sub_8086ED4(struct Task *); -bool8 sub_8086FB0(struct Task *, struct EventObject *); -bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); -bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); -bool8 sub_8087030(struct Task *, struct EventObject *); -bool8 sub_8087058(struct Task *, struct EventObject *); +bool8 sub_8086FB0(struct Task *, struct ObjectEvent *); +bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *); +bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *); +bool8 sub_8087030(struct Task *, struct ObjectEvent *); +bool8 sub_8087058(struct Task *, struct ObjectEvent *); bool8 sub_8087124(struct Task *); bool8 dive_2_unknown(struct Task *); @@ -100,25 +100,25 @@ bool8 dive_3_unknown(struct Task *); void sub_80871B8(u8); -bool8 sub_808722C(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087264(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087298(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80872E4(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80873D8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80873F4(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_808722C(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087264(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087298(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80872E4(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80873D8(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80873F4(struct Task *, struct ObjectEvent *, struct Sprite *); -bool8 sub_80874CC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80874FC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087548(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_808759C(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80874CC(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80874FC(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087548(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_808759C(struct Task *, struct ObjectEvent *, struct Sprite *); void sub_8087654(u8); -bool8 sub_80876C8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80876F8(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_8087774(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80877AC(struct Task *, struct EventObject *, struct Sprite *); -bool8 sub_80877D4(struct Task *, struct EventObject *, struct Sprite *); +bool8 sub_80876C8(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80876F8(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_8087774(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80877AC(struct Task *, struct ObjectEvent *, struct Sprite *); +bool8 sub_80877D4(struct Task *, struct ObjectEvent *, struct Sprite *); void sub_8087AA4(struct Task *); void sub_8087AC8(struct Task *); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 8462b6ff8..2754ecddd 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -3,8 +3,8 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -void sub_812869C(struct EventObject *); -bool8 sub_81286C4(struct EventObject *); +void sub_812869C(struct ObjectEvent *); +bool8 sub_81286C4(struct ObjectEvent *); void UpdateShadowFieldEffect(struct Sprite *); void sub_8087638(struct Sprite *); void sub_808788C(struct Sprite *); @@ -29,8 +29,8 @@ void sub_8127ED0(u8, u8); void sub_8127F28(u8, u8, s16); u8 sub_8128124(u8 id); void StartAshFieldEffect(s16, s16, u16, s16); -void InitObjectReflectionSprite(struct EventObject *eventObj, struct Sprite *sprite, u8 a); -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject); +void InitObjectReflectionSprite(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a); +u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent); u8 FindTallGrassFieldEffectSpriteId(u8, u8, u8, s16, s16); #endif // GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0c2deb8be..491fd809e 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -14,7 +14,7 @@ enum { // MovementType_None2 void player_step(u8 a, u16 b, u16 c); -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); void SetPlayerAvatarTransitionFlags(u16 a); void sub_8059204(void); u8 PlayerGetCopyableMovement(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 27b2b5593..1bba31073 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -56,7 +56,7 @@ struct BackupMapLayout u16 *map; }; -struct EventObjectTemplate +struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -116,12 +116,12 @@ 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; @@ -159,7 +159,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct EventObject +struct ObjectEvent { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -221,7 +221,7 @@ struct EventObject /*size = 0x24*/ }; -struct EventObjectGraphicsInfo +struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag; @@ -302,7 +302,7 @@ struct PlayerAvatar /* 0x202E858 */ /*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 @@ -324,8 +324,8 @@ struct Camera s32 y; }; -extern struct EventObject gEventObjects[]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[]; +extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; diff --git a/include/global.h b/include/global.h index ba9e20813..5e71bd821 100644 --- a/include/global.h +++ b/include/global.h @@ -119,7 +119,7 @@ enum LanguageId #define DAYCARE_MON_COUNT 2 #define POKEBLOCKS_COUNT 40 #define PARTY_SIZE 6 -#define EVENT_OBJECTS_COUNT 16 +#define OBJECT_EVENTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 #define VARS_COUNT 256 @@ -698,8 +698,8 @@ struct SaveBlock1 /* 0x02025734 */ /*0x972*/ u8 filler_972[0x6]; /*0x978*/ u16 trainerRematchStepCounter; /*0x97A*/ u8 trainerRematches[100]; - /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64]; + /*0x9E0*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; + /*0xC20*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x1220*/ u8 flags[FLAGS_COUNT]; /*0x1340*/ u16 vars[VARS_COUNT]; /*0x1540*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/overworld.h b/include/overworld.h index 958eb57ff..833c0aea0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -9,11 +9,11 @@ struct InitialPlayerAvatarState u8 direction; }; -struct LinkPlayerEventObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; - u8 eventObjId; + u8 objEventId; u8 mode; }; @@ -35,10 +35,10 @@ void ResetGameStats(void); void IncrementGameStat(u8 index); u32 GetGameStat(u8 index); void SetGameStat(u8, u32); -// LoadEventObjTemplatesFromHeader -// LoadSaveblockEventObjScripts -void Overworld_SetEventObjTemplateCoords(u8, s16, s16); -void Overworld_SetEventObjTemplateMovementType(u8, u8); +// LoadObjEventTemplatesFromHeader +// LoadSaveblockObjEventScripts +void Overworld_SetObjEventTemplateCoords(u8, s16, s16); +void Overworld_SetObjEventTemplateMovementType(u8, u8); // mapdata_load_assets_to_gpu_and_full_redraw // ApplyCurrentWarp // SetWarpData @@ -188,9 +188,9 @@ bool32 sub_8055870(void); u32 sub_80558AC(void); u32 sub_8055910(void); u32 sub_8055940(void); -// ClearLinkPlayerEventObject -void ClearLinkPlayerEventObjects(void); -// ZeroEventObject +// ClearLinkPlayerObjectEvent +void ClearLinkPlayerObjectEvents(void); +// ZeroObjectEvent // unref_sub_8055A6C // unref_sub_8055A9C u8 sub_8055AE8(u8); diff --git a/include/shop.h b/include/shop.h index 4de58eaf2..849b1bef2 100644 --- a/include/shop.h +++ b/include/shop.h @@ -11,7 +11,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_see.h b/include/trainer_see.h index d67117743..78487aa57 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -5,7 +5,7 @@ #include "task.h" bool8 CheckTrainers(void); -void sub_8084794(struct EventObject *var); +void sub_8084794(struct ObjectEvent *var); void ScrSpecial_EndTrainerApproach(void); #endif // GUARD_TRAINER_SEE_H diff --git a/projects/cMakeLists.txt b/projects/cMakeLists.txt index ce1c9a426..66d1f8e7d 100644 --- a/projects/cMakeLists.txt +++ b/projects/cMakeLists.txt @@ -10,4 +10,4 @@ file(GLOB_RECURSE C_SOURCES ../src/*.c ../src/*.h ../include/*.h) file(GLOB_RECURSE ASM_SOURCES ../asm/*.s ../asm/*.inc ../constants/*.inc ../data/*.s ../data/*.inc) include_directories(include ../tools/agbcc/include) -add_executable(pokeruby.gba ${C_SOURCES} ${ASM_SOURCES})
\ No newline at end of file +add_executable(pokeruby.gba ${C_SOURCES} ${ASM_SOURCES}) diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index a2097cb7e..b464374c7 100755 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -1,489 +1,489 @@ -EVENTOBJGFXDIR := graphics/event_objects/pics +OBJEVENTGFXDIR := graphics/object_events/pics FIELDEFFGFXDIR := graphics/field_effect_objects/pics -$(EVENTOBJGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/normal.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/normal.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/normal.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/normal.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/aqua_member_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/aqua_member_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/aqua_member_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/aqua_member_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/archie.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/archie.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/artist.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/artist.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/beauty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/brawly.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/brawly.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/camper.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cook.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/drake.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/drake.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/flannery.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/flannery.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/glacia.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/glacia.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hiker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hiker.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/lass.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_boy_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_boy_3.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/liza.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/liza.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/magma_member_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/magma_member_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/magma_member_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/magma_member_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_3.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_4.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_5.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_6.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_6.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_7.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/man_7.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/maniac.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/maxie.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/maxie.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/mom.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/mom.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/norman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/norman.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/nurse.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/phoebe.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/phoebe.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/roxanne.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/roxanne.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/sailor.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/sailor.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/sidney.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/sidney.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/steven.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/steven.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/tate.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tate.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/teala.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/teala.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/wallace.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wallace.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wally.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/wattson.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/wattson.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/winona.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/winona.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_8.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/woman_8.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/machoke_carrying_box.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/machoke_carrying_box.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/machoke_facing_away.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/machoke_facing_away.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 4 -mheight 4 -$(EVENTOBJGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png +$(OBJEVENTGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png $(GBAGFX) $< $@ -mwidth 2 -mheight 2 diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 2d187f8d3..56e348f20 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -6062,4 +6062,4 @@ static void AnimTask_SlackOffSquishStep(u8 taskId) if (!RunAffineAnimFromTaskData(&gTasks[taskId])) DestroyAnimVisualTask(taskId); -}
\ No newline at end of file +} diff --git a/src/battle_records.c b/src/battle_records.c index e462e8992..307b977d5 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -14,7 +14,7 @@ struct DebugStruct1 u8 var1[10]; }; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern u8 gBattleOutcome; #if DEBUG @@ -220,7 +220,7 @@ void UpdateLinkBattleRecords(int id) gTrainerCards[id].playerName, gTrainerCards[id].trainerId, gBattleOutcome, - gLinkPlayers[gLinkPlayerEventObjects[id].linkPlayerId].language); + gLinkPlayers[gLinkPlayerObjectEvents[id].linkPlayerId].language); } #if DEBUG @@ -238,7 +238,7 @@ void debug_sub_81257E0(void) gUnknown_Debug_4245CC[id].var1, gUnknown_Debug_4245CC[id].var0, gUnknown_Debug_8424620[i].unk1, - gLinkPlayers[gLinkPlayerEventObjects[id].linkPlayerId].language); + gLinkPlayers[gLinkPlayerObjectEvents[id].linkPlayerId].language); } } #endif diff --git a/src/battle_setup.c b/src/battle_setup.c index 89064b97b..a7da9905a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -40,7 +40,7 @@ extern void (*gFieldCallback)(void); EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent = 0; -EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; +EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0; EWRAM_DATA static u8 *sTrainerIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerDefeatSpeech = NULL; EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL; @@ -52,7 +52,7 @@ extern u16 gBattleTypeFlags; extern u16 gSpecialVar_LastTalked; extern u8 gBattleOutcome; -extern struct EventObject gEventObjects[]; +extern struct ObjectEvent gObjectEvents[]; extern u8 gUnknown_0819F818[]; extern u8 gUnknown_0819F840[]; @@ -101,7 +101,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_0[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -113,7 +113,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_1[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -125,7 +125,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_2[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -137,7 +137,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_3[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -149,7 +149,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -516,7 +516,7 @@ void BattleSetup_StartWildBattle(void) static void DoStandardWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80597F4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; @@ -528,7 +528,7 @@ static void DoStandardWildBattle(void) void BattleSetup_StartRoamerBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80597F4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; @@ -540,7 +540,7 @@ void BattleSetup_StartRoamerBattle(void) static void DoSafariBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80597F4(); gMain.savedCallback = sub_80C824C; gBattleTypeFlags = BATTLE_TYPE_SAFARI; @@ -945,7 +945,7 @@ static void ResetTrainerOpponentIds(void) { sTrainerBattleMode = 0; gTrainerBattleOpponent = 0; - sTrainerEventObjectLocalId = 0; + sTrainerObjectEventLocalId = 0; sTrainerIntroSpeech = 0; sTrainerDefeatSpeech = 0; sTrainerVictorySpeech = 0; @@ -991,10 +991,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co static void SetMapVarsToTrainer(void) { - if (sTrainerEventObjectLocalId) + if (sTrainerObjectEventLocalId) { - gSpecialVar_LastTalked = sTrainerEventObjectLocalId; - gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + gSpecialVar_LastTalked = sTrainerObjectEventLocalId; + gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } } @@ -1039,10 +1039,10 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) } } -void TrainerWantsBattle(u8 trainerEventObjId, const u8 *trainerScript) +void TrainerWantsBattle(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(gUnknown_0819F80B); ScriptContext2_Enable(); @@ -1056,9 +1056,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void sub_8082524(void) { - struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; + struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; - SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); + SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection)); } u8 ScrSpecial_GetTrainerBattleMode(void) diff --git a/src/battle_tower.c b/src/battle_tower.c index a5b2df0a6..5d3bc207d 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -163,60 +163,60 @@ static const u8 sFemaleTrainerClasses[] = static const u8 sMaleTrainerGfxIds[] = { - EVENT_OBJ_GFX_HIKER, - EVENT_OBJ_GFX_TUBER_M, - EVENT_OBJ_GFX_MAN_4, - EVENT_OBJ_GFX_BOY_4, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, - EVENT_OBJ_GFX_BLACK_BELT, - EVENT_OBJ_GFX_MAN_6, - EVENT_OBJ_GFX_MAN_6, - 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_MAN_3, - EVENT_OBJ_GFX_OLD_MAN_1, - 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_4, - EVENT_OBJ_GFX_MAN_6, - EVENT_OBJ_GFX_LITTLE_BOY_1, - EVENT_OBJ_GFX_SAILOR, - EVENT_OBJ_GFX_MANIAC, - EVENT_OBJ_GFX_MAN_5, - 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_4, + OBJ_EVENT_GFX_BOY_4, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, + OBJ_EVENT_GFX_BLACK_BELT, + OBJ_EVENT_GFX_MAN_6, + OBJ_EVENT_GFX_MAN_6, + 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_MAN_3, + OBJ_EVENT_GFX_OLD_MAN_1, + 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_4, + OBJ_EVENT_GFX_MAN_6, + OBJ_EVENT_GFX_LITTLE_BOY_1, + OBJ_EVENT_GFX_SAILOR, + OBJ_EVENT_GFX_MANIAC, + OBJ_EVENT_GFX_MAN_5, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_BUG_CATCHER, + OBJ_EVENT_GFX_HIKER, }; static const u8 sFemaleTrainerGfxIds[] = { - EVENT_OBJ_GFX_WOMAN_3, - EVENT_OBJ_GFX_TUBER_F, - EVENT_OBJ_GFX_WOMAN_7, - EVENT_OBJ_GFX_WOMAN_1, - EVENT_OBJ_GFX_WOMAN_3, - EVENT_OBJ_GFX_BEAUTY, - EVENT_OBJ_GFX_LASS, - EVENT_OBJ_GFX_GIRL_3, - EVENT_OBJ_GFX_WOMAN_2, - EVENT_OBJ_GFX_OLD_WOMAN_1, - 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_7, - EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_WOMAN_3, - EVENT_OBJ_GFX_PICNICKER, - EVENT_OBJ_GFX_LASS, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_TUBER_F, + OBJ_EVENT_GFX_WOMAN_7, + OBJ_EVENT_GFX_WOMAN_1, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_BEAUTY, + OBJ_EVENT_GFX_LASS, + OBJ_EVENT_GFX_GIRL_3, + OBJ_EVENT_GFX_WOMAN_2, + OBJ_EVENT_GFX_OLD_WOMAN_1, + 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_7, + OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_WOMAN_3, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_LASS, }; const u16 gBattleTowerBannedSpecies[] = @@ -549,7 +549,7 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex) return; } - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1); } void SetEReaderTrainerGfxId(void) diff --git a/src/berry.c b/src/berry.c index ad0a31b28..b76fc34c4 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1151,11 +1151,11 @@ static struct BerryTree *GetBerryTreeInfo(u8 id) // this was called because the berry script was successful: meaning the player chose to // water the tree. We need to check for the current tree stage and set the appropriate // water flag to true. -bool32 EventObjectInteractionWaterBerryTree(void) +bool32 ObjectEventInteractionWaterBerryTree(void) { // GetBerryTreeInfo does not sanitize the tree retrieved, but there are no known // instances where this can cause problems. - struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); + struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); switch (tree->stage) { @@ -1179,8 +1179,8 @@ bool32 EventObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingUnplantedSoil(void) { - if (GetEventObjectScriptPointerPlayerFacing() == S_BerryTree - && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY) + if (GetObjectEventScriptPointerPlayerFacing() == S_BerryTree + && GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY) return TRUE; else return FALSE; @@ -1188,10 +1188,10 @@ bool8 IsPlayerFacingUnplantedSoil(void) bool8 TryToWaterBerryTree(void) { - if (GetEventObjectScriptPointerPlayerFacing() != S_BerryTree) + if (GetObjectEventScriptPointerPlayerFacing() != S_BerryTree) return FALSE; else - return EventObjectInteractionWaterBerryTree(); + return ObjectEventInteractionWaterBerryTree(); } void ClearBerryTrees(void) @@ -1414,7 +1414,7 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } -void EventObjectInteractionGetBerryTreeData(void) +void ObjectEventInteractionGetBerryTreeData(void) { u8 id; u8 berry; @@ -1422,7 +1422,7 @@ void EventObjectInteractionGetBerryTreeData(void) u8 group; u8 num; - id = EventObjectGetBerryTreeId(gSelectedEventObject); + id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); localId = gSpecialVar_LastTalked; @@ -1447,25 +1447,25 @@ void Berry_FadeAndGoToBerryBagMenu(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_8060288(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } @@ -1494,13 +1494,13 @@ static const u8 gUnknown_Debug_083F7FD3[] = _(""); u8* DebugOpenBerryInfo(void) { - if (GetEventObjectScriptPointerPlayerFacing() != S_BerryTree) + if (GetObjectEventScriptPointerPlayerFacing() != S_BerryTree) { return NULL; } else { - u32 berryTreeId = EventObjectGetBerryTreeId(gSelectedEventObject); + u32 berryTreeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent); struct BerryTree *berryTree = GetBerryTreeInfo(berryTreeId); s32 i; @@ -1542,14 +1542,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 1f5d45418..c03926168 100644 --- a/src/bike.c +++ b/src/bike.c @@ -55,7 +55,7 @@ static void Bike_UpdateDirTimerHistory(u8); static void Bike_UpdateABStartSelectHistory(u8); static u8 Bike_DPadToDirection(u16); static u8 get_some_collision(u8); -static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *, s16, s16, u8, u8); +static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct ObjectEvent *, s16, s16, u8, u8); static bool8 IsRunningDisallowedByMetatile(u8); static void Bike_TryAdvanceCyclingRoadCollisions(); static u8 CanBikeFaceDirOnMetatile(u8, u8); @@ -202,31 +202,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 { @@ -386,10 +386,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) @@ -398,7 +398,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; @@ -433,15 +433,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; @@ -480,15 +480,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; @@ -534,10 +534,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); } @@ -555,21 +555,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 = get_some_collision(direction); @@ -588,48 +588,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 = get_some_collision(direction); @@ -659,7 +659,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct EventObject *playerEventObj; + struct ObjectEvent *playerObjEvent; collision = get_some_collision(direction); if (collision != 0) @@ -677,9 +677,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); } @@ -691,11 +691,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 = get_some_collision(direction); @@ -711,7 +711,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_80595DC(direction); //hit wall? @@ -725,11 +725,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 = get_some_collision(direction); @@ -745,7 +745,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) } else if (collision <= 4) { - if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsBumpySlope(playerObjEvent->currentMetatileBehavior)) PlayerIdleWheelie(direction); else sub_80595DC(direction); //hit wall? @@ -759,11 +759,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 = get_some_collision(direction); @@ -888,18 +888,18 @@ static u8 get_some_collision(u8 direction) s16 x; s16 y; u8 metatitleBehavior; - 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); metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y); - return Bike_CheckCollisionTryAdvanceCollisionCount(playerEventObj, x, y, direction, metatitleBehavior); + return Bike_CheckCollisionTryAdvanceCollisionCount(playerObjEvent, x, y, direction, metatitleBehavior); } -static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) +static u8 Bike_CheckCollisionTryAdvanceCollisionCount(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 > 4) return collision; @@ -987,7 +987,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/braille_puzzles.c b/src/braille_puzzles.c index e217de503..18a9bd553 100644 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -186,7 +186,7 @@ void Task_BrailleWait(u8 taskId) data[0] = 4; break; } - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); DestroyTask(taskId); ScriptContext2_Disable(); break; @@ -196,7 +196,7 @@ void Task_BrailleWait(u8 taskId) data[0] = 4; break; case 4: - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext1_SetupScript(S_OpenRegiceChamber); DestroyTask(taskId); break; diff --git a/src/cable_car.c b/src/cable_car.c index 52111b285..45e0a9cbc 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -818,15 +818,15 @@ static void LoadSprites(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_POOCHYENA + OBJ_EVENT_GFX_HIKER, + OBJ_EVENT_GFX_CAMPER, + OBJ_EVENT_GFX_PICNICKER, + OBJ_EVENT_GFX_POOCHYENA }; s16 hikerCoords[2][2] = { { 0, 80 }, @@ -847,7 +847,7 @@ static void LoadSprites(void) { case 0: default: - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -871,7 +871,7 @@ static void LoadSprites(void) break; case 1: CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -902,7 +902,7 @@ static void LoadSprites(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 9fb17a86b..40afb9741 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2123,9 +2123,9 @@ void Contest_CreatePlayerMon(u8 partyIndex) } memcpy(gContestMons[gContestPlayerMonIndex].trainerName, name, 8); if (gSaveBlock2.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].flags = 0; gContestMons[gContestPlayerMonIndex].unk2C[0] = 0; gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES); diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h index 8fe9cc998..c328ac348 100644 --- a/src/data/bard_music/bard_sounds.h +++ b/src/data/bard_music/bard_sounds.h @@ -50,4 +50,4 @@ const struct BardSound (*const gBardSoundsTable[])[6] = { gBardSounds_Pokemon2 }; -#endif //GUARD_BARD_SOUNDS_TABLE_H
\ No newline at end of file +#endif //GUARD_BARD_SOUNDS_TABLE_H 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 100644 index 69f33c393..000000000 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ /dev/null @@ -1,573 +0,0 @@ -// - -// - -#ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H -#define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H - -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 gDeadBerryTreeGraphicsIdTable[] = {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 gBerryTreeGraphicsIdTable[] = {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[] = { - gEventObjectPicTable_CheriBerryTree, - gEventObjectPicTable_ChestoBerryTree, - gEventObjectPicTable_PechaBerryTree, - gEventObjectPicTable_RawstBerryTree, - gEventObjectPicTable_AspearBerryTree, - gEventObjectPicTable_LeppaBerryTree, - gEventObjectPicTable_OranBerryTree, - gEventObjectPicTable_PersimBerryTree, - gEventObjectPicTable_LumBerryTree, - gEventObjectPicTable_SitrusBerryTree, - gEventObjectPicTable_FigyBerryTree, - gEventObjectPicTable_WikiBerryTree, - gEventObjectPicTable_MagoBerryTree, - gEventObjectPicTable_AguavBerryTree, - gEventObjectPicTable_IapapaBerryTree, - gEventObjectPicTable_RazzBerryTree, - gEventObjectPicTable_RazzBerryTree, - gEventObjectPicTable_MagoBerryTree, - gEventObjectPicTable_WepearBerryTree, - gEventObjectPicTable_IapapaBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_KelpsyBerryTree, - gEventObjectPicTable_WepearBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_GrepaBerryTree, - gEventObjectPicTable_TamatoBerryTree, - gEventObjectPicTable_CornnBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_RabutaBerryTree, - gEventObjectPicTable_NomelBerryTree, - gEventObjectPicTable_SpelonBerryTree, - gEventObjectPicTable_PamtreBerryTree, - gEventObjectPicTable_RabutaBerryTree, - gEventObjectPicTable_DurinBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_LiechiBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_AguavBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_GrepaBerryTree, - gEventObjectPicTable_LansatBerryTree, - gEventObjectPicTable_CornnBerryTree, - gEventObjectPicTable_DurinBerryTree -}; - -const u8 *const gBerryTreePaletteSlotTablePointers[] = { - gBerryTreePaletteSlotTable_Cheri, - gBerryTreePaletteSlotTable_Chesto, - gBerryTreePaletteSlotTable_Pecha, - gBerryTreePaletteSlotTable_Rawst, - gBerryTreePaletteSlotTable_Aspear, - gBerryTreePaletteSlotTable_Leppa, - gBerryTreePaletteSlotTable_Oran, - gBerryTreePaletteSlotTable_Persim, - gBerryTreePaletteSlotTable_Lum, - gBerryTreePaletteSlotTable_Sitrus, - gBerryTreePaletteSlotTable_Figy, - gBerryTreePaletteSlotTable_Wiki, - gBerryTreePaletteSlotTable_Mago, - gBerryTreePaletteSlotTable_Aguav, - gBerryTreePaletteSlotTable_Iapapa, - gBerryTreePaletteSlotTable_Razz, - gBerryTreePaletteSlotTable_Razz, - gBerryTreePaletteSlotTable_Mago, - gBerryTreePaletteSlotTable_Wepear, - gBerryTreePaletteSlotTable_Iapapa, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Kelpsy, - gBerryTreePaletteSlotTable_Wepear, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Grepa, - gBerryTreePaletteSlotTable_Tamato, - gBerryTreePaletteSlotTable_Cornn, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Rabuta, - gBerryTreePaletteSlotTable_Nomel, - gBerryTreePaletteSlotTable_Spelon, - gBerryTreePaletteSlotTable_Pamtre, - gBerryTreePaletteSlotTable_Rabuta, - gBerryTreePaletteSlotTable_Durin, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Liechi, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Aguav, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Grepa, - gBerryTreePaletteSlotTable_Lansat, - gBerryTreePaletteSlotTable_Cornn, - gBerryTreePaletteSlotTable_Durin -}; - -const u8 *const gBerryTreeGraphicsIdTablePointers[] = { - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable, - gBerryTreeGraphicsIdTable -}; - -#endif //POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H 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 100644 index f1733b627..000000000 --- a/src/data/field_event_obj/event_object_anims.h +++ /dev/null @@ -1,886 +0,0 @@ -// - -// - -#ifndef POKERUBY_EVENT_OBJECT_ANIMS_H -#define POKERUBY_EVENT_OBJECT_ANIMS_H - - -const union AnimCmd gEventObjectImageAnim_83708C8[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708DC[] = { - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708E4[] = { - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708EC[] = { - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708F4[] = { - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83708FC[] = { - 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_8370910[] = { - 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_8370924[] = { - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370938[] = { - 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_837094C[] = { - 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_8370960[] = { - 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_8370974[] = { - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370988[] = { - 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_837099C[] = { - 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_83709B0[] = { - 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_83709C4[] = { - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_83709D8[] = { - 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_83709EC[] = { - 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_8370A00[] = { - 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_8370A14[] = { - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A28[] = { - 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_8370A3C[] = { - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A44[] = { - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A4C[] = { - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A54[] = { - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A5C[] = { - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A70[] = { - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A84[] = { - ANIMCMD_FRAME(7, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(8, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370A98[] = { - 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_8370AAC[] = { - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AC0[] = { - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AD4[] = { - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370AE8[] = { - 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_8370AFC[] = { - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B10[] = { - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B24[] = { - ANIMCMD_FRAME(7, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(8, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B38[] = { - 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_8370B4C[] = { - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B60[] = { - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B74[] = { - ANIMCMD_FRAME(7, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(8, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370B88[] = { - 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_8370B9C[] = { - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_FRAME(13, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BB0[] = { - ANIMCMD_FRAME(14, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_FRAME(15, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BC4[] = { - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_FRAME(17, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370BD8[] = { - 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_8370BEC[] = { - 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_8370C04[] = { - ANIMCMD_FRAME(9, 32), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C0C[] = { - ANIMCMD_FRAME(10, 32), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C14[] = { - ANIMCMD_FRAME(11, 32), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C1C[] = { - ANIMCMD_FRAME(11, 32, .hFlip = TRUE), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370C24[] = { - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C30[] = { - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C3C[] = { - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C48[] = { - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C54[] = { - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C60[] = { - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C6C[] = { - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(20, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C78[] = { - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(20, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C84[] = { - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C90[] = { - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370C9C[] = { - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CA8[] = { - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CB4[] = { - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CC0[] = { - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CCC[] = { - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CD8[] = { - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370CE4[] = { - ANIMCMD_FRAME(21, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(22, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370CF8[] = { - ANIMCMD_FRAME(23, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_FRAME(24, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370D0C[] = { - ANIMCMD_FRAME(25, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_FRAME(26, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370D20[] = { - 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_8370D34[] = { - ANIMCMD_FRAME(0, 32), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D3C[] = { - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(2, 32), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D48[] = { - ANIMCMD_FRAME(3, 48), - ANIMCMD_FRAME(4, 48), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D54[] = { - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D68[] = { - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D7C[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(9, 32), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370D8C[] = { - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DA0[] = { - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DB4[] = { - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(11, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DC8[] = { - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(7, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DDC[] = { - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370DF0[] = { - 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_8370E04[] = { - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(9, 6), - ANIMCMD_FRAME(8, 6), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E18[] = { - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(5, 6), - ANIMCMD_FRAME(4, 6), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E2C[] = { - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -const union AnimCmd gEventObjectImageAnim_8370E40[] = { - 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_8370E54[] = { - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(11, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(11, 30), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370E68[] = { - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(7, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(7, 30), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370E7C[] = { - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30), - ANIMCMD_JUMP(0) -}; - -const union AnimCmd gEventObjectImageAnim_8370E90[] = { - 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_8370EA4[] = { - 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_8370ED4[] = { - 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 AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { - gEventObjectImageAnim_83708C8 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = { - gEventObjectImageAnim_83708DC, - gEventObjectImageAnim_83708E4, - gEventObjectImageAnim_83708EC, - gEventObjectImageAnim_83708F4, - gEventObjectImageAnim_83708FC, - gEventObjectImageAnim_8370910, - gEventObjectImageAnim_8370924, - gEventObjectImageAnim_8370938, - gEventObjectImageAnim_837094C, - gEventObjectImageAnim_8370960, - gEventObjectImageAnim_8370974, - gEventObjectImageAnim_8370988, - gEventObjectImageAnim_837099C, - gEventObjectImageAnim_83709B0, - gEventObjectImageAnim_83709C4, - gEventObjectImageAnim_83709D8, - gEventObjectImageAnim_83709EC, - gEventObjectImageAnim_8370A00, - gEventObjectImageAnim_8370A14, - gEventObjectImageAnim_8370A28 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370B9C, - gEventObjectImageAnim_8370BB0, - gEventObjectImageAnim_8370BC4, - gEventObjectImageAnim_8370BD8 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370C24, - gEventObjectImageAnim_8370C30, - gEventObjectImageAnim_8370C3C, - gEventObjectImageAnim_8370C48, - gEventObjectImageAnim_8370C54, - gEventObjectImageAnim_8370C60, - gEventObjectImageAnim_8370C6C, - gEventObjectImageAnim_8370C78, - gEventObjectImageAnim_8370C84, - gEventObjectImageAnim_8370C90, - gEventObjectImageAnim_8370C9C, - gEventObjectImageAnim_8370CA8, - gEventObjectImageAnim_8370CB4, - gEventObjectImageAnim_8370CC0, - gEventObjectImageAnim_8370CCC, - gEventObjectImageAnim_8370CD8, - gEventObjectImageAnim_8370CE4, - gEventObjectImageAnim_8370CF8, - gEventObjectImageAnim_8370D0C, - gEventObjectImageAnim_8370D20 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370C04, - gEventObjectImageAnim_8370C0C, - gEventObjectImageAnim_8370C14, - gEventObjectImageAnim_8370C1C -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = { - gEventObjectImageAnim_8370A3C, - gEventObjectImageAnim_8370A44, - gEventObjectImageAnim_8370A4C, - gEventObjectImageAnim_8370A54, - gEventObjectImageAnim_8370A5C, - gEventObjectImageAnim_8370A70, - gEventObjectImageAnim_8370A84, - gEventObjectImageAnim_8370A98, - gEventObjectImageAnim_8370AAC, - gEventObjectImageAnim_8370AC0, - gEventObjectImageAnim_8370AD4, - gEventObjectImageAnim_8370AE8, - gEventObjectImageAnim_8370AFC, - gEventObjectImageAnim_8370B10, - gEventObjectImageAnim_8370B24, - gEventObjectImageAnim_8370B38, - gEventObjectImageAnim_8370B4C, - gEventObjectImageAnim_8370B60, - gEventObjectImageAnim_8370B74, - gEventObjectImageAnim_8370B88, - gEventObjectImageAnim_8370D7C -}; - -const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = { - gEventObjectImageAnim_8370BEC -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { - gEventObjectImageAnim_8370D34, - gEventObjectImageAnim_8370D3C, - gEventObjectImageAnim_8370D48, - gEventObjectImageAnim_8370D54, - gEventObjectImageAnim_8370D68 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { - gEventObjectImageAnim_83708C8, - gEventObjectImageAnim_8370D8C -}; - -const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { - gEventObjectImageAnim_83708C8, - gEventObjectImageAnim_8370DA0 -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = { - gEventObjectImageAnim_8370DB4, - gEventObjectImageAnim_8370DC8, - gEventObjectImageAnim_8370DDC, - gEventObjectImageAnim_8370DF0, - gEventObjectImageAnim_8370E04, - gEventObjectImageAnim_8370E18, - gEventObjectImageAnim_8370E2C, - gEventObjectImageAnim_8370E40, - gEventObjectImageAnim_8370E54, - gEventObjectImageAnim_8370E68, - gEventObjectImageAnim_8370E7C, - gEventObjectImageAnim_8370E90 -}; - -const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = { - gEventObjectRotScalAnim_8370EA4, - gEventObjectRotScalAnim_8370ED4 -}; - -#endif //POKERUBY_EVENT_OBJECT_ANIMS_H 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 100644 index 0be0be30a..000000000 --- a/src/data/field_event_obj/event_object_graphics.h +++ /dev/null @@ -1,285 +0,0 @@ -#ifndef POKERUBY_EVENT_OBJECT_GFX_H -#define POKERUBY_EVENT_OBJECT_GFX_H - -const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal.4bpp"); -const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/08.gbapal"); -const u16 NullPalette_8310F68[16] = {}; -const u16 NullPalette_8310F88[16] = {}; -const u16 NullPalette_8310FA8[16] = {}; -const u16 NullPalette_8310FC8[16] = {}; -const u16 NullPalette_8310FE8[16] = {}; -const u16 NullPalette_8311008[16] = {}; -const u16 NullPalette_8311028[16] = {}; -const u16 NullPalette_8311048[16] = {}; -const u16 NullPalette_8311068[16] = {}; -const u16 NullPalette_8311088[16] = {}; -const u16 NullPalette_83110A8[16] = {}; -const u16 NullPalette_83110C8[16] = {}; -const u16 NullPalette_83110E8[16] = {}; -const u16 NullPalette_8311108[16] = {}; -const u16 NullPalette_8311128[16] = {}; -const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/09.gbapal"); -const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/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/11.gbapal"); -const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal.4bpp"); -const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/17.gbapal"); -const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/18.gbapal"); -const u16 NullPalette_831B7E8[16] = {}; -const u16 NullPalette_831B808[16] = {}; -const u16 NullPalette_831B828[16] = {}; -const u16 NullPalette_831B848[16] = {}; -const u16 NullPalette_831B868[16] = {}; -const u16 NullPalette_831B888[16] = {}; -const u16 NullPalette_831B8A8[16] = {}; -const u16 NullPalette_831B8C8[16] = {}; -const u16 NullPalette_831B8E8[16] = {}; -const u16 NullPalette_831B908[16] = {}; -const u16 NullPalette_831B928[16] = {}; -const u16 NullPalette_831B948[16] = {}; -const u16 NullPalette_831B968[16] = {}; -const u16 NullPalette_831B988[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/00.gbapal"); -const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/01.gbapal"); -const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/02.gbapal"); -const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/03.gbapal"); -const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/04.gbapal"); -const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/05.gbapal"); -const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/06.gbapal"); -const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/07.gbapal"); -const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp"); -const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.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_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp"); -const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.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_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.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_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); -const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp"); -const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp"); -const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); -const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.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_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp"); -const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp"); -const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.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_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.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_Woman8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8.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_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.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_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp"); -const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m.4bpp"); -const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f.4bpp"); -const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m.4bpp"); -const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f.4bpp"); -const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/sidney.4bpp"); -const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe.4bpp"); -const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/glacia.4bpp"); -const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/drake.4bpp"); -const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne.4bpp"); -const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/brawly.4bpp"); -const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/wattson.4bpp"); -const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/flannery.4bpp"); -const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/norman.4bpp"); -const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/winona.4bpp"); -const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/liza.4bpp"); -const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/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_LittleBoy3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3.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_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.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/archie.4bpp"); -const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/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_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/22.gbapal"); -const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/23.gbapal"); -const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/24.gbapal"); -const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/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/26.gbapal"); -const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/14.gbapal"); -const u32 gEventObjectPic_MachokeCarryingBox[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box.4bpp"); -const u32 gEventObjectPic_MachokeFacingAway[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away.4bpp"); -const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/15.gbapal"); -const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/16.gbapal"); -const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/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/21.gbapal"); -const u32 gFieldEffectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/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 gFieldEffectPic_SurfBlob[] = INCBIN_U32("graphics/field_effect_objects/pics/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/12.gbapal"); -const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/13.gbapal"); - -#endif //POKERUBY_EVENT_OBJECT_GFX_H 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 100644 index 88085980b..000000000 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ /dev/null @@ -1,227 +0,0 @@ -// - -// - -#ifndef POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H -#define POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H - -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xffff, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xffff, 0x110b, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman8 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman8, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xffff, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xffff, 0x110f, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gEventObjectSubspriteTables_CableCar, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy3 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gEventObjectSubspriteTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gEventObjectSubspriteTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kyogre, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Groudon, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xffff, 0x1116, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kyogre, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xffff, 0x1118, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Groudon, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xffff, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; - -#endif //POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H 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 100644 index d221534ad..000000000 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ /dev/null @@ -1,444 +0,0 @@ -#ifndef POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H -#define POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H - -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_LittleBoy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7; -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_Woman8; -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_Man5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; -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 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_MachokeCarryingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeFacingAway; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena; -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_Man7; -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_LittleBoy3; -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_Boy5; -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_Rayquaza; -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 *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_LITTLE_BOY_1] = &gEventObjectGraphicsInfo_LittleBoy1, - [EVENT_OBJ_GFX_LITTLE_GIRL_1] = &gEventObjectGraphicsInfo_LittleGirl1, - [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_2] = &gEventObjectGraphicsInfo_LittleBoy2, - [EVENT_OBJ_GFX_LITTLE_GIRL_2] = &gEventObjectGraphicsInfo_LittleGirl2, - [EVENT_OBJ_GFX_BOY_3] = &gEventObjectGraphicsInfo_Boy3, - [EVENT_OBJ_GFX_GIRL_3] = &gEventObjectGraphicsInfo_Girl3, - [EVENT_OBJ_GFX_BOY_4] = &gEventObjectGraphicsInfo_Boy4, - [EVENT_OBJ_GFX_WOMAN_1] = &gEventObjectGraphicsInfo_Woman1, - [EVENT_OBJ_GFX_FAT_MAN] = &gEventObjectGraphicsInfo_FatMan, - [EVENT_OBJ_GFX_WOMAN_2] = &gEventObjectGraphicsInfo_Woman2, - [EVENT_OBJ_GFX_MAN_1] = &gEventObjectGraphicsInfo_Man1, - [EVENT_OBJ_GFX_WOMAN_3] = &gEventObjectGraphicsInfo_Woman3, - [EVENT_OBJ_GFX_OLD_MAN_1] = &gEventObjectGraphicsInfo_OldMan1, - [EVENT_OBJ_GFX_OLD_WOMAN_1] = &gEventObjectGraphicsInfo_OldWoman1, - [EVENT_OBJ_GFX_MAN_2] = &gEventObjectGraphicsInfo_Man2, - [EVENT_OBJ_GFX_WOMAN_4] = &gEventObjectGraphicsInfo_Woman4, - [EVENT_OBJ_GFX_MAN_3] = &gEventObjectGraphicsInfo_Man3, - [EVENT_OBJ_GFX_WOMAN_5] = &gEventObjectGraphicsInfo_Woman5, - [EVENT_OBJ_GFX_COOK] = &gEventObjectGraphicsInfo_Cook, - [EVENT_OBJ_GFX_WOMAN_6] = &gEventObjectGraphicsInfo_Woman6, - [EVENT_OBJ_GFX_OLD_MAN_2] = &gEventObjectGraphicsInfo_OldMan2, - [EVENT_OBJ_GFX_OLD_WOMAN_2] = &gEventObjectGraphicsInfo_OldWoman2, - [EVENT_OBJ_GFX_CAMPER] = &gEventObjectGraphicsInfo_Camper, - [EVENT_OBJ_GFX_PICNICKER] = &gEventObjectGraphicsInfo_Picnicker, - [EVENT_OBJ_GFX_MAN_4] = &gEventObjectGraphicsInfo_Man4, - [EVENT_OBJ_GFX_WOMAN_7] = &gEventObjectGraphicsInfo_Woman7, - [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_WOMAN_8] = &gEventObjectGraphicsInfo_Woman8, - [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_5] = &gEventObjectGraphicsInfo_Man5, - [EVENT_OBJ_GFX_MAN_6] = &gEventObjectGraphicsInfo_Man6, - [EVENT_OBJ_GFX_REPORTER_M] = &gEventObjectGraphicsInfo_ReporterM, - [EVENT_OBJ_GFX_REPORTER_F] = &gEventObjectGraphicsInfo_ReporterF, - [EVENT_OBJ_GFX_BARD] = &gEventObjectGraphicsInfo_Bard, - [EVENT_OBJ_GFX_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, - [EVENT_OBJ_GFX_TRADER] = &gEventObjectGraphicsInfo_Trader, - [EVENT_OBJ_GFX_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, - [EVENT_OBJ_GFX_GIDDY] = &gEventObjectGraphicsInfo_Giddy, - [EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - [EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, - [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_MACHOKE_CARRYING_BOX] = &gEventObjectGraphicsInfo_MachokeCarryingBox, - [EVENT_OBJ_GFX_MACHOKE_FACING_AWAY] = &gEventObjectGraphicsInfo_MachokeFacingAway, - [EVENT_OBJ_GFX_BIRCHS_BAG] = &gEventObjectGraphicsInfo_BirchsBag, - [EVENT_OBJ_GFX_POOCHYENA] = &gEventObjectGraphicsInfo_Poochyena, - [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_MAN_7] = &gEventObjectGraphicsInfo_Man7, - [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_LittleBoy3, - [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_BOY_5] = &gEventObjectGraphicsInfo_Boy5, - [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] = &gEventObjectGraphicsInfo_Rayquaza, - [EVENT_OBJ_GFX_ZIGZAGOON] = &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 -}; - -#endif //POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H 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 100644 index 5a21a7f57..000000000 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ /dev/null @@ -1,1879 +0,0 @@ -// - -// - -#ifndef POKERUBY_EVENT_OBJECT_PIC_TABLES_H -#define POKERUBY_EVENT_OBJECT_PIC_TABLES_H - -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_BrendanNormal, 2, 4, 9), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 10), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 11), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 12), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 13), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 14), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 15), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 16), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 17) -}; - -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_LittleBoy1[] = { - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7), - overworld_frame(gEventObjectPic_LittleGirl1, 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_LittleBoy2[] = { - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleGirl2, 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_Boy4[] = { - overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy4, 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_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_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_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_OldMan1[] = { - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman1, 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_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_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_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_Woman6[] = { - overworld_frame(gEventObjectPic_Woman6, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 8) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2) -}; - -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_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_Woman7[] = { - overworld_frame(gEventObjectPic_Woman7, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman7, 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_Woman8[] = { - overworld_frame(gEventObjectPic_Woman8, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman8, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman8, 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, 3), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 4), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 5), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 6), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 7), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 8), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 9) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - overworld_frame(gEventObjectPic_ItemBall, 2, 2, 0) -}; - -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_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_Man6[] = { - overworld_frame(gEventObjectPic_Man6, 2, 4, 0), - overworld_frame(gEventObjectPic_Man6, 2, 4, 1), - overworld_frame(gEventObjectPic_Man6, 2, 4, 2), - overworld_frame(gEventObjectPic_Man6, 2, 4, 3), - overworld_frame(gEventObjectPic_Man6, 2, 4, 4), - overworld_frame(gEventObjectPic_Man6, 2, 4, 5), - overworld_frame(gEventObjectPic_Man6, 2, 4, 6), - overworld_frame(gEventObjectPic_Man6, 2, 4, 7), - overworld_frame(gEventObjectPic_Man6, 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[] = { - overworld_frame(gEventObjectPic_UnusedNatuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - overworld_frame(gEventObjectPic_UnusedMagnemiteDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - overworld_frame(gEventObjectPic_UnusedSquirtleDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - overworld_frame(gEventObjectPic_UnusedWooperDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - overworld_frame(gEventObjectPic_UnusedPikachuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - overworld_frame(gEventObjectPic_UnusedPorygon2Doll, 2, 2, 0) -}; - -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[] = { - overworld_frame(gEventObjectPic_PushableBoulder, 2, 2, 0) -}; - -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[] = { - overworld_frame(gEventObjectPic_Truck, 6, 6, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MachokeCarryingBox[] = { - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeCarryingBox, 4, 4, 2) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MachokeFacingAway[] = { - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 0), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1), - overworld_frame(gEventObjectPic_MachokeFacingAway, 4, 4, 1) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - overworld_frame(gEventObjectPic_BirchsBag, 2, 2, 0) -}; - -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_MayNormal, 2, 4, 9), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 10), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 11), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 12), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 13), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 14), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 15), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 16), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 17) -}; - -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[] = { - overworld_frame(gEventObjectPic_MovingBox, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - overworld_frame(gEventObjectPic_CableCar, 8, 8, 0) -}; - -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_Man7[] = { - overworld_frame(gEventObjectPic_Man7, 2, 4, 0), - overworld_frame(gEventObjectPic_Man7, 2, 4, 1), - overworld_frame(gEventObjectPic_Man7, 2, 4, 2), - overworld_frame(gEventObjectPic_Man7, 2, 4, 3), - overworld_frame(gEventObjectPic_Man7, 2, 4, 4), - overworld_frame(gEventObjectPic_Man7, 2, 4, 5), - overworld_frame(gEventObjectPic_Man7, 2, 4, 6), - overworld_frame(gEventObjectPic_Man7, 2, 4, 7), - overworld_frame(gEventObjectPic_Man7, 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_LittleBoy3[] = { - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy3, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy3, 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[] = { - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0), - overworld_frame(gEventObjectPic_SSTidal, 12, 5, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0), - overworld_frame(gEventObjectPic_SubmarineShadow, 11, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - overworld_frame(gEventObjectPic_PichuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - overworld_frame(gEventObjectPic_PikachuDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - overworld_frame(gEventObjectPic_MarillDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - overworld_frame(gEventObjectPic_TogepiDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - overworld_frame(gEventObjectPic_CyndaquilDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - overworld_frame(gEventObjectPic_ChikoritaDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - overworld_frame(gEventObjectPic_TotodileDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - overworld_frame(gEventObjectPic_JigglypuffDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - overworld_frame(gEventObjectPic_MeowthDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - overworld_frame(gEventObjectPic_ClefairyDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - overworld_frame(gEventObjectPic_DittoDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - overworld_frame(gEventObjectPic_SmoochumDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - overworld_frame(gEventObjectPic_TreeckoDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - overworld_frame(gEventObjectPic_TorchicDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - overworld_frame(gEventObjectPic_MudkipDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - overworld_frame(gEventObjectPic_DuskullDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - overworld_frame(gEventObjectPic_WynautDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - overworld_frame(gEventObjectPic_BaltoyDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - overworld_frame(gEventObjectPic_KecleonDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - overworld_frame(gEventObjectPic_AzurillDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - overworld_frame(gEventObjectPic_SkittyDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - overworld_frame(gEventObjectPic_SwabluDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - overworld_frame(gEventObjectPic_GulpinDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - overworld_frame(gEventObjectPic_LotadDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - overworld_frame(gEventObjectPic_SeedotDoll, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - overworld_frame(gEventObjectPic_PikaCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - overworld_frame(gEventObjectPic_RoundCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - overworld_frame(gEventObjectPic_KissCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - overworld_frame(gEventObjectPic_ZigzagCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - overworld_frame(gEventObjectPic_SpinCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - overworld_frame(gEventObjectPic_DiamondCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - overworld_frame(gEventObjectPic_BallCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - overworld_frame(gEventObjectPic_GrassCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - overworld_frame(gEventObjectPic_FireCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - overworld_frame(gEventObjectPic_WaterCushion, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - overworld_frame(gEventObjectPic_BigSnorlaxDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - overworld_frame(gEventObjectPic_BigRhydonDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - overworld_frame(gEventObjectPic_BigLaprasDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - overworld_frame(gEventObjectPic_BigVenusaurDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - overworld_frame(gEventObjectPic_BigCharizardDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - overworld_frame(gEventObjectPic_BigBlastoiseDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - overworld_frame(gEventObjectPic_BigWailmerDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - overworld_frame(gEventObjectPic_BigRegirockDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - overworld_frame(gEventObjectPic_BigRegiceDoll, 4, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - overworld_frame(gEventObjectPic_BigRegisteelDoll, 4, 4, 0) -}; - -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_Boy5[] = { - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy5, 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[] = { - overworld_frame(gEventObjectPic_BrendanDecorating, 2, 4, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - overworld_frame(gEventObjectPic_MayDecorating, 2, 4, 0) -}; - -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_Kyogre[] = { - 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_Groudon[] = { - 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_Fossil[] = { - overworld_frame(gEventObjectPic_Fossil, 2, 2, 0) -}; - -const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0), - overworld_frame(gEventObjectPic_Regi, 4, 4, 0) -}; - -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, 4, 4, 0), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1), - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 1) -}; - -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), -}; - -#endif //POKERUBY_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/base_oam.h b/src/data/object_event/base_oam.h index 49c14e8c2..49c14e8c2 100644 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/object_event/base_oam.h 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 100644 index 000000000..d2d7d6c09 --- /dev/null +++ b/src/data/object_event/berry_tree_graphics_tables.h @@ -0,0 +1,573 @@ +// + +// + +#ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H +#define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H + +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 gDeadBerryTreeGraphicsIdTable[] = {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 gBerryTreeGraphicsIdTable[] = {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[] = { + gObjectEventPicTable_CheriBerryTree, + gObjectEventPicTable_ChestoBerryTree, + gObjectEventPicTable_PechaBerryTree, + gObjectEventPicTable_RawstBerryTree, + gObjectEventPicTable_AspearBerryTree, + gObjectEventPicTable_LeppaBerryTree, + gObjectEventPicTable_OranBerryTree, + gObjectEventPicTable_PersimBerryTree, + gObjectEventPicTable_LumBerryTree, + gObjectEventPicTable_SitrusBerryTree, + gObjectEventPicTable_FigyBerryTree, + gObjectEventPicTable_WikiBerryTree, + gObjectEventPicTable_MagoBerryTree, + gObjectEventPicTable_AguavBerryTree, + gObjectEventPicTable_IapapaBerryTree, + gObjectEventPicTable_RazzBerryTree, + gObjectEventPicTable_RazzBerryTree, + gObjectEventPicTable_MagoBerryTree, + gObjectEventPicTable_WepearBerryTree, + gObjectEventPicTable_IapapaBerryTree, + gObjectEventPicTable_PomegBerryTree, + gObjectEventPicTable_KelpsyBerryTree, + gObjectEventPicTable_WepearBerryTree, + gObjectEventPicTable_HondewBerryTree, + gObjectEventPicTable_GrepaBerryTree, + gObjectEventPicTable_TamatoBerryTree, + gObjectEventPicTable_CornnBerryTree, + gObjectEventPicTable_PomegBerryTree, + gObjectEventPicTable_RabutaBerryTree, + gObjectEventPicTable_NomelBerryTree, + gObjectEventPicTable_SpelonBerryTree, + gObjectEventPicTable_PamtreBerryTree, + gObjectEventPicTable_RabutaBerryTree, + gObjectEventPicTable_DurinBerryTree, + gObjectEventPicTable_HondewBerryTree, + gObjectEventPicTable_LiechiBerryTree, + gObjectEventPicTable_HondewBerryTree, + gObjectEventPicTable_AguavBerryTree, + gObjectEventPicTable_PomegBerryTree, + gObjectEventPicTable_GrepaBerryTree, + gObjectEventPicTable_LansatBerryTree, + gObjectEventPicTable_CornnBerryTree, + gObjectEventPicTable_DurinBerryTree +}; + +const u8 *const gBerryTreePaletteSlotTablePointers[] = { + gBerryTreePaletteSlotTable_Cheri, + gBerryTreePaletteSlotTable_Chesto, + gBerryTreePaletteSlotTable_Pecha, + gBerryTreePaletteSlotTable_Rawst, + gBerryTreePaletteSlotTable_Aspear, + gBerryTreePaletteSlotTable_Leppa, + gBerryTreePaletteSlotTable_Oran, + gBerryTreePaletteSlotTable_Persim, + gBerryTreePaletteSlotTable_Lum, + gBerryTreePaletteSlotTable_Sitrus, + gBerryTreePaletteSlotTable_Figy, + gBerryTreePaletteSlotTable_Wiki, + gBerryTreePaletteSlotTable_Mago, + gBerryTreePaletteSlotTable_Aguav, + gBerryTreePaletteSlotTable_Iapapa, + gBerryTreePaletteSlotTable_Razz, + gBerryTreePaletteSlotTable_Razz, + gBerryTreePaletteSlotTable_Mago, + gBerryTreePaletteSlotTable_Wepear, + gBerryTreePaletteSlotTable_Iapapa, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Kelpsy, + gBerryTreePaletteSlotTable_Wepear, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Grepa, + gBerryTreePaletteSlotTable_Tamato, + gBerryTreePaletteSlotTable_Cornn, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Rabuta, + gBerryTreePaletteSlotTable_Nomel, + gBerryTreePaletteSlotTable_Spelon, + gBerryTreePaletteSlotTable_Pamtre, + gBerryTreePaletteSlotTable_Rabuta, + gBerryTreePaletteSlotTable_Durin, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Liechi, + gBerryTreePaletteSlotTable_Hondew, + gBerryTreePaletteSlotTable_Aguav, + gBerryTreePaletteSlotTable_Pomeg, + gBerryTreePaletteSlotTable_Grepa, + gBerryTreePaletteSlotTable_Lansat, + gBerryTreePaletteSlotTable_Cornn, + gBerryTreePaletteSlotTable_Durin +}; + +const u8 *const gBerryTreeGraphicsIdTablePointers[] = { + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable, + gBerryTreeGraphicsIdTable +}; + +#endif //POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H diff --git a/src/data/object_event/event_object_anims.h b/src/data/object_event/event_object_anims.h new file mode 100644 index 000000000..01cb8f173 --- /dev/null +++ b/src/data/object_event/event_object_anims.h @@ -0,0 +1,886 @@ +// + +// + +#ifndef POKERUBY_OBJECT_EVENT_ANIMS_H +#define POKERUBY_OBJECT_EVENT_ANIMS_H + + +const union AnimCmd gObjectEventImageAnim_83708C8[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708DC[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708E4[] = { + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708EC[] = { + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708F4[] = { + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83708FC[] = { + 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_8370910[] = { + 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_8370924[] = { + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370938[] = { + 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_837094C[] = { + 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_8370960[] = { + 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_8370974[] = { + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370988[] = { + 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_837099C[] = { + 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_83709B0[] = { + 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_83709C4[] = { + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_83709D8[] = { + 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_83709EC[] = { + 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_8370A00[] = { + 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_8370A14[] = { + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A28[] = { + 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_8370A3C[] = { + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A44[] = { + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A4C[] = { + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A54[] = { + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A5C[] = { + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A70[] = { + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A84[] = { + ANIMCMD_FRAME(7, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370A98[] = { + 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_8370AAC[] = { + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AC0[] = { + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AD4[] = { + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370AE8[] = { + 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_8370AFC[] = { + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B10[] = { + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B24[] = { + ANIMCMD_FRAME(7, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(8, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B38[] = { + 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_8370B4C[] = { + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B60[] = { + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B74[] = { + ANIMCMD_FRAME(7, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(8, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370B88[] = { + 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_8370B9C[] = { + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_FRAME(13, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BB0[] = { + ANIMCMD_FRAME(14, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_FRAME(15, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BC4[] = { + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_FRAME(17, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370BD8[] = { + 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_8370BEC[] = { + 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_8370C04[] = { + ANIMCMD_FRAME(9, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C0C[] = { + ANIMCMD_FRAME(10, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C14[] = { + ANIMCMD_FRAME(11, 32), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C1C[] = { + ANIMCMD_FRAME(11, 32, .hFlip = TRUE), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370C24[] = { + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C30[] = { + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C3C[] = { + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C48[] = { + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C54[] = { + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C60[] = { + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C6C[] = { + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(20, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C78[] = { + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(20, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C84[] = { + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C90[] = { + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370C9C[] = { + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CA8[] = { + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CB4[] = { + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CC0[] = { + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CCC[] = { + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CD8[] = { + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370CE4[] = { + ANIMCMD_FRAME(21, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(22, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370CF8[] = { + ANIMCMD_FRAME(23, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370D0C[] = { + ANIMCMD_FRAME(25, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_FRAME(26, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370D20[] = { + 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_8370D34[] = { + ANIMCMD_FRAME(0, 32), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D3C[] = { + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(2, 32), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D48[] = { + ANIMCMD_FRAME(3, 48), + ANIMCMD_FRAME(4, 48), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D54[] = { + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D68[] = { + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D7C[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(9, 32), + ANIMCMD_FRAME(0, 8), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370D8C[] = { + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DA0[] = { + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DB4[] = { + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(11, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DC8[] = { + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DDC[] = { + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370DF0[] = { + 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_8370E04[] = { + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(9, 6), + ANIMCMD_FRAME(8, 6), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E18[] = { + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(5, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E2C[] = { + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +const union AnimCmd gObjectEventImageAnim_8370E40[] = { + 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_8370E54[] = { + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(11, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(11, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370E68[] = { + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(7, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(7, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370E7C[] = { + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30), + ANIMCMD_JUMP(0) +}; + +const union AnimCmd gObjectEventImageAnim_8370E90[] = { + 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_8370EA4[] = { + 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_8370ED4[] = { + 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 AnimCmd *const gObjectEventImageAnimTable_Inanimate[] = { + gObjectEventImageAnim_83708C8 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_QuintyPlump[] = { + gObjectEventImageAnim_83708DC, + gObjectEventImageAnim_83708E4, + gObjectEventImageAnim_83708EC, + gObjectEventImageAnim_83708F4, + gObjectEventImageAnim_83708FC, + gObjectEventImageAnim_8370910, + gObjectEventImageAnim_8370924, + gObjectEventImageAnim_8370938, + gObjectEventImageAnim_837094C, + gObjectEventImageAnim_8370960, + gObjectEventImageAnim_8370974, + gObjectEventImageAnim_8370988, + gObjectEventImageAnim_837099C, + gObjectEventImageAnim_83709B0, + gObjectEventImageAnim_83709C4, + gObjectEventImageAnim_83709D8, + gObjectEventImageAnim_83709EC, + gObjectEventImageAnim_8370A00, + gObjectEventImageAnim_8370A14, + gObjectEventImageAnim_8370A28 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Standard[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BrendanMayNormal[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370B9C, + gObjectEventImageAnim_8370BB0, + gObjectEventImageAnim_8370BC4, + gObjectEventImageAnim_8370BD8 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_AcroBike[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370C24, + gObjectEventImageAnim_8370C30, + gObjectEventImageAnim_8370C3C, + gObjectEventImageAnim_8370C48, + gObjectEventImageAnim_8370C54, + gObjectEventImageAnim_8370C60, + gObjectEventImageAnim_8370C6C, + gObjectEventImageAnim_8370C78, + gObjectEventImageAnim_8370C84, + gObjectEventImageAnim_8370C90, + gObjectEventImageAnim_8370C9C, + gObjectEventImageAnim_8370CA8, + gObjectEventImageAnim_8370CB4, + gObjectEventImageAnim_8370CC0, + gObjectEventImageAnim_8370CCC, + gObjectEventImageAnim_8370CD8, + gObjectEventImageAnim_8370CE4, + gObjectEventImageAnim_8370CF8, + gObjectEventImageAnim_8370D0C, + gObjectEventImageAnim_8370D20 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Surfing[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370C04, + gObjectEventImageAnim_8370C0C, + gObjectEventImageAnim_8370C14, + gObjectEventImageAnim_8370C1C +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Nurse[] = { + gObjectEventImageAnim_8370A3C, + gObjectEventImageAnim_8370A44, + gObjectEventImageAnim_8370A4C, + gObjectEventImageAnim_8370A54, + gObjectEventImageAnim_8370A5C, + gObjectEventImageAnim_8370A70, + gObjectEventImageAnim_8370A84, + gObjectEventImageAnim_8370A98, + gObjectEventImageAnim_8370AAC, + gObjectEventImageAnim_8370AC0, + gObjectEventImageAnim_8370AD4, + gObjectEventImageAnim_8370AE8, + gObjectEventImageAnim_8370AFC, + gObjectEventImageAnim_8370B10, + gObjectEventImageAnim_8370B24, + gObjectEventImageAnim_8370B38, + gObjectEventImageAnim_8370B4C, + gObjectEventImageAnim_8370B60, + gObjectEventImageAnim_8370B74, + gObjectEventImageAnim_8370B88, + gObjectEventImageAnim_8370D7C +}; + +const union AnimCmd *const gObjectEventImageAnimTable_FieldMove[] = { + gObjectEventImageAnim_8370BEC +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BerryTree[] = { + gObjectEventImageAnim_8370D34, + gObjectEventImageAnim_8370D3C, + gObjectEventImageAnim_8370D48, + gObjectEventImageAnim_8370D54, + gObjectEventImageAnim_8370D68 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BreakableRock[] = { + gObjectEventImageAnim_83708C8, + gObjectEventImageAnim_8370D8C +}; + +const union AnimCmd *const gObjectEventImageAnimTable_CuttableTree[] = { + gObjectEventImageAnim_83708C8, + gObjectEventImageAnim_8370DA0 +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Fishing[] = { + gObjectEventImageAnim_8370DB4, + gObjectEventImageAnim_8370DC8, + gObjectEventImageAnim_8370DDC, + gObjectEventImageAnim_8370DF0, + gObjectEventImageAnim_8370E04, + gObjectEventImageAnim_8370E18, + gObjectEventImageAnim_8370E2C, + gObjectEventImageAnim_8370E40, + gObjectEventImageAnim_8370E54, + gObjectEventImageAnim_8370E68, + gObjectEventImageAnim_8370E7C, + gObjectEventImageAnim_8370E90 +}; + +const union AffineAnimCmd *const gObjectEventRotScalAnimTable_KyogreGroudon[] = { + gObjectEventRotScalAnim_8370EA4, + gObjectEventRotScalAnim_8370ED4 +}; + +#endif //POKERUBY_OBJECT_EVENT_ANIMS_H diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_event/event_object_graphics.h new file mode 100644 index 000000000..9738bb04a --- /dev/null +++ b/src/data/object_event/event_object_graphics.h @@ -0,0 +1,285 @@ +#ifndef POKERUBY_OBJECT_EVENT_GFX_H +#define POKERUBY_OBJECT_EVENT_GFX_H + +const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/normal.4bpp"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/08.gbapal"); +const u16 NullPalette_8310F68[16] = {}; +const u16 NullPalette_8310F88[16] = {}; +const u16 NullPalette_8310FA8[16] = {}; +const u16 NullPalette_8310FC8[16] = {}; +const u16 NullPalette_8310FE8[16] = {}; +const u16 NullPalette_8311008[16] = {}; +const u16 NullPalette_8311028[16] = {}; +const u16 NullPalette_8311048[16] = {}; +const u16 NullPalette_8311068[16] = {}; +const u16 NullPalette_8311088[16] = {}; +const u16 NullPalette_83110A8[16] = {}; +const u16 NullPalette_83110C8[16] = {}; +const u16 NullPalette_83110E8[16] = {}; +const u16 NullPalette_8311108[16] = {}; +const u16 NullPalette_8311128[16] = {}; +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/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/11.gbapal"); +const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/normal.4bpp"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/18.gbapal"); +const u16 NullPalette_831B7E8[16] = {}; +const u16 NullPalette_831B808[16] = {}; +const u16 NullPalette_831B828[16] = {}; +const u16 NullPalette_831B848[16] = {}; +const u16 NullPalette_831B868[16] = {}; +const u16 NullPalette_831B888[16] = {}; +const u16 NullPalette_831B8A8[16] = {}; +const u16 NullPalette_831B8C8[16] = {}; +const u16 NullPalette_831B8E8[16] = {}; +const u16 NullPalette_831B908[16] = {}; +const u16 NullPalette_831B928[16] = {}; +const u16 NullPalette_831B948[16] = {}; +const u16 NullPalette_831B968[16] = {}; +const u16 NullPalette_831B988[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/00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/07.gbapal"); +const u32 gObjectEventPic_LittleBoy1[] = INCBIN_U32("graphics/object_events/pics/people/little_boy_1.4bpp"); +const u32 gObjectEventPic_LittleGirl1[] = INCBIN_U32("graphics/object_events/pics/people/little_girl_1.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_LittleBoy2[] = INCBIN_U32("graphics/object_events/pics/people/little_boy_2.4bpp"); +const u32 gObjectEventPic_LittleGirl2[] = INCBIN_U32("graphics/object_events/pics/people/little_girl_2.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_Boy4[] = INCBIN_U32("graphics/object_events/pics/people/boy_4.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_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp"); +const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/object_events/pics/people/man_1.4bpp"); +const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp"); +const u32 gObjectEventPic_OldMan1[] = INCBIN_U32("graphics/object_events/pics/people/old_man_1.4bpp"); +const u32 gObjectEventPic_OldWoman1[] = INCBIN_U32("graphics/object_events/pics/people/old_woman_1.4bpp"); +const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/object_events/pics/people/man_2.4bpp"); +const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/object_events/pics/people/woman_4.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_Cook[] = INCBIN_U32("graphics/object_events/pics/people/cook.4bpp"); +const u32 gObjectEventPic_Woman6[] = INCBIN_U32("graphics/object_events/pics/people/woman_6.4bpp"); +const u32 gObjectEventPic_OldMan2[] = INCBIN_U32("graphics/object_events/pics/people/old_man_2.4bpp"); +const u32 gObjectEventPic_OldWoman2[] = INCBIN_U32("graphics/object_events/pics/people/old_woman_2.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_Man4[] = INCBIN_U32("graphics/object_events/pics/people/man_4.4bpp"); +const u32 gObjectEventPic_Woman7[] = INCBIN_U32("graphics/object_events/pics/people/woman_7.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_Woman8[] = INCBIN_U32("graphics/object_events/pics/people/woman_8.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_Man5[] = INCBIN_U32("graphics/object_events/pics/people/man_5.4bpp"); +const u32 gObjectEventPic_Man6[] = INCBIN_U32("graphics/object_events/pics/people/man_6.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_Man7[] = INCBIN_U32("graphics/object_events/pics/people/man_7.4bpp"); +const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/aqua_member_m.4bpp"); +const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/aqua_member_f.4bpp"); +const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/magma_member_m.4bpp"); +const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/magma_member_f.4bpp"); +const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/object_events/pics/people/sidney.4bpp"); +const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/object_events/pics/people/phoebe.4bpp"); +const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/object_events/pics/people/glacia.4bpp"); +const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/object_events/pics/people/drake.4bpp"); +const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/object_events/pics/people/roxanne.4bpp"); +const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/object_events/pics/people/brawly.4bpp"); +const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/object_events/pics/people/wattson.4bpp"); +const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/object_events/pics/people/flannery.4bpp"); +const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/object_events/pics/people/norman.4bpp"); +const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/object_events/pics/people/winona.4bpp"); +const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/object_events/pics/people/liza.4bpp"); +const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/object_events/pics/people/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_LittleBoy3[] = INCBIN_U32("graphics/object_events/pics/people/little_boy_3.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_Boy5[] = INCBIN_U32("graphics/object_events/pics/people/boy_5.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/archie.4bpp"); +const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/object_events/pics/people/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_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/22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/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/26.gbapal"); +const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/14.gbapal"); +const u32 gObjectEventPic_MachokeCarryingBox[] = INCBIN_U32("graphics/object_events/pics/pokemon/machoke_carrying_box.4bpp"); +const u32 gObjectEventPic_MachokeFacingAway[] = INCBIN_U32("graphics/object_events/pics/pokemon/machoke_facing_away.4bpp"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/15.gbapal"); +const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp"); +const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/16.gbapal"); +const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/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/21.gbapal"); +const u32 gFieldEffectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effect_objects/pics/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 gFieldEffectPic_SurfBlob[] = INCBIN_U32("graphics/field_effect_objects/pics/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/12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/13.gbapal"); + +#endif //POKERUBY_OBJECT_EVENT_GFX_H 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 100644 index 000000000..87b26da64 --- /dev/null +++ b/src/data/object_event/event_object_graphics_info.h @@ -0,0 +1,227 @@ +// + +// + +#ifndef POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_H +#define POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_H + +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xffff, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xffff, 0x110b, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy1 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy2 = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl2 = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy4 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman6 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman6, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman7, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman8 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman8, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man6 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man6, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xffff, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xffff, 0x110f, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gObjectEventSubspriteTables_CableCar, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man7, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy3 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy5 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kyogre, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Groudon, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xffff, 0x1116, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kyogre, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xffff, 0x1118, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Groudon, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xffff, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; + +#endif //POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_H 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 100644 index 000000000..ad3d6f227 --- /dev/null +++ b/src/data/object_event/event_object_graphics_info_pointers.h @@ -0,0 +1,444 @@ +#ifndef POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_POINTERS_H +#define POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_POINTERS_H + +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_LittleBoy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman6; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman7; +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_Woman8; +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_Man5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man6; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF; +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 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_MachokeCarryingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeFacingAway; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena; +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_Man7; +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_LittleBoy3; +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_Boy5; +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_Rayquaza; +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 *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_LITTLE_BOY_1] = &gObjectEventGraphicsInfo_LittleBoy1, + [OBJ_EVENT_GFX_LITTLE_GIRL_1] = &gObjectEventGraphicsInfo_LittleGirl1, + [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_2] = &gObjectEventGraphicsInfo_LittleBoy2, + [OBJ_EVENT_GFX_LITTLE_GIRL_2] = &gObjectEventGraphicsInfo_LittleGirl2, + [OBJ_EVENT_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, + [OBJ_EVENT_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, + [OBJ_EVENT_GFX_BOY_4] = &gObjectEventGraphicsInfo_Boy4, + [OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, + [OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, + [OBJ_EVENT_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, + [OBJ_EVENT_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, + [OBJ_EVENT_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, + [OBJ_EVENT_GFX_OLD_MAN_1] = &gObjectEventGraphicsInfo_OldMan1, + [OBJ_EVENT_GFX_OLD_WOMAN_1] = &gObjectEventGraphicsInfo_OldWoman1, + [OBJ_EVENT_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, + [OBJ_EVENT_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, + [OBJ_EVENT_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, + [OBJ_EVENT_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, + [OBJ_EVENT_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, + [OBJ_EVENT_GFX_WOMAN_6] = &gObjectEventGraphicsInfo_Woman6, + [OBJ_EVENT_GFX_OLD_MAN_2] = &gObjectEventGraphicsInfo_OldMan2, + [OBJ_EVENT_GFX_OLD_WOMAN_2] = &gObjectEventGraphicsInfo_OldWoman2, + [OBJ_EVENT_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, + [OBJ_EVENT_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, + [OBJ_EVENT_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, + [OBJ_EVENT_GFX_WOMAN_7] = &gObjectEventGraphicsInfo_Woman7, + [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_WOMAN_8] = &gObjectEventGraphicsInfo_Woman8, + [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_5] = &gObjectEventGraphicsInfo_Man5, + [OBJ_EVENT_GFX_MAN_6] = &gObjectEventGraphicsInfo_Man6, + [OBJ_EVENT_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, + [OBJ_EVENT_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, + [OBJ_EVENT_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, + [OBJ_EVENT_GFX_HIPSTER] = &gObjectEventGraphicsInfo_Hipster, + [OBJ_EVENT_GFX_TRADER] = &gObjectEventGraphicsInfo_Trader, + [OBJ_EVENT_GFX_STORYTELLER] = &gObjectEventGraphicsInfo_Storyteller, + [OBJ_EVENT_GFX_GIDDY] = &gObjectEventGraphicsInfo_Giddy, + [OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_1] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan1, + [OBJ_EVENT_GFX_UNUSED_MAUVILLE_OLD_MAN_2] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan2, + [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_MACHOKE_CARRYING_BOX] = &gObjectEventGraphicsInfo_MachokeCarryingBox, + [OBJ_EVENT_GFX_MACHOKE_FACING_AWAY] = &gObjectEventGraphicsInfo_MachokeFacingAway, + [OBJ_EVENT_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, + [OBJ_EVENT_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, + [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_MAN_7] = &gObjectEventGraphicsInfo_Man7, + [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_LittleBoy3, + [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_BOY_5] = &gObjectEventGraphicsInfo_Boy5, + [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] = &gObjectEventGraphicsInfo_Rayquaza, + [OBJ_EVENT_GFX_ZIGZAGOON] = &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 +}; + +#endif //POKERUBY_OBJECT_EVENT_GRAPHICS_INFO_POINTERS_H 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 100644 index 000000000..f176e24a1 --- /dev/null +++ b/src/data/object_event/event_object_pic_tables.h @@ -0,0 +1,1879 @@ +// + +// + +#ifndef POKERUBY_OBJECT_EVENT_PIC_TABLES_H +#define POKERUBY_OBJECT_EVENT_PIC_TABLES_H + +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_BrendanNormal, 2, 4, 9), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 10), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 11), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 12), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 13), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 14), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 15), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 16), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 17) +}; + +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_LittleBoy1[] = { + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy1, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl1[] = { + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 0), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 1), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 2), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 3), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 4), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 5), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 6), + overworld_frame(gObjectEventPic_LittleGirl1, 2, 4, 7), + overworld_frame(gObjectEventPic_LittleGirl1, 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_LittleBoy2[] = { + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy2, 2, 2, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl2[] = { + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleGirl2, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleGirl2, 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_Boy4[] = { + overworld_frame(gObjectEventPic_Boy4, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy4, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy4, 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_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_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_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_OldMan1[] = { + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 3), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 4), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 5), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 6), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 7), + overworld_frame(gObjectEventPic_OldMan1, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman1[] = { + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 3), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 4), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 5), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 6), + overworld_frame(gObjectEventPic_OldWoman1, 2, 4, 7), + overworld_frame(gObjectEventPic_OldWoman1, 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_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_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_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_Woman6[] = { + overworld_frame(gObjectEventPic_Woman6, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman6, 2, 4, 8) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldMan2[] = { + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman2[] = { + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman2, 2, 4, 2) +}; + +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_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_Woman7[] = { + overworld_frame(gObjectEventPic_Woman7, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman7, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman7, 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_Woman8[] = { + overworld_frame(gObjectEventPic_Woman8, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman8, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman8, 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, 3), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 4), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 5), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 6), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 7), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 8), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 9) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ItemBall[] = { + overworld_frame(gObjectEventPic_ItemBall, 2, 2, 0) +}; + +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_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_Man6[] = { + overworld_frame(gObjectEventPic_Man6, 2, 4, 0), + overworld_frame(gObjectEventPic_Man6, 2, 4, 1), + overworld_frame(gObjectEventPic_Man6, 2, 4, 2), + overworld_frame(gObjectEventPic_Man6, 2, 4, 3), + overworld_frame(gObjectEventPic_Man6, 2, 4, 4), + overworld_frame(gObjectEventPic_Man6, 2, 4, 5), + overworld_frame(gObjectEventPic_Man6, 2, 4, 6), + overworld_frame(gObjectEventPic_Man6, 2, 4, 7), + overworld_frame(gObjectEventPic_Man6, 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[] = { + overworld_frame(gObjectEventPic_UnusedNatuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedMagnemiteDoll[] = { + overworld_frame(gObjectEventPic_UnusedMagnemiteDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedSquirtleDoll[] = { + overworld_frame(gObjectEventPic_UnusedSquirtleDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedWooperDoll[] = { + overworld_frame(gObjectEventPic_UnusedWooperDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPikachuDoll[] = { + overworld_frame(gObjectEventPic_UnusedPikachuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPorygon2Doll[] = { + overworld_frame(gObjectEventPic_UnusedPorygon2Doll, 2, 2, 0) +}; + +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[] = { + overworld_frame(gObjectEventPic_PushableBoulder, 2, 2, 0) +}; + +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[] = { + overworld_frame(gObjectEventPic_Truck, 6, 6, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MachokeCarryingBox[] = { + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 2), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeCarryingBox, 4, 4, 2) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MachokeFacingAway[] = { + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 0), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1), + overworld_frame(gObjectEventPic_MachokeFacingAway, 4, 4, 1) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirchsBag[] = { + overworld_frame(gObjectEventPic_BirchsBag, 2, 2, 0) +}; + +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_MayNormal, 2, 4, 9), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 10), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 11), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 12), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 13), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 14), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 15), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 16), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 17) +}; + +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[] = { + overworld_frame(gObjectEventPic_MovingBox, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CableCar[] = { + overworld_frame(gObjectEventPic_CableCar, 8, 8, 0) +}; + +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_Man7[] = { + overworld_frame(gObjectEventPic_Man7, 2, 4, 0), + overworld_frame(gObjectEventPic_Man7, 2, 4, 1), + overworld_frame(gObjectEventPic_Man7, 2, 4, 2), + overworld_frame(gObjectEventPic_Man7, 2, 4, 3), + overworld_frame(gObjectEventPic_Man7, 2, 4, 4), + overworld_frame(gObjectEventPic_Man7, 2, 4, 5), + overworld_frame(gObjectEventPic_Man7, 2, 4, 6), + overworld_frame(gObjectEventPic_Man7, 2, 4, 7), + overworld_frame(gObjectEventPic_Man7, 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_LittleBoy3[] = { + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy3, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy3, 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[] = { + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0), + overworld_frame(gObjectEventPic_SSTidal, 12, 5, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SubmarineShadow[] = { + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0), + overworld_frame(gObjectEventPic_SubmarineShadow, 11, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PichuDoll[] = { + overworld_frame(gObjectEventPic_PichuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikachuDoll[] = { + overworld_frame(gObjectEventPic_PikachuDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MarillDoll[] = { + overworld_frame(gObjectEventPic_MarillDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TogepiDoll[] = { + overworld_frame(gObjectEventPic_TogepiDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyndaquilDoll[] = { + overworld_frame(gObjectEventPic_CyndaquilDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ChikoritaDoll[] = { + overworld_frame(gObjectEventPic_ChikoritaDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TotodileDoll[] = { + overworld_frame(gObjectEventPic_TotodileDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_JigglypuffDoll[] = { + overworld_frame(gObjectEventPic_JigglypuffDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MeowthDoll[] = { + overworld_frame(gObjectEventPic_MeowthDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ClefairyDoll[] = { + overworld_frame(gObjectEventPic_ClefairyDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_DittoDoll[] = { + overworld_frame(gObjectEventPic_DittoDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SmoochumDoll[] = { + overworld_frame(gObjectEventPic_SmoochumDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TreeckoDoll[] = { + overworld_frame(gObjectEventPic_TreeckoDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_TorchicDoll[] = { + overworld_frame(gObjectEventPic_TorchicDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MudkipDoll[] = { + overworld_frame(gObjectEventPic_MudkipDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_DuskullDoll[] = { + overworld_frame(gObjectEventPic_DuskullDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_WynautDoll[] = { + overworld_frame(gObjectEventPic_WynautDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BaltoyDoll[] = { + overworld_frame(gObjectEventPic_BaltoyDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_KecleonDoll[] = { + overworld_frame(gObjectEventPic_KecleonDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzurillDoll[] = { + overworld_frame(gObjectEventPic_AzurillDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SkittyDoll[] = { + overworld_frame(gObjectEventPic_SkittyDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwabluDoll[] = { + overworld_frame(gObjectEventPic_SwabluDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_GulpinDoll[] = { + overworld_frame(gObjectEventPic_GulpinDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_LotadDoll[] = { + overworld_frame(gObjectEventPic_LotadDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SeedotDoll[] = { + overworld_frame(gObjectEventPic_SeedotDoll, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikaCushion[] = { + overworld_frame(gObjectEventPic_PikaCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_RoundCushion[] = { + overworld_frame(gObjectEventPic_RoundCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_KissCushion[] = { + overworld_frame(gObjectEventPic_KissCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_ZigzagCushion[] = { + overworld_frame(gObjectEventPic_ZigzagCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_SpinCushion[] = { + overworld_frame(gObjectEventPic_SpinCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_DiamondCushion[] = { + overworld_frame(gObjectEventPic_DiamondCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BallCushion[] = { + overworld_frame(gObjectEventPic_BallCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_GrassCushion[] = { + overworld_frame(gObjectEventPic_GrassCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_FireCushion[] = { + overworld_frame(gObjectEventPic_FireCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_WaterCushion[] = { + overworld_frame(gObjectEventPic_WaterCushion, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigSnorlaxDoll[] = { + overworld_frame(gObjectEventPic_BigSnorlaxDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRhydonDoll[] = { + overworld_frame(gObjectEventPic_BigRhydonDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigLaprasDoll[] = { + overworld_frame(gObjectEventPic_BigLaprasDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigVenusaurDoll[] = { + overworld_frame(gObjectEventPic_BigVenusaurDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigCharizardDoll[] = { + overworld_frame(gObjectEventPic_BigCharizardDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigBlastoiseDoll[] = { + overworld_frame(gObjectEventPic_BigBlastoiseDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigWailmerDoll[] = { + overworld_frame(gObjectEventPic_BigWailmerDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegirockDoll[] = { + overworld_frame(gObjectEventPic_BigRegirockDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegiceDoll[] = { + overworld_frame(gObjectEventPic_BigRegiceDoll, 4, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegisteelDoll[] = { + overworld_frame(gObjectEventPic_BigRegisteelDoll, 4, 4, 0) +}; + +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_Boy5[] = { + overworld_frame(gObjectEventPic_Boy5, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy5, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy5, 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[] = { + overworld_frame(gObjectEventPic_BrendanDecorating, 2, 4, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayDecorating[] = { + overworld_frame(gObjectEventPic_MayDecorating, 2, 4, 0) +}; + +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_Kyogre[] = { + 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_Groudon[] = { + 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_Fossil[] = { + overworld_frame(gObjectEventPic_Fossil, 2, 2, 0) +}; + +const struct SpriteFrameImage gObjectEventPicTable_Regi[] = { + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0), + overworld_frame(gObjectEventPic_Regi, 4, 4, 0) +}; + +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, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 1) +}; + +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), +}; + +#endif //POKERUBY_OBJECT_EVENT_PIC_TABLES_H diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/object_event/event_object_subsprites.h index 95ff6dc03..49238f674 100644 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/object_event/event_object_subsprites.h @@ -2,108 +2,108 @@ // -#ifndef POKERUBY_EVENT_OBJECT_SUBSPRITES_H -#define POKERUBY_EVENT_OBJECT_SUBSPRITES_H +#ifndef POKERUBY_OBJECT_EVENT_SUBSPRITES_H +#define POKERUBY_OBJECT_EVENT_SUBSPRITES_H -const struct Subsprite gEventObjectSubspriteTable_16x16_0[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_1[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_1[] = { { -8, -8, 0, 1, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_2[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_2[] = { { -8, -8, 1, 0, 0, 2}, { -8, 0, 1, 0, 2, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_3[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_3[] = { { -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x16_4[] = { +const struct Subsprite gObjectEventSubspriteTable_16x16_4[] = { { -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 3} }; -const struct SubspriteTable gEventObjectSubspriteTables_16x16[] = { +const struct SubspriteTable gObjectEventSubspriteTables_16x16[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_16x16_0}, - {1, gEventObjectSubspriteTable_16x16_1}, - {2, gEventObjectSubspriteTable_16x16_2}, - {2, gEventObjectSubspriteTable_16x16_3}, - {2, gEventObjectSubspriteTable_16x16_4} + {1, gObjectEventSubspriteTable_16x16_0}, + {1, gObjectEventSubspriteTable_16x16_1}, + {2, gObjectEventSubspriteTable_16x16_2}, + {2, gObjectEventSubspriteTable_16x16_3}, + {2, gObjectEventSubspriteTable_16x16_4} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_0[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_0[] = { { -8, -16, 2, 2, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_1[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_1[] = { { -8, -16, 2, 2, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_2[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_2[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 1, 0, 4, 2}, { -8, 8, 1, 0, 6, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_3[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_3[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 0, 1, 4, 3} }; -const struct Subsprite gEventObjectSubspriteTable_16x32_4[] = { +const struct Subsprite gObjectEventSubspriteTable_16x32_4[] = { { -8, -16, 0, 1, 0, 1}, { -8, 0, 0, 1, 4, 3} }; -const struct SubspriteTable gEventObjectSubspriteTables_16x32[] = { +const struct SubspriteTable gObjectEventSubspriteTables_16x32[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_16x32_0}, - {1, gEventObjectSubspriteTable_16x32_1}, - {3, gEventObjectSubspriteTable_16x32_2}, - {2, gEventObjectSubspriteTable_16x32_3}, - {2, gEventObjectSubspriteTable_16x32_4} + {1, gObjectEventSubspriteTable_16x32_0}, + {1, gObjectEventSubspriteTable_16x32_1}, + {3, gObjectEventSubspriteTable_16x32_2}, + {2, gObjectEventSubspriteTable_16x32_3}, + {2, gObjectEventSubspriteTable_16x32_4} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_0[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_0[] = { {-16, -16, 0, 2, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_1[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_1[] = { {-16, -16, 0, 2, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_2[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_2[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 1, 8, 2}, {-16, 8, 1, 1, 12, 3} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_3[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_3[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 2, 8, 3} }; -const struct Subsprite gEventObjectSubspriteTable_32x32_4[] = { +const struct Subsprite gObjectEventSubspriteTable_32x32_4[] = { {-16, -16, 1, 2, 0, 1}, {-16, 0, 1, 2, 8, 3} }; -const struct SubspriteTable gEventObjectSubspriteTables_32x32[] = { +const struct SubspriteTable gObjectEventSubspriteTables_32x32[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_32x32_0}, - {1, gEventObjectSubspriteTable_32x32_1}, - {3, gEventObjectSubspriteTable_32x32_2}, - {2, gEventObjectSubspriteTable_32x32_3}, - {2, gEventObjectSubspriteTable_32x32_4} + {1, gObjectEventSubspriteTable_32x32_0}, + {1, gObjectEventSubspriteTable_32x32_1}, + {3, gObjectEventSubspriteTable_32x32_2}, + {2, gObjectEventSubspriteTable_32x32_3}, + {2, gObjectEventSubspriteTable_32x32_4} }; -const struct Subsprite gEventObjectSubspriteTable_Truck_0[] = { +const struct Subsprite gObjectEventSubspriteTable_Truck_0[] = { {-24, -24, 1, 1, 0, 2}, { 8, -24, 1, 0, 4, 2}, {-24, -16, 1, 1, 6, 2}, @@ -118,66 +118,66 @@ const struct Subsprite gEventObjectSubspriteTable_Truck_0[] = { { 8, 16, 1, 0, 34, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_Truck[] = { - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0}, - {12, gEventObjectSubspriteTable_Truck_0} +const struct SubspriteTable gObjectEventSubspriteTables_Truck[] = { + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0}, + {12, gObjectEventSubspriteTable_Truck_0} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_0[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_0[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_1[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_1[] = { {-32, -16, 1, 3, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_2[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_2[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_Unused_3[] = { +const struct Subsprite gObjectEventSubspriteTable_Unused_3[] = { {-32, -16, 1, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_Unused[] = { +const struct SubspriteTable gObjectEventSubspriteTables_Unused[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_Unused_0}, - {1, gEventObjectSubspriteTable_Unused_1}, - {1, gEventObjectSubspriteTable_Unused_2}, - {1, gEventObjectSubspriteTable_Unused_3}, - {1, gEventObjectSubspriteTable_Unused_3} + {1, gObjectEventSubspriteTable_Unused_0}, + {1, gObjectEventSubspriteTable_Unused_1}, + {1, gObjectEventSubspriteTable_Unused_2}, + {1, gObjectEventSubspriteTable_Unused_3}, + {1, gObjectEventSubspriteTable_Unused_3} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_0[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_0[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_1[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_1[] = { {-32, -32, 0, 3, 0, 1} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_2[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_2[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSubspriteTable_CableCar_3[] = { +const struct Subsprite gObjectEventSubspriteTable_CableCar_3[] = { {-32, -32, 0, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_CableCar[] = { +const struct SubspriteTable gObjectEventSubspriteTables_CableCar[] = { {0, NULL}, - {1, gEventObjectSubspriteTable_CableCar_0}, - {1, gEventObjectSubspriteTable_CableCar_1}, - {1, gEventObjectSubspriteTable_CableCar_2}, - {1, gEventObjectSubspriteTable_CableCar_3}, - {1, gEventObjectSubspriteTable_CableCar_3} + {1, gObjectEventSubspriteTable_CableCar_0}, + {1, gObjectEventSubspriteTable_CableCar_1}, + {1, gObjectEventSubspriteTable_CableCar_2}, + {1, gObjectEventSubspriteTable_CableCar_3}, + {1, gObjectEventSubspriteTable_CableCar_3} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_0[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -195,7 +195,7 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_0[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_1[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -213,7 +213,7 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_1[] = { { 16, 12, 1, 1, 56, 1} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_2[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -231,7 +231,7 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_2[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SSTidal_3[] = { +const struct Subsprite gObjectEventSubspriteTable_SSTidal_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -249,16 +249,16 @@ const struct Subsprite gEventObjectSubspriteTable_SSTidal_3[] = { { 16, 12, 1, 1, 56, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_SSTidal[] = { - {15, gEventObjectSubspriteTable_SSTidal_0}, - {15, gEventObjectSubspriteTable_SSTidal_0}, - {15, gEventObjectSubspriteTable_SSTidal_1}, - {15, gEventObjectSubspriteTable_SSTidal_2}, - {15, gEventObjectSubspriteTable_SSTidal_3}, - {15, gEventObjectSubspriteTable_SSTidal_3} +const struct SubspriteTable gObjectEventSubspriteTables_SSTidal[] = { + {15, gObjectEventSubspriteTable_SSTidal_0}, + {15, gObjectEventSubspriteTable_SSTidal_0}, + {15, gObjectEventSubspriteTable_SSTidal_1}, + {15, gObjectEventSubspriteTable_SSTidal_2}, + {15, gObjectEventSubspriteTable_SSTidal_3}, + {15, gObjectEventSubspriteTable_SSTidal_3} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_0[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -277,7 +277,7 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_0[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_1[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -296,7 +296,7 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_1[] = { { 32, 4, 0, 0, 43, 1} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_2[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -315,7 +315,7 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_2[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_3[] = { +const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -334,12 +334,12 @@ const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_3[] = { { 32, 4, 0, 0, 43, 2} }; -const struct SubspriteTable gEventObjectSubspriteTables_SubmarineShadow[] = { - {16, gEventObjectSubspriteTable_SubmarineShadow_0}, - {16, gEventObjectSubspriteTable_SubmarineShadow_0}, - {16, gEventObjectSubspriteTable_SubmarineShadow_1}, - {16, gEventObjectSubspriteTable_SubmarineShadow_2}, - {16, gEventObjectSubspriteTable_SubmarineShadow_3}, - {16, gEventObjectSubspriteTable_SubmarineShadow_3} +const struct SubspriteTable gObjectEventSubspriteTables_SubmarineShadow[] = { + {16, gObjectEventSubspriteTable_SubmarineShadow_0}, + {16, gObjectEventSubspriteTable_SubmarineShadow_0}, + {16, gObjectEventSubspriteTable_SubmarineShadow_1}, + {16, gObjectEventSubspriteTable_SubmarineShadow_2}, + {16, gObjectEventSubspriteTable_SubmarineShadow_3}, + {16, gObjectEventSubspriteTable_SubmarineShadow_3} }; -#endif //POKERUBY_EVENT_OBJECT_SUBSPRITES_H +#endif //POKERUBY_OBJECT_EVENT_SUBSPRITES_H diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/object_event/field_effect_object_graphics.h index e06fc7260..e06fc7260 100644 --- a/src/data/field_event_obj/field_effect_object_graphics.h +++ b/src/data/object_event/field_effect_object_graphics.h 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 682816ed9..682816ed9 100644 --- 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 d5d2f2016..d5d2f2016 100644 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/object_event/field_effect_objects.h diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/object_event/movement_action_func_tables.h index 61871a2ca..07182a638 100644 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/object_event/movement_action_func_tables.h @@ -1,378 +1,378 @@ #ifndef POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H #define POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H -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_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_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_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_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_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_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(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 (*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_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(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_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 *const gMovementActionFuncs[])(struct EventObject *, 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_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_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_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_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_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_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(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 (*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_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(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_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 *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { gMovementActionFuncs_FaceDown, // MOVEMENT_ACTION_FACE_DOWN gMovementActionFuncs_FaceUp, // MOVEMENT_ACTION_FACE_UP gMovementActionFuncs_FaceLeft, // MOVEMENT_ACTION_FACE_LEFT @@ -514,22 +514,22 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) }; -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 }; @@ -542,49 +542,49 @@ u8 (*const gUnknown_083759C0[])(u8) = { GetMoveDirectionFastestAnimNum }; -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_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 @@ -593,761 +593,761 @@ u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct const s16 gUnknown_08375A34[] = {0, 1, 1}; const s16 gUnknown_08375A3A[] = {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_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_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_UnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnusedAcroActionRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionRight_Step0, MovementAction_WaitSpriteAnim, 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 diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/object_event/movement_type_func_tables.h index b038d5b20..b89c00b6e 100644 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/object_event/movement_type_func_tables.h @@ -1,7 +1,7 @@ #ifndef POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H #define POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H -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, @@ -27,7 +27,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, @@ -35,7 +35,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, @@ -47,7 +47,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, @@ -59,13 +59,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, @@ -73,7 +73,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, @@ -81,7 +81,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, @@ -89,7 +89,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, @@ -99,7 +99,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, @@ -109,7 +109,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, @@ -119,7 +119,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, @@ -129,7 +129,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, @@ -139,7 +139,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, @@ -149,7 +149,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, @@ -159,7 +159,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, @@ -169,7 +169,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, @@ -178,7 +178,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, @@ -187,14 +187,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 @@ -202,7 +202,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 @@ -210,7 +210,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 @@ -218,7 +218,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 @@ -226,7 +226,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 @@ -234,7 +234,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 @@ -242,13 +242,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 @@ -256,7 +256,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 @@ -264,7 +264,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 @@ -272,7 +272,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 @@ -280,7 +280,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 @@ -288,7 +288,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 @@ -296,7 +296,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 @@ -304,7 +304,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 @@ -312,7 +312,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 @@ -320,7 +320,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 @@ -328,7 +328,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 @@ -336,7 +336,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 @@ -344,7 +344,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 @@ -352,7 +352,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 @@ -360,7 +360,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 @@ -368,7 +368,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 @@ -376,7 +376,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 @@ -384,13 +384,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 }; -u8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { +u8 (*const gCopyPlayerMovementFuncs[])(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)) = { CopyablePlayerMovement_None, CopyablePlayerMovement_FaceDirection, CopyablePlayerMovement_GoSpeed0, @@ -404,32 +404,32 @@ u8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8 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_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/wild_encounters.json b/src/data/wild_encounters.json index 46d6feea4..e708404cc 100644 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -18914,4 +18914,4 @@ ] } ] -}
\ No newline at end of file +} diff --git a/src/decoration.c b/src/decoration.c index e5b427738..8dde2834d 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1089,183 +1089,183 @@ 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 }; #if ENGLISH @@ -2158,20 +2158,20 @@ void sub_80FF474(void) if (FlagGet(i + FLAG_DECORATION_2) == 1) { FlagClear(i + FLAG_DECORATION_2); - for (j=0; j<gMapHeader.events->eventObjectCount; j++) + for (j=0; j<gMapHeader.events->objectEventCount; j++) { - if (gMapHeader.events->eventObjects[j].flagId == i + FLAG_DECORATION_2) + if (gMapHeader.events->objectEvents[j].flagId == i + FLAG_DECORATION_2) { break; } } - VarSet(0x3f20 + gMapHeader.events->eventObjects[j].graphicsId, gUnknown_02038900.decoration->tiles[0]); - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; + VarSet(0x3f20 + gMapHeader.events->objectEvents[j].graphicsId, gUnknown_02038900.decoration->tiles[0]); + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId; gSpecialVar_0x8006 = gUnknown_020391A4; gSpecialVar_0x8007 = gUnknown_020391A6; show_sprite(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); sub_805C0F8(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideTemplateCoordsForEventObject(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); break; } } @@ -2243,7 +2243,7 @@ void sub_80FF6AC(u8 taskId) break; case 1: gPaletteFade.bufferTransferDisabled = 1; - AddDecorationIconObjectFromEventObject(&gUnknown_02038900, gUnknown_020388D0[gUnknown_020388F5]); + AddDecorationIconObjectFromObjectEvent(&gUnknown_02038900, gUnknown_020388D0[gUnknown_020388F5]); sub_80FF960(taskId); SetUpPlacingDecorationPlayerAvatar(taskId, &gUnknown_02038900); pal_fill_black(); @@ -2260,7 +2260,7 @@ void sub_80FF6AC(u8 taskId) } } -void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_02038900, u8 decoIdx) +void AddDecorationIconObjectFromObjectEvent(struct UnkStruct_02038900 * unk_02038900, u8 decoIdx) { sub_80FEF74(); sub_80FED1C(); @@ -2278,7 +2278,7 @@ void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_0203 } else { gUnknown_020391A8 = gSprites[gFieldCamera.trackedSpriteId].data[0]; - gFieldCamera.trackedSpriteId = AddPseudoEventObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); + gFieldCamera.trackedSpriteId = AddPseudoObjectEvent(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); gSprites[gFieldCamera.trackedSpriteId].oam.priority = 1; } } @@ -2293,10 +2293,10 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct UnkStruct_02038900 *un } if (gSaveBlock2.playerGender == MALE) { - gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, v0, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc1, SpriteCallbackDummy, v0, 0x48, 0); } else { - gUnknown_020391A9 = AddPseudoEventObject(0xc2, SpriteCallbackDummy, v0, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc2, SpriteCallbackDummy, v0, 0x48, 0); } gSprites[gUnknown_020391A9].oam.priority = 1; DestroySprite(&gSprites[gUnknown_020391A8]); @@ -2437,7 +2437,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) { return FALSE; } - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) { return FALSE; @@ -2462,7 +2462,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) { return FALSE; } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) { return FALSE; } @@ -2482,7 +2482,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) { return FALSE; } - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) { return FALSE; @@ -2527,7 +2527,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) return FALSE; } } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) { return FALSE; } @@ -2678,7 +2678,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0xC]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r4, r0, 24\n" "\tcmp r4, 0\n" @@ -2801,7 +2801,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0x20]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r0, 24\n" "\tcmp r0, 0x10\n" @@ -2905,7 +2905,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0x20]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r4, r0, 24\n" "\tcmp r4, 0\n" @@ -3045,7 +3045,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration) "\tldr r2, [sp, 0x20]\n" "\tlsrs r1, r2, 16\n" "\tmovs r2, 0\n" - "\tbl GetEventObjectIdByXYZ\n" + "\tbl GetObjectEventIdByXYZ\n" "\tlsls r0, 24\n" "\tlsrs r0, 24\n" "\tcmp r0, 0x10\n" @@ -3618,11 +3618,11 @@ void sub_8100A7C(void) { gSpecialVar_0x8005 = gUnknown_020391B4[gSpecialVar_0x8004].flagId; sub_8100A60(gUnknown_020391B4[gSpecialVar_0x8004].decorId); - 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; } } @@ -3632,11 +3632,11 @@ void sub_8100A7C(void) void sub_8100B20(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; } } @@ -3729,10 +3729,10 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) gFieldCamera.trackedSpriteId = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0); if (gSaveBlock2.playerGender == MALE) { - gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0); } else { - gUnknown_020391A9 = AddPseudoEventObject(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0); + gUnknown_020391A9 = AddPseudoObjectEvent(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0); } gSprites[gUnknown_020391A9].oam.priority = 1; DestroySprite(&gSprites[gUnknown_020391A8]); @@ -3916,9 +3916,9 @@ void sub_81012A0(void) yOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].decorId] & 0xf; for (i=0; i<0x40; i++) { - if (gSaveBlock1.eventObjectTemplates[i].x == xOff && gSaveBlock1.eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1.eventObjectTemplates[i].flagId)) + if (gSaveBlock1.objectEventTemplates[i].x == xOff && gSaveBlock1.objectEventTemplates[i].y == yOff && !FlagGet(gSaveBlock1.objectEventTemplates[i].flagId)) { - gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.eventObjectTemplates[i].flagId; + gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.objectEventTemplates[i].flagId; break; } } diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 7cf4d87b9..70626b367 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -740,10 +740,10 @@ void sub_80E8BF4(u8 reporter, u8 b) { case 0: // Gabby default: - gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_M; + gabbyTyGfxId = OBJ_EVENT_GFX_REPORTER_M; break; case 1: // Ty - gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_F; + gabbyTyGfxId = OBJ_EVENT_GFX_REPORTER_F; break; } @@ -751,8 +751,8 @@ void sub_80E8BF4(u8 reporter, u8 b) LoadSpritePalette(&gUnknown_083DBD38); CreateSprite(&gSpriteTemplate_83DBD48, x, y, 1); - spriteId = AddPseudoEventObject( - (gSaveBlock2.playerGender == MALE) ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, + spriteId = AddPseudoObjectEvent( + (gSaveBlock2.playerGender == MALE) ? OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL : OBJ_EVENT_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, x - 12, y, 0); if (spriteId != MAX_SPRITES) { @@ -760,7 +760,7 @@ void sub_80E8BF4(u8 reporter, u8 b) StartSpriteAnim(&gSprites[spriteId], 3); } - spriteId = AddPseudoEventObject(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); + spriteId = AddPseudoObjectEvent(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; diff --git a/src/event_data.c b/src/event_data.c index 7c508f02b..e114af901 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -136,7 +136,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_obj_lock.c index 33f37e87e..9be385cdf 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -37,9 +37,9 @@ bool8 sub_8064CFC(void) } } -void ScriptFreezeEventObjects(void) +void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8064CDC, 80); } @@ -52,9 +52,9 @@ void sub_8064D38(u8 taskId) sub_80594C0(); 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]) @@ -74,44 +74,44 @@ bool8 sub_8064DB4(void) } } -void LockSelectedEventObject(void) +void LockSelectedObjectEvent(void) { u8 taskId; - FreezeEventObjectsExceptOne(gSelectedEventObject); + FreezeObjectEventsExceptOne(gSelectedObjectEvent); taskId = CreateTask(sub_8064D38, 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(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); } void unref_sub_8064E5C(void) { u8 playerObjectId; - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); } void sub_8064EAC(void) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } void sub_8064ED4(void) { - EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 743d9bb92..c6ce76195 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -20,32 +20,32 @@ // this file was known as evobjmv.c in Game Freak's original source -static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject*, struct Sprite*); -static u8 MovementType_Disguise_Callback(struct EventObject*, struct Sprite*); -static u8 MovementType_Hidden_Callback(struct EventObject*, struct Sprite*); -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject*, s16, s16); -static bool8 DoesObjectCollideWithObjectAt(struct EventObject*, s16, s16); -static bool8 IsMetatileDirectionallyImpassable(struct EventObject*, s16, s16, u8); -static void ClearEventObjectMovement(struct EventObject*, struct Sprite *sprite); -static void EventObjectSetSingleMovement(struct EventObject*, struct Sprite*, u8); -static u8 EventObjectExecSingleMovementAction(struct EventObject*, struct Sprite*); +static u8 MovementType_BerryTreeGrowth_Callback(struct ObjectEvent*, struct Sprite*); +static u8 MovementType_Disguise_Callback(struct ObjectEvent*, struct Sprite*); +static u8 MovementType_Hidden_Callback(struct ObjectEvent*, struct Sprite*); +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent*, s16, s16); +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent*, s16, s16); +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent*, s16, s16, u8); +static void ClearObjectEventMovement(struct ObjectEvent*, struct Sprite *sprite); +static void ObjectEventSetSingleMovement(struct ObjectEvent*, struct Sprite*, u8); +static u8 ObjectEventExecSingleMovementAction(struct ObjectEvent*, struct Sprite*); static void SetMovementDelay(struct Sprite*, s16); static u8 WaitForMovementDelay(struct Sprite*); -static u8 GetCollisionInDirection(struct EventObject*, u8); +static u8 GetCollisionInDirection(struct ObjectEvent*, u8); static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); -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 UpdateEventObjectSpriteAnimPause(struct EventObject*, struct Sprite*); -static void TryEnableEventObjectAnim(struct EventObject*, struct Sprite*); -static void EventObjectExecHeldMovementAction(struct EventObject*, struct Sprite*); -static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*); -static void UpdateEventObjectVisibility(struct EventObject*, struct Sprite*); -static void UpdateEventObjectIsOffscreen(struct EventObject*, struct Sprite*); -static void UpdateEventObjSpriteVisibility(struct EventObject*, struct Sprite*); -static void nullsub(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 DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*); +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent*, struct Sprite*); +static void TryEnableObjectEventAnim(struct ObjectEvent*, struct Sprite*); +static void ObjectEventExecHeldMovementAction(struct ObjectEvent*, struct Sprite*); +static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); +static void UpdateObjectEventVisibility(struct ObjectEvent*, struct Sprite*); +static void UpdateObjectEventIsOffscreen(struct ObjectEvent*, struct Sprite*); +static void UpdateObjEventSpriteVisibility(struct ObjectEvent*, struct Sprite*); +static void nullsub(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8); static u8 GetReflectionTypeByMetatileBehavior(u32); static void Step1(struct Sprite *sprite, u8 direction); static void Step2(struct Sprite *sprite, u8 direction); @@ -57,41 +57,41 @@ static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); static void ObjectCB_CameraObject(struct Sprite *sprite); -static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8, struct EventObjectTemplate*, u8); -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *, u8); +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8, struct ObjectEventTemplate*, u8); +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); static void CreateReflectionEffectSprites(void); -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static u8 GetEventObjectIdByLocalId(u8); -static void RemoveEventObjectInternal(struct EventObject *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); -static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject); -static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); -static void sub_805B914(struct EventObject *); +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); +static u8 GetObjectEventIdByLocalId(u8); +static void RemoveObjectEventInternal(struct ObjectEvent *); +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent); +static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); +static void sub_805B914(struct ObjectEvent *); static u8 sub_805BE58(const struct SpritePalette *); -static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); -static void SetEventObjectDynamicGraphicsId(struct EventObject *); -static u8 FindEventObjectPaletteIndexByTag(u16); -static u16 GetEventObjectFlagIdByEventObjectId(u8); -static void GetEventObjectMovingCameraOffset(s16 *, s16 *); -static void EventObjectUpdateMetatileBehaviors(struct EventObject *); -static void GetGroundEffectFlags_Reflection(struct EventObject *, u32 *); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *, u32 *); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *, u32 *); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *, u32 *); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Tracks(struct EventObject *, u32 *); -static void GetGroundEffectFlags_SandPile(struct EventObject *, u32 *); -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Puddle(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Ripple(struct EventObject *, u32 *); -static void GetGroundEffectFlags_ShortGrass(struct EventObject *, u32 *); -static void GetGroundEffectFlags_HotSprings(struct EventObject *, u32 *); -static void GetGroundEffectFlags_Seaweed(struct EventObject *, u32 *); -static void GetGroundEffectFlags_JumpLanding(struct EventObject *, u32 *); -static u8 EventObjectCheckForReflectiveSurface(struct EventObject *); -static void DoRippleFieldEffect(struct EventObject *eventObj, struct Sprite *sprite); +static bool8 GetAvailableObjectEventId(u16, u8, u8, u8 *); +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *); +static u8 FindObjectEventPaletteIndexByTag(u16); +static u16 GetObjectEventFlagIdByObjectEventId(u8); +static void GetObjectEventMovingCameraOffset(s16 *, s16 *); +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_SandPile(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *, u32 *); +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *); +static void DoRippleFieldEffect(struct ObjectEvent *objEvent, struct Sprite *sprite); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -103,8 +103,8 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/field_event_obj/event_object_graphics.h" -#include "data/field_event_obj/field_effect_object_graphics.h" +#include "data/object_event/event_object_graphics.h" +#include "data/object_event/field_effect_object_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -348,240 +348,240 @@ const u8 gInitialMovementTypeFacingDirections[] = { DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE }; -#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 0x111A - -#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}, +#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 0x111A + +#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}, {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, }; // These were probably intended to be used for the female player's reflection. const u16 gUnusedPlayerReflectionPaletteTags[] = { - 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 ReflectionPaletteSet gPlayerReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_11, gPlayerUnderwaterReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, gPlayerReflectionPaletteTags}, + {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 gMachokeMoverReflectionPaletteTags[] = { - 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 gKyogre2ReflectionPaletteTags[] = { - 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 gGroudon2ReflectionPaletteTags[] = { - 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 gInvisibleKecleonReflectionPaletteTags[] = { - 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 struct ReflectionPaletteSet gSpecialObjectReflectionPaletteSets[] = { - {EVENT_OBJ_PAL_TAG_8, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_17, gPlayerReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_14, gTruckReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_15, gMachokeMoverReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_20, gCableCarReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_21, gSSTidalReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_22, gKyogre2ReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_24, gGroudon2ReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_2, gInvisibleKecleonReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, - {EVENT_OBJ_PAL_TAG_NONE, NULL}, + {OBJ_EVENT_PAL_TAG_8, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_17, gPlayerReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_12, gQuintyPlumpReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_14, gTruckReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_15, gMachokeMoverReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_19, gMovingBoxReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_20, gCableCarReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_21, gSSTidalReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_22, gKyogre2ReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_24, gGroudon2ReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_2, gInvisibleKecleonReflectionPaletteTags}, + {OBJ_EVENT_PAL_TAG_26, gSubmarineShadowReflectionPaletteTags}, + {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[] = { @@ -591,14 +591,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[] = { 0, // DIR_NONE @@ -1019,7 +1019,7 @@ const u8 gUnknown_08375767[][4] = { {3, 4, 2, 1} }; -#include "data/field_event_obj/movement_action_func_tables.h" +#include "data/object_event/movement_action_func_tables.h" // There is code supporing multiple sets of player reflection palettes, but // the data for each is identical. Perhaps non-water/ice reflections were planned. @@ -1027,45 +1027,45 @@ static u8 sCurrentReflectionType; static u16 sCurrentSpecialObjectPaletteTag; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; extern u8 gReservedSpritePaletteCount; extern struct Camera gCamera; -extern struct EventObject gEventObjects[16]; +extern struct ObjectEvent gObjectEvents[16]; #if DEBUG u8 gUnknown_Debug_03004BC0; #endif -static void ClearEventObject(struct EventObject *eventObject) +static void ClearObjectEvent(struct ObjectEvent *objectEvent) { - memset(eventObject, 0, sizeof(struct EventObject)); - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + memset(objectEvent, 0, sizeof(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]); #if DEBUG gUnknown_Debug_03004BC0 = 0; #endif } -void ResetEventObjects(void) +void ResetObjectEvents(void) { - ClearLinkPlayerEventObjects(); - ClearAllEventObjects(); + ClearLinkPlayerObjectEvents(); + ClearAllObjectEvents(); ClearPlayerAvatarInfo(); CreateReflectionEffectSprites(); } static void CreateReflectionEffectSprites(void) { - // The reflection effect when an event object is standing over water or ice + // The reflection effect when an object event is standing over water or ice // is driven by these two invisible sprites' callback functions. The callback // continuously updates OAM rot/scale matrices using affine animations that scale // the sprite up and down horizontally. The second one is needed to handle the inverted @@ -1083,218 +1083,218 @@ 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 mapGroup) +u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { if (localId < 0xFF) - return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroup); + return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroup); else - return GetEventObjectIdByLocalId(localId); + return GetObjectEventIdByLocalId(localId); } -bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) { - *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup); - if (*eventObjectId == EVENT_OBJECTS_COUNT) + *objectEventId = GetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup); + 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 mapGroup) +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) { 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 == mapGroup) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) 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 initialX; s16 initialY; - if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId) != 0) - return EVENT_OBJECTS_COUNT; + if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId) != 0) + return OBJECT_EVENTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - ClearEventObject(eventObject); + objectEvent = &gObjectEvents[objectEventId]; + ClearObjectEvent(objectEvent); initialX = template->x + 7; initialY = template->y + 7; - eventObject->active = TRUE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->graphicsId = template->graphicsId; - eventObject->movementType = template->movementType; - eventObject->localId = template->localId; - eventObject->mapNum = mapNum; + objectEvent->active = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->graphicsId = template->graphicsId; + objectEvent->movementType = template->movementType; + objectEvent->localId = template->localId; + objectEvent->mapNum = mapNum; asm("":::"r6"); - eventObject->mapGroup = mapGroup; - eventObject->initialCoords.x = initialX; - eventObject->initialCoords.y = initialY; - eventObject->currentCoords.x = initialX; - eventObject->currentCoords.y = initialY; - eventObject->previousCoords.x = initialX; - eventObject->previousCoords.y = initialY; - 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); + objectEvent->mapGroup = mapGroup; + objectEvent->initialCoords.x = initialX; + objectEvent->initialCoords.y = initialY; + objectEvent->currentCoords.x = initialX; + objectEvent->currentCoords.y = initialY; + objectEvent->previousCoords.x = initialX; + objectEvent->previousCoords.y = initialY; + 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); asm("":::"r5","r6"); - SetEventObjectDynamicGraphicsId(eventObject); + SetObjectEventDynamicGraphicsId(objectEvent); - if (gRangedMovementTypes[eventObject->movementType]) + if (gRangedMovementTypes[objectEvent->movementType]) { // Ensure a ranged movement type has at least 1 tile of room to move. - if (eventObject->range.as_nybbles.x == 0) - eventObject->range.as_nybbles.x++; - if (eventObject->range.as_nybbles.y == 0) - eventObject->range.as_nybbles.y++; + if (objectEvent->range.as_nybbles.x == 0) + objectEvent->range.as_nybbles.x++; + if (objectEvent->range.as_nybbles.y == 0) + objectEvent->range.as_nybbles.y++; } #if DEBUG gUnknown_Debug_03004BC0++; #endif - return eventObjectId; + return objectEventId; } -u8 TryInitLocalEventObject(u8 localId) +u8 TryInitLocalObjectEvent(u8 localId) { u8 i; - u8 eventObjectCount; + u8 objectEventCount; if (gMapHeader.events == NULL) - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; - eventObjectCount = gMapHeader.events->eventObjectCount; - for (i = 0; i < eventObjectCount; i++) + objectEventCount = gMapHeader.events->objectEventCount; + for (i = 0; i < objectEventCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1.objectEventTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) - return InitEventObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + return InitObjectEventStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.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) { 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; - for (; i < EVENT_OBJECTS_COUNT; i++) + *objectEventId = i; + for (; i < OBJECT_EVENTS_COUNT; i++) { - 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; } return FALSE; } -static void RemoveEventObject(struct EventObject *eventObject) +static void RemoveObjectEvent(struct ObjectEvent *objectEvent) { - eventObject->active = FALSE; - RemoveEventObjectInternal(eventObject); + objectEvent->active = FALSE; + RemoveObjectEventInternal(objectEvent); #if DEBUG gUnknown_Debug_03004BC0--; #endif } -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 cameraDeltaX, s16 cameraDeltaY) +static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { u8 spriteId; - 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); if (graphicsInfo->paletteSlot == 0) { LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); @@ -1303,9 +1303,9 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl { LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } - if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE) + if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; } *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); @@ -1314,101 +1314,101 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl #if DEBUG gUnknown_Debug_03004BC0--; #endif - gEventObjects[eventObjectId].active = FALSE; - return EVENT_OBJECTS_COUNT; + gObjectEvents[objectEventId].active = FALSE; + return OBJECT_EVENTS_COUNT; } sprite = &gSprites[spriteId]; - sub_8060388(cameraDeltaX + eventObject->currentCoords.x, cameraDeltaY + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(cameraDeltaX + objectEvent->currentCoords.x, cameraDeltaY + 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->oam.paletteNum = graphicsInfo->paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - eventObject->inanimate = graphicsInfo->inanimate; - if (!eventObject->inanimate) + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + objectEvent->inanimate = graphicsInfo->inanimate; + if (!objectEvent->inanimate) { - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + 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 TrySpawnEventObject(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) +static u8 TrySpawnObjectEvent(struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY) { - 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, cameraDeltaX, cameraDeltaY); - if (eventObjectId == EVENT_OBJECTS_COUNT) + objectEventId = TrySetupObjectEventSprite(objectEventTemplate, &spriteTemplate, mapNum, mapGroup, cameraDeltaX, cameraDeltaY); + if (objectEventId == OBJECT_EVENTS_COUNT) { - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } - gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images; + gSprites[gObjectEvents[objectEventId].spriteId].images = graphicsInfo->images; if (subspriteTables != NULL) { - 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 x; s16 y; - GetEventObjectMovingCameraOffset(&x, &y); - return TrySpawnEventObject(eventObjectTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); + GetObjectEventMovingCameraOffset(&x, &y); + return TrySpawnObjectEvent(objectEventTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); } -u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementType, u8 localId, s16 x, s16 y, u8 elevation) +u8 SpawnSpecialObjectEventParametrized(u8 graphicsId, u8 movementType, u8 localId, s16 x, s16 y, u8 elevation) { - 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 = elevation; - eventObjectTemplate.movementType = movementType; - eventObjectTemplate.movementRangeX = 0; - eventObjectTemplate.movementRangeY = 0; - eventObjectTemplate.trainerType = 0; - eventObjectTemplate.trainerRange_berryTreeId = 0; - return SpawnSpecialEventObject(&eventObjectTemplate); + objectEventTemplate.localId = localId; + objectEventTemplate.graphicsId = graphicsId; + objectEventTemplate.unk2 = 0; + objectEventTemplate.x = x; + objectEventTemplate.y = y; + objectEventTemplate.elevation = elevation; + objectEventTemplate.movementType = movementType; + objectEventTemplate.movementRangeX = 0; + objectEventTemplate.movementRangeY = 0; + objectEventTemplate.trainerType = 0; + objectEventTemplate.trainerRange_berryTreeId = 0; + return SpawnSpecialObjectEvent(&objectEventTemplate); } u8 show_sprite(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; s16 x; s16 y; - eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (eventObjectTemplate == NULL) + objectEventTemplate = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (objectEventTemplate == NULL) { - return EVENT_OBJECTS_COUNT; + return OBJECT_EVENTS_COUNT; } - GetEventObjectMovingCameraOffset(&x, &y); - return TrySpawnEventObject(eventObjectTemplate, mapNum, mapGroup, x, y); + GetObjectEventMovingCameraOffset(&x, &y); + return TrySpawnObjectEvent(objectEventTemplate, mapNum, mapGroup, x, y); } -void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +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->paletteTag; @@ -1420,23 +1420,23 @@ void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callba *subspriteTables = graphicsInfo->subspriteTables; } -static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], spriteTemplate, subspriteTables); } -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjTemplate->graphicsId, eventObjTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objEventTemplate->graphicsId, objEventTemplate->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; u8 spriteId; - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); if (spriteTemplate.paletteTag != 0xFFFF) { sub_805BDF8(spriteTemplate.paletteTag); @@ -1455,10 +1455,10 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) u8 spriteId; 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; @@ -1491,7 +1491,7 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction) return spriteId; } -void TrySpawnEventObjects(s16 cameraDeltaX, s16 cameraDeltaY) +void TrySpawnObjectEvents(s16 cameraDeltaX, s16 cameraDeltaY) { u8 i; @@ -1501,57 +1501,57 @@ void TrySpawnEventObjects(s16 cameraDeltaX, s16 cameraDeltaY) s16 right = gSaveBlock1.pos.x + 17; s16 top = gSaveBlock1.pos.y; s16 bottom = gSaveBlock1.pos.y + 16; - u8 objectCount = gMapHeader.events->eventObjectCount; + u8 objectCount = gMapHeader.events->objectEventCount; for (i = 0; i < objectCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1.objectEventTemplates[i]; s16 npcX = template->x + 7; s16 npcY = template->y + 7; if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - TrySpawnEventObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, cameraDeltaX, cameraDeltaY); + TrySpawnObjectEvent(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, cameraDeltaX, cameraDeltaY); } } } -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 < 4; 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 = gSaveBlock1.pos.x - 2; s16 right = gSaveBlock1.pos.x + 17; s16 top = gSaveBlock1.pos.y; s16 bottom = gSaveBlock1.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_805B75C(u8, s16, s16); @@ -1564,9 +1564,9 @@ void sub_805B710(u16 a, u16 b) gUnknown_Debug_03004BC0 = 0; #endif 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_805B75C(i, a, b); #if DEBUG @@ -1577,30 +1577,30 @@ void sub_805B710(u16 a, u16 b) CreateReflectionEffectSprites(); } -void sub_805B75C(u8 eventObjectId, s16 x, s16 y) +void sub_805B75C(u8 objectEventId, s16 x, s16 y) { u8 spriteId; 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 < 4; 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]; asm("":::"r5"); 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; if (graphicsInfo->paletteSlot == 0) @@ -1616,16 +1616,16 @@ void sub_805B75C(u8 eventObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8060388(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8060388(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) { @@ -1633,45 +1633,45 @@ void sub_805B75C(u8 eventObjectId, s16 x, s16 y) } sprite->oam.paletteNum = graphicsInfo->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_805B914(eventObject); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); + sub_805B914(objectEvent); + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); } } -static void sub_805B914(struct EventObject *eventObject) +static void sub_805B914(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; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - sprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + sprite = &gSprites[objectEvent->spriteId]; if (graphicsInfo->paletteSlot == 0) { PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); @@ -1686,166 +1686,166 @@ void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = graphicsInfo->paletteSlot; - eventObject->inanimate = graphicsInfo->inanimate; - eventObject->graphicsId = graphicsId; - sub_80603CC(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + objectEvent->inanimate = graphicsInfo->inanimate; + objectEvent->graphicsId = graphicsId; + sub_80603CC(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 > 0x2B) { berryId = 0; } - EventObjectSetGraphicsId(eventObject, gBerryTreeGraphicsIdTablePointers[berryId][berryStage]); + ObjectEventSetGraphicsId(objectEvent, gBerryTreeGraphicsIdTablePointers[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) { if (graphicsId > SPRITE_VAR) { - graphicsId = VarGetEventObjectGraphicsId(graphicsId + 16); + graphicsId = VarGetObjectEventGraphicsId(graphicsId + 16); } if (graphicsId > NUM_OBJECT_GRAPHICS_INFO) { - graphicsId = EVENT_OBJ_GFX_LITTLE_BOY_1; + graphicsId = OBJ_EVENT_GFX_LITTLE_BOY_1; } - 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 + 16); + objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId + 16); } } 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_805BCC0(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_805BCF0(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_805BD48(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_805BD90(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; } @@ -1859,11 +1859,11 @@ void FreeAndReserveObjectSpritePalettes(void) void sub_805BDF8(u16 paletteTag) { - u16 paletteSlot = FindEventObjectPaletteIndexByTag(paletteTag); + u16 paletteSlot = FindObjectEventPaletteIndexByTag(paletteTag); - if (paletteSlot != EVENT_OBJ_PAL_TAG_NONE) //always happens. FindEventObjectPaletteIndexByTag returns u8 + if (paletteSlot != OBJ_EVENT_PAL_TAG_NONE) //always happens. FindObjectEventPaletteIndexByTag returns u8 { - sub_805BE58(&sEventObjectSpritePalettes[paletteSlot]); + sub_805BE58(&sObjectEventSpritePalettes[paletteSlot]); } } @@ -1871,7 +1871,7 @@ void unref_sub_805BE24(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++) sub_805BDF8(paletteTags[i]); } @@ -1886,9 +1886,9 @@ static u8 sub_805BE58(const struct SpritePalette *palette) 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); } static void PatchObjectPalettes(const u16 *paletteTags, u8 minSlot, u8 maxSlot) @@ -1901,13 +1901,13 @@ static void PatchObjectPalettes(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; } @@ -1920,7 +1920,7 @@ void LoadPlayerObjectReflectionPalette(u16 paletteTag, u8 paletteIndex) u8 i; PatchObjectPalette(paletteTag, paletteIndex); - for (i = 0; gPlayerReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gPlayerReflectionPaletteSets[i].mainPaletteTag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gPlayerReflectionPaletteSets[i].mainPaletteTag == paletteTag) { @@ -1936,7 +1936,7 @@ void LoadSpecialObjectReflectionPalette(u16 paletteTag, u8 paletteIndex) sCurrentSpecialObjectPaletteTag = paletteTag; PatchObjectPalette(paletteTag, paletteIndex); - for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].mainPaletteTag == paletteTag) { @@ -1946,64 +1946,64 @@ void LoadSpecialObjectReflectionPalette(u16 paletteTag, u8 paletteIndex) } } -void unref_sub_805C014(struct EventObject *eventObject, s16 x, s16 y) +void unref_sub_805C014(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 sub_805C058(struct EventObject *eventObject, s16 x, s16 y) +void sub_805C058(struct ObjectEvent *objectEvent, s16 x, s16 y) { - struct Sprite *sprite = &gSprites[eventObject->spriteId]; - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + struct Sprite *sprite = &gSprites[objectEvent->spriteId]; + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - SetEventObjectCoords(eventObject, x, y); - sub_80603CC(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + SetObjectEventCoords(objectEvent, x, y); + sub_80603CC(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_805B914(eventObject); - if (eventObject->trackedByCamera) + sub_805B914(objectEvent); + if (objectEvent->trackedByCamera) CameraObjectReset1(); } void sub_805C0F8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { x += 7; y += 7; - sub_805C058(&gEventObjects[eventObjectId], x, y); + sub_805C058(&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 deltaX; @@ -2013,52 +2013,52 @@ void UpdateEventObjectCoordsForCameraUpdate(void) { deltaX = gCamera.x; deltaY = 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 -= deltaX; - gEventObjects[i].initialCoords.y -= deltaY; - gEventObjects[i].currentCoords.x -= deltaX; - gEventObjects[i].currentCoords.y -= deltaY; - gEventObjects[i].previousCoords.x -= deltaX; - gEventObjects[i].previousCoords.y -= deltaY; + gObjectEvents[i].initialCoords.x -= deltaX; + gObjectEvents[i].initialCoords.y -= deltaY; + gObjectEvents[i].currentCoords.x -= deltaX; + gObjectEvents[i].currentCoords.y -= deltaY; + gObjectEvents[i].previousCoords.x -= deltaX; + gObjectEvents[i].previousCoords.y -= deltaY; } } } } -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 cameraDeltaX, s16 cameraDeltaY) +void UpdateObjectEventsForCameraUpdate(s16 cameraDeltaX, s16 cameraDeltaY) { - UpdateEventObjectCoordsForCameraUpdate(); - TrySpawnEventObjects(cameraDeltaX, cameraDeltaY); - RemoveEventObjectsOutsideView(); + UpdateObjectEventCoordsForCameraUpdate(); + TrySpawnObjectEvents(cameraDeltaX, cameraDeltaY); + RemoveObjectEventsOutsideView(); } u8 AddCameraObject(u8 trackedSpriteId) @@ -2194,80 +2194,80 @@ u8 CreateCopySpriteAt(struct Sprite *src, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) +void SetObjectEventDirection(struct ObjectEvent *objectEvent, u8 direction) { - eventObject->previousMovementDirection = eventObject->facingDirection; - if (!eventObject->facingDirectionLocked) + objectEvent->previousMovementDirection = objectEvent->facingDirection; + if (!objectEvent->facingDirectionLocked) { s8 _direction = direction; //needed for the asm to match - eventObject->facingDirection = _direction; + objectEvent->facingDirection = _direction; } - 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 unref_sub_805C5D0(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) return 0xFF; else - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } -u8 unref_sub_805C60C(u8 eventObjectId) +u8 unref_sub_805C60C(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } u8 unref_sub_805C624(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) return 0xFF; else - 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; } -struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { if (gSaveBlock1.location.mapNum == mapNum && gSaveBlock1.location.mapGroup == mapGroup) - return FindEventObjectTemplateByLocalId(localId, gSaveBlock1.eventObjectTemplates, gMapHeader.events->eventObjectCount); + return FindObjectEventTemplateByLocalId(localId, gSaveBlock1.objectEventTemplates, gMapHeader.events->objectEventCount); else { struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - return FindEventObjectTemplateByLocalId(localId, mapHeader->events->eventObjects, mapHeader->events->eventObjectCount); + return FindObjectEventTemplateByLocalId(localId, mapHeader->events->objectEvents, mapHeader->events->objectEventCount); } } -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count) { u8 i; @@ -2279,53 +2279,53 @@ static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, return NULL; } -static struct EventObjectTemplate *GetBaseTemplateForEventObject(struct EventObject *eventObject) +static struct ObjectEventTemplate *GetBaseTemplateForObjectEvent(struct ObjectEvent *objectEvent) { s32 i; - if (eventObject->mapNum != gSaveBlock1.location.mapNum - || eventObject->mapGroup != gSaveBlock1.location.mapGroup) + if (objectEvent->mapNum != gSaveBlock1.location.mapNum + || objectEvent->mapGroup != gSaveBlock1.location.mapGroup) return NULL; for (i = 0; i < 64; i++) { - if (eventObject->localId == gSaveBlock1.eventObjectTemplates[i].localId) - return &gSaveBlock1.eventObjectTemplates[i]; + if (objectEvent->localId == gSaveBlock1.objectEventTemplates[i].localId) + return &gSaveBlock1.objectEventTemplates[i]; } return NULL; } -void OverrideTemplateCoordsForEventObject(struct EventObject *eventObject) +void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *objectEvent) { - struct EventObjectTemplate *template = GetBaseTemplateForEventObject(eventObject); + struct ObjectEventTemplate *template = GetBaseTemplateForObjectEvent(objectEvent); if (template != NULL) { - template->x = eventObject->currentCoords.x - 7; - template->y = eventObject->currentCoords.y - 7; + template->x = objectEvent->currentCoords.x - 7; + template->y = objectEvent->currentCoords.y - 7; } } -void OverrideMovementTypeForEventObject(struct EventObject *eventObject, u8 movementType) +void OverrideMovementTypeForObjectEvent(struct ObjectEvent *objectEvent, u8 movementType) { - struct EventObjectTemplate *template = GetBaseTemplateForEventObject(eventObject); + struct ObjectEventTemplate *template = GetBaseTemplateForObjectEvent(objectEvent); if (template != NULL) template->movementType = movementType; } -void TryOverrideTemplateCoordsForEventObject(u8 localId, u8 mapNum, u8 mapGroup) +void TryOverrideTemplateCoordsForObjectEvent(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) - OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]); + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + OverrideTemplateCoordsForObjectEvent(&gObjectEvents[objectEventId]); } -void InitEventObjectPalettes(u8 reflectionType) +void InitObjectEventPalettes(u8 reflectionType) { FreeAndReserveObjectSpritePalettes(); - sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; + sCurrentSpecialObjectPaletteTag = OBJ_EVENT_PAL_TAG_NONE; sCurrentReflectionType = reflectionType; PatchObjectPalettes(gObjectPaletteTagSets[sCurrentReflectionType], 0, 10); } @@ -2339,7 +2339,7 @@ u16 GetObjectPaletteTag(u8 paletteIndex) return gObjectPaletteTagSets[sCurrentReflectionType][paletteIndex]; // Palette slots 10 and 11 belong to the special object. - for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; gSpecialObjectReflectionPaletteSets[i].mainPaletteTag != OBJ_EVENT_PAL_TAG_NONE; i++) { if (gSpecialObjectReflectionPaletteSets[i].mainPaletteTag == sCurrentSpecialObjectPaletteTag) { @@ -2347,29 +2347,29 @@ u16 GetObjectPaletteTag(u8 paletteIndex) } } - 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) == 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) == 0) { return FALSE; } @@ -2378,7 +2378,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)) { @@ -2388,40 +2388,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 direction; u8 directions[4]; memcpy(directions, gStandardDirections, 4); direction = directions[Random() & 3]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction) != 0) + if (GetCollisionInDirection(objectEvent, direction) != 0) { 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) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) +bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent) { s16 x; s16 y; @@ -2435,17 +2435,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(&x, &y); - 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 > x || maxx < x || miny > y || maxy < y) { return FALSE; @@ -2632,17 +2632,17 @@ u8 GetLimitedVectorDirection_SouthWestEast(s16 x, s16 y, s16 xAbs, s16 yAbs) return direction; } -u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 directionFuncIndex) +u8 TryGetTrainerEncounterDirection(struct ObjectEvent *objectEvent, u8 directionFuncIndex) { s16 x, y; s16 xAbs, yAbs; - if (!EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (!ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { return 0; } PlayerGetDestCoords(&x, &y); - x -= eventObject->currentCoords.x; - y -= eventObject->currentCoords.y; + x -= objectEvent->currentCoords.x; + y -= objectEvent->currentCoords.y; xAbs = x; yAbs = y; if (xAbs < 0) @@ -2655,34 +2655,34 @@ u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 direction 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; @@ -2690,39 +2690,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, 0); + direction = TryGetTrainerEncounterDirection(objectEvent, 0); 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) == 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) == 0) { return FALSE; } @@ -2731,7 +2731,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)) { @@ -2741,34 +2741,34 @@ 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) != 0) + if (GetCollisionInDirection(objectEvent, direction) != 0) { 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) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -2776,23 +2776,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) == 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) == 0) { return FALSE; } @@ -2801,7 +2801,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)) { @@ -2811,34 +2811,34 @@ 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) != 0) + if (GetCollisionInDirection(objectEvent, direction) != 0) { 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) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -2846,17 +2846,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) != 0) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite) != 0) { sprite->data[1] = 2; return TRUE; @@ -2864,43 +2864,43 @@ 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; } 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, MovementType_BerryTreeGrowth_Callback); + UpdateObjectEventCurrentMovement(objectEvent, sprite, MovementType_BerryTreeGrowth_Callback); } -static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static u8 MovementType_BerryTreeGrowth_Callback(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 berryTreeStage; - ClearEventObjectMovement(eventObject, sprite); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryTreeStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryTreeStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (!berryTreeStage) { 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); @@ -2908,7 +2908,7 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct } return FALSE; } - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; berryTreeStage--; if (sprite->animNum != berryTreeStage) @@ -2916,15 +2916,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; @@ -2932,28 +2932,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] & 0x2) >> 1); + objectEvent->invisible = ((sprite->data[2] & 0x2) >> 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; @@ -2961,10 +2961,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] & 0x2) >> 1); + objectEvent->invisible = ((sprite->data[2] & 0x2) >> 1); sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -2977,34 +2977,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; @@ -3012,51 +3012,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, 1); + direction = TryGetTrainerEncounterDirection(objectEvent, 1); if (direction == DIR_NONE) { 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; @@ -3064,51 +3064,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, 2); + direction = TryGetTrainerEncounterDirection(objectEvent, 2); if (direction == DIR_NONE) { 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; @@ -3116,51 +3116,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, 3); + direction = TryGetTrainerEncounterDirection(objectEvent, 3); if (direction == DIR_NONE) { 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; @@ -3168,51 +3168,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, 4); + direction = TryGetTrainerEncounterDirection(objectEvent, 4); if (direction == DIR_NONE) { 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; @@ -3220,51 +3220,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, 5); + direction = TryGetTrainerEncounterDirection(objectEvent, 5); if (direction == DIR_NONE) { 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; @@ -3272,51 +3272,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, 6); + direction = TryGetTrainerEncounterDirection(objectEvent, 6); if (direction == DIR_NONE) { 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; @@ -3324,51 +3324,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, 7); + direction = TryGetTrainerEncounterDirection(objectEvent, 7); if (direction == DIR_NONE) { 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; @@ -3376,51 +3376,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, 8); + direction = TryGetTrainerEncounterDirection(objectEvent, 8); if (direction == DIR_NONE) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpLeftAndRight, 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; @@ -3428,51 +3428,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, 9); + direction = TryGetTrainerEncounterDirection(objectEvent, 9); if (direction == DIR_NONE) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownLeftAndRight, 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; @@ -3480,34 +3480,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, 10); + direction = TryGetTrainerEncounterDirection(objectEvent, 10); if (direction == DIR_NONE) { 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; @@ -3515,43 +3515,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, 0); + direction = TryGetTrainerEncounterDirection(objectEvent, 0); if (direction == DIR_NONE) { - 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, 0x30); sprite->data[1] = 2; @@ -3559,132 +3559,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, 0); + direction = TryGetTrainerEncounterDirection(objectEvent, 0); if (direction == DIR_NONE) { - 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 != 0) + direction = gInitialMovementTypeFacingDirections[objectEvent->movementType]; + if (objectEvent->directionSequenceIndex != 0) { 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) { u8 collisionState; 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)); } - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); if (collisionState == 1) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collisionState != 0) { - 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 *directionSequence) +bool8 MoveNextDirectionInSequence(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 *directionSequence) { u8 collisionState; u8 movementActionId; - if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 3 && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 0; + objectEvent->directionSequenceIndex = 0; } - SetEventObjectDirection(eventObject, directionSequence[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + SetObjectEventDirection(objectEvent, directionSequence[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); if (collisionState == 1) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, directionSequence[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, directionSequence[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collisionState = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collisionState != 0) { - 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; @@ -3692,560 +3692,560 @@ 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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[4]; 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; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(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, 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; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + struct ObjectEvent *objectEvent; + 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; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + struct ObjectEvent *objectEvent; + 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 = 2; 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; } @@ -4254,48 +4254,48 @@ 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_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; @@ -4303,18 +4303,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; } @@ -4393,9 +4393,9 @@ u8 GetRunningDirectionAnimNum(u8 direction) return gRunningDirectionAnimNums[direction]; } -void sub_805FE28(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void sub_805FE28(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; if (sprite->animCmdIndex == 1) @@ -4409,10 +4409,10 @@ void sub_805FE28(struct EventObject *eventObject, struct Sprite *sprite, u8 anim } } -void sub_805FE64(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void sub_805FE64(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { u8 animCmdIndex; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; animCmdIndex = 3; @@ -4435,13 +4435,13 @@ static 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) @@ -4449,73 +4449,73 @@ 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 dirn) +u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dirn) { u8 direction; direction = dirn; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) return 1; - 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 2; - else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) + else if (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)) return 2; - else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + else if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) return 3; - else if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + else if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) return 4; return 0; } -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 minv; s16 maxv; - if (eventObject->range.as_nybbles.x != 0) + if (objectEvent->range.as_nybbles.x != 0) { - minv = eventObject->initialCoords.x - (eventObject->range.as_nybbles.x); - maxv = eventObject->initialCoords.x + (eventObject->range.as_nybbles.x); + minv = objectEvent->initialCoords.x - (objectEvent->range.as_nybbles.x); + maxv = objectEvent->initialCoords.x + (objectEvent->range.as_nybbles.x); if (minv > x || maxv < x) return TRUE; } - if (eventObject->range.as_nybbles.y != 0) + if (objectEvent->range.as_nybbles.y != 0) { - minv = eventObject->initialCoords.y - (eventObject->range.as_nybbles.y); - maxv = eventObject->initialCoords.y + (eventObject->range.as_nybbles.y); + minv = objectEvent->initialCoords.y - (objectEvent->range.as_nybbles.y); + maxv = objectEvent->initialCoords.y + (objectEvent->range.as_nybbles.y); if (minv > y || maxv < y) return TRUE; } 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; @@ -4523,18 +4523,18 @@ 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; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) { - struct EventObject *eventObject2 = &gEventObjects[i]; + struct ObjectEvent *objectEvent2 = &gObjectEvents[i]; - if (eventObject2->active && eventObject2 != eventObject) + if (objectEvent2->active && objectEvent2 != objectEvent) { - if (((eventObject2->currentCoords.x == x && eventObject2->currentCoords.y == y) || (eventObject2->previousCoords.x == x && eventObject2->previousCoords.y == y)) - && AreZCoordsCompatible(eventObject->currentElevation, eventObject2->currentElevation)) + if (((objectEvent2->currentCoords.x == x && objectEvent2->currentCoords.y == y) || (objectEvent2->previousCoords.x == x && objectEvent2->previousCoords.y == y)) + && AreZCoordsCompatible(objectEvent->currentElevation, objectEvent2->currentElevation)) return TRUE; } } @@ -4543,10 +4543,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)) - if (gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + if (gSprites[gObjectEvents[objectEventId].spriteId].data[7] & 2) return TRUE; return FALSE; @@ -4554,10 +4554,10 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) void sub_8060288(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 4; + gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 4; } } @@ -4629,7 +4629,7 @@ void sub_8060470(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; @@ -4651,107 +4651,107 @@ 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; } -bool8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject) +bool8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->heldMovementFinished; + if (objectEvent->heldMovementActive) + return objectEvent->heldMovementFinished; return 16; } -bool8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject) +bool8 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, u8 (*callback)(struct EventObject *, struct Sprite *)) +void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 (*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)\ @@ -4783,9 +4783,9 @@ dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActio dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions) dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions) -u8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction) { - return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); + return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); } u8 GetAcroWheelieFaceDirectionMovementAction(u8 direction) @@ -4927,19 +4927,19 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_08375767[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; } @@ -4947,135 +4947,135 @@ static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject return FALSE; } -static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 movementActionId) +static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 movementActionId) { - eventObject->movementActionId = movementActionId; + objectEvent->movementActionId = movementActionId; 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); - sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + sub_805FE64(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; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } extern u8 (*const gUnknown_083759C0[5])(u8); -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 (*const functions[5])(u8); memcpy((void *)functions, gUnknown_083759C0, sizeof(gUnknown_083759C0)); - npc_apply_direction(eventObject, sprite, direction, speed); - sub_805FE28(eventObject, sprite, functions[speed](eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + sub_805FE28(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); - sub_805FE28(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, 1); + sub_805FE28(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection)); } bool8 obj_npc_ministep(struct Sprite *); -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_8060E68(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8060E68(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_806467C(sprite, direction); sprite->animPaused = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void sub_8060ED8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8060ED8(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8060E68(eventObject, sprite, direction); - sub_805FE28(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + sub_8060E68(objectEvent, sprite, direction); + sub_805FE28(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_806468C(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_SOUTH); - return MovementAction_WalkSlowDown_Step1(eventObject, sprite); + sub_8060ED8(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; @@ -5083,17 +5083,17 @@ bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_NORTH); - return MovementAction_WalkSlowUp_Step1(eventObject, sprite); + sub_8060ED8(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; @@ -5101,17 +5101,17 @@ bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_WEST); - return MovementAction_WalkSlowLeft_Step1(eventObject, sprite); + sub_8060ED8(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; @@ -5119,17 +5119,17 @@ bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_EAST); - return MovementAction_WalkSlowRight_Step1(eventObject, sprite); + sub_8060ED8(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; @@ -5137,17 +5137,17 @@ bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5155,17 +5155,17 @@ bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5173,17 +5173,17 @@ bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5191,17 +5191,17 @@ bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5209,7 +5209,7 @@ bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, stru return FALSE; } -void sub_806113C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) +void sub_806113C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) { s16 vSPp4[3]; s16 x; @@ -5217,24 +5217,24 @@ void sub_806113C(struct EventObject *eventObject, struct Sprite *sprite, u8 dire memcpy(vSPp4, gUnknown_08375A34, sizeof gUnknown_08375A34); x = 0; y = 0; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); MoveCoordsInDirection(direction, &x, &y, vSPp4[a4], vSPp4[a4]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); sub_80646E4(sprite, direction, a4, 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 a4, u8 a5) +void maybe_shadow_1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 a4, u8 a5) { - sub_806113C(eventObject, sprite, direction, a4, a5); - sub_805FE28(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); - DoShadowFieldEffect(eventObject); + sub_806113C(objectEvent, sprite, direction, a4, a5); + sub_805FE28(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); + DoShadowFieldEffect(objectEvent); } -u8 sub_806123C(struct EventObject *eventObject, struct Sprite *sprite, u8 (*const callback)(struct Sprite *)) +u8 sub_806123C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 (*const callback)(struct Sprite *)) { s16 vSPp4[3]; s16 x; @@ -5246,54 +5246,54 @@ u8 sub_806123C(struct EventObject *eventObject, struct Sprite *sprite, u8 (*cons { x = 0; y = 0; - MoveCoordsInDirection(eventObject->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->disableCoveringGroundEffects = TRUE; + MoveCoordsInDirection(objectEvent->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->disableCoveringGroundEffects = TRUE; } else if (retval == 0xFF) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; - eventObject->landingJump = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; + objectEvent->landingJump = TRUE; sprite->animPaused = TRUE; } return retval; } -u8 sub_8061300(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8061300(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_806123C(eventObject, sprite, sub_8064704); + return sub_806123C(objectEvent, sprite, sub_8064704); } -u8 sub_8061314(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8061314(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_806123C(eventObject, sprite, sub_806478C); + return sub_806123C(objectEvent, sprite, sub_806478C); } -bool8 sub_8061328(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8061328(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061300(eventObject, sprite) == 0xFF) + if (sub_8061300(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_8061340(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8061340(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8061314(eventObject, sprite) == 0xFF) + if (sub_8061314(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_8061358(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8061358(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 retval; - retval = sub_8061300(eventObject, sprite); + retval = sub_8061300(objectEvent, sprite); if (retval != 1) { if (retval == 0xFF) @@ -5302,78 +5302,78 @@ bool8 sub_8061358(struct EventObject *eventObject, struct Sprite *sprite) } return FALSE; } - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + sub_805FE64(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); return FALSE; } -bool8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); -bool8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); -bool8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); -bool8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); +bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); -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_8061328(eventObject, sprite)) + if (sub_8061328(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_8061328(eventObject, sprite)) + if (sub_8061328(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_8061328(eventObject, sprite)) + if (sub_8061328(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5386,7 +5386,7 @@ void sub_8061508(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) { sprite->data[3]--; if (!sprite->data[3]) @@ -5397,50 +5397,50 @@ 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_8061508(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_8061508(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_8061508(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_8061508(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_8061508(sprite, 16); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); -bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); -bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); -bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); +bool8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); +bool8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); +bool8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *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; @@ -5448,15 +5448,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; @@ -5464,15 +5464,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; @@ -5480,15 +5480,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; @@ -5496,16 +5496,16 @@ bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct return FALSE; } -void sub_80616CC(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +void sub_80616CC(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - SetEventObjectDirection(eventObject, direction); - sub_805FE28(eventObject, sprite, animNum); + SetObjectEventDirection(objectEvent, direction); + sub_805FE28(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) { sprite->data[3]--; if (sprite->data[3] == 0) @@ -5517,122 +5517,122 @@ 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_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct 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; @@ -5641,17 +5641,17 @@ bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, } -bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5660,17 +5660,17 @@ bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, s } -bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5679,17 +5679,17 @@ bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, } -bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5697,17 +5697,17 @@ bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject return FALSE; } -bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5715,17 +5715,17 @@ bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5734,17 +5734,17 @@ bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct } -bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5753,17 +5753,17 @@ bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, stru } -bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5771,17 +5771,17 @@ bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, str return FALSE; } -bool8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5789,17 +5789,17 @@ bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5808,17 +5808,17 @@ bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprit } -bool8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5827,17 +5827,17 @@ bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Spr } -bool8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5845,17 +5845,17 @@ bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5863,17 +5863,17 @@ bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5881,17 +5881,17 @@ bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5899,17 +5899,17 @@ bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); -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; @@ -5917,22 +5917,22 @@ 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 SpriteAnimEnded(struct Sprite *); -bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -5942,457 +5942,457 @@ bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Spri return FALSE; } -void sub_8061F5C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8061F5C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_806113C(eventObject, sprite, direction, 1, 0); + sub_806113C(objectEvent, sprite, direction, 1, 0); StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } -bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_SOUTH); - return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); + sub_8061F5C(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_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_NORTH); - return MovementAction_JumpSpecialUp_Step1(eventObject, sprite); + sub_8061F5C(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_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_WEST); - return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite); + sub_8061F5C(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_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8061F5C(eventObject, sprite, DIR_EAST); - return MovementAction_JumpSpecialRight_Step1(eventObject, sprite); + sub_8061F5C(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_8061340(eventObject, sprite)) + if (sub_8061340(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = 0; + objectEvent->landingJump = 0; 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(0xFF, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(0xFF, 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(0xFF, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(0xFF, 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_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061358(eventObject, sprite)) + if (sub_8061358(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite); +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite); -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_8061358(eventObject, sprite)) + if (sub_8061358(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_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); -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_8084794(eventObject); + sub_8084794(objectEvent); return FALSE; } - else if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) + else if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) { sprite->data[2] = 2; return TRUE; } else { - sub_812869C(eventObject); + sub_812869C(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_81286C4(eventObject)) + if (sub_81286C4(objectEvent)) { sprite->data[2] = 2; return TRUE; @@ -6400,14 +6400,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)) { @@ -6417,25 +6417,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)) { @@ -6445,32 +6445,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); @@ -6479,7 +6479,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; @@ -6487,19 +6487,19 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru return TRUE; } -bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_SOUTH); + sub_8060ED8(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = 0; 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; @@ -6508,19 +6508,19 @@ bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8060ED8(eventObject, sprite, DIR_SOUTH); + sub_8060ED8(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = 0; 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; @@ -6529,388 +6529,388 @@ bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -void sub_806295C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_806295C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - sub_805FE64(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + sub_805FE64(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); sprite->animPaused = 1; 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_806295C(eventObject, sprite, DIR_SOUTH); + sub_806295C(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_806295C(eventObject, sprite, DIR_NORTH); + sub_806295C(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_806295C(eventObject, sprite, DIR_WEST); + sub_806295C(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_806295C(eventObject, sprite, DIR_EAST); + sub_806295C(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_8062B8C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3, u8 a4) +void sub_8062B8C(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 a3, u8 a4) { - sub_806113C(eventObject, sprite, direction, a3, a4); + sub_806113C(objectEvent, sprite, direction, a3, a4); StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); - DoShadowFieldEffect(eventObject); + DoShadowFieldEffect(objectEvent); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_SOUTH, 0, 1); - return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_NORTH, 0, 1); - return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_WEST, 0, 1); - return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_EAST, 0, 1); - return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_SOUTH, 1, 1); - return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_NORTH, 1, 1); - return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_WEST, 1, 1); - return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_EAST, 1, 1); - return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8062B8C(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); + sub_8062B8C(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_8061328(eventObject, sprite)) + if (sub_8061328(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_80616CC(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(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_80616CC(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_80616CC(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -void sub_80630D0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_80630D0(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_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); + sub_80630D0(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; @@ -6918,17 +6918,17 @@ bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); + sub_80630D0(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; @@ -6936,17 +6936,17 @@ bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); + sub_80630D0(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; @@ -6954,17 +6954,17 @@ bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80630D0(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); + sub_80630D0(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; @@ -6972,23 +6972,23 @@ bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -void sub_8063208(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8063208(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - sub_805FE28(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + sub_805FE28(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection)); } -bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); + sub_8063208(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; @@ -6996,17 +6996,17 @@ bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); + sub_8063208(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; @@ -7014,17 +7014,17 @@ bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, st return FALSE; } -bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); + sub_8063208(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; @@ -7032,17 +7032,17 @@ bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063208(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); + sub_8063208(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; @@ -7050,24 +7050,24 @@ bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, return FALSE; } -void sub_8063338(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8063338(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_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); + sub_8063338(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; @@ -7075,17 +7075,17 @@ bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); + sub_8063338(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; @@ -7093,17 +7093,17 @@ bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); + sub_8063338(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; @@ -7111,17 +7111,17 @@ bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); -bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8063338(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); + sub_8063338(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; @@ -7129,46 +7129,46 @@ bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite) +bool8 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) { - UpdateEventObjectIsOffscreen(eventObject, sprite); - UpdateEventObjSpriteVisibility(eventObject, sprite); + UpdateObjectEventIsOffscreen(objectEvent, sprite); + UpdateObjEventSpriteVisibility(objectEvent, sprite); } -static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventIsOffscreen(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u16 x, y; s16 x2, y2; - const struct EventObjectGraphicsInfo *graphicsInfo; - eventObject->offScreen = FALSE; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo; + objectEvent->offScreen = FALSE; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (sprite->coordOffsetEnabled) { x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -7184,221 +7184,221 @@ static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct y2 = graphicsInfo->height + (s16)y; if ((s16)x >= 0x100 || x2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } if ((s16)y >= 0xB0 || 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_SandPile(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_SandPile(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_SandPile(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_SandPile(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_SandPile(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_SandPile(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_SandPile(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandPile(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); @@ -7420,13 +7420,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; @@ -7435,9 +7435,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; @@ -7456,14 +7456,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; @@ -7507,20 +7507,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; } @@ -7546,54 +7546,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) @@ -7606,12 +7606,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) @@ -7625,94 +7625,94 @@ 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)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_MoveOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_MoveOnTallGrass(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)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.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)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_MoveOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_MoveOnLongGrass(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)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.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) { - InitObjectReflectionSprite(eventObj, sprite, 0); + InitObjectReflectionSprite(objEvent, sprite, 0); } -void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_IceReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - InitObjectReflectionSprite(eventObj, sprite, 1); + InitObjectReflectionSprite(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) = { nullsub, 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 nullsub(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void nullsub(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] = { @@ -7720,15 +7720,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 @@ -7743,108 +7743,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_SandPile(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandPile(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_MoveOnTallGrass, GroundEffect_SpawnOnLongGrass, @@ -7867,22 +7867,22 @@ static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct S GroundEffect_Seaweed }; -static void StartTriggeredGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags) +static void StartTriggeredGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags) { u8 i; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) if (flags & 1) - sGroundEffectFuncs[i](eventObj, sprite); + sGroundEffectFuncs[i](objEvent, sprite); } -void FilterOutDisabledCoveringGroundEffects(struct EventObject *eventObj, u32 *flags) +void FilterOutDisabledCoveringGroundEffects(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 @@ -7891,111 +7891,111 @@ void FilterOutDisabledCoveringGroundEffects(struct EventObject *eventObj, u32 *f } } -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); - StartTriggeredGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnSpawn(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + StartTriggeredGroundEffects(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); - FilterOutDisabledCoveringGroundEffects(eventObj, &flags); - StartTriggeredGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnBeginStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutDisabledCoveringGroundEffects(objEvent, &flags); + StartTriggeredGroundEffects(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); - StartTriggeredGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnStop = 0; - eventObj->landingJump = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnFinishStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutStepOnPuddleGroundEffectIfJumping(objEvent, &flags); + StartTriggeredGroundEffects(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) @@ -8249,7 +8249,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; @@ -8276,19 +8276,19 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) sprite->invisible = TRUE; } -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *sprite) { SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); } -void TurnEventObject(u8 eventObjectId, u8 direction) +void TurnObjectEvent(u8 objectEventId, u8 direction) { u8 i; for (i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if (sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == eventObjectId) + if (sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == objectEventId) { u8 animNum = GetFaceDirectionAnimNum(direction); StartSpriteAnim(sprite, animNum); @@ -8297,24 +8297,24 @@ void TurnEventObject(u8 eventObjectId, u8 direction) } } -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; diff --git a/src/field_camera.c b/src/field_camera.c index 319c8a540..2a314dc2f 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -302,7 +302,7 @@ static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset) gBGTilemapBuffers[2][offset + 0x20] = metatiles[2]; gBGTilemapBuffers[2][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. gBGTilemapBuffers[1][offset] = metatiles[4]; gBGTilemapBuffers[1][offset + 1] = metatiles[5]; gBGTilemapBuffers[1][offset + 0x20] = metatiles[6]; @@ -416,7 +416,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); @@ -431,7 +431,7 @@ void CameraUpdate(void) void MoveCameraAndRedrawMap(int deltaX, int deltaY) { 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 426e65f06..d5bdab053 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -35,7 +35,7 @@ struct Coords32 extern u16 gSpecialVar_LastTalked; extern u16 gSpecialVar_Facing; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gUnknown_020297ED; @@ -43,7 +43,7 @@ extern u8 gUnknown_020297ED; static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; -u8 gSelectedEventObject; +u8 gSelectedObjectEvent; //scripts extern u8 gUnknown_081A2C51[]; @@ -89,7 +89,7 @@ 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 u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); @@ -331,7 +331,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; @@ -352,50 +352,50 @@ 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 == 16 || gEventObjects[eventObjectId].localId == 0xFF) + if (objectEventId == 16 || gObjectEvents[objectEventId].localId == 0xFF) 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 == 16 || gEventObjects[eventObjectId].localId == 0xFF) + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); + if (objectEventId == 16 || gObjectEvents[objectEventId].localId == 0xFF) { 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 == 16 || gEventObjects[eventObjectId].localId == 0xFF) + // 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 == 16 || gObjectEvents[objectEventId].localId == 0xFF) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; - script = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + script = GetObjectEventScriptPointerByObjectEventId(objectEventId); script = GetRamScript(gSpecialVar_LastTalked, script); return script; } @@ -935,14 +935,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 5ce8028ca..5c26b647c 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -269,7 +269,7 @@ bool8 (*const gUnknown_0839F300[])(struct Task *) = { sub_8086ED4 }; -bool8 (*const gUnknown_0839F31C[])(struct Task *, struct EventObject *) = { +bool8 (*const gUnknown_0839F31C[])(struct Task *, struct ObjectEvent *) = { sub_8086FB0, waterfall_1_do_anim_probably, waterfall_2_wait_anim_finish_probably, @@ -283,7 +283,7 @@ bool8 (*const gUnknown_0839F330[])(struct Task *) = { dive_3_unknown }; -bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F33C[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_808722C, sub_8087264, sub_8087298, @@ -292,14 +292,14 @@ bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct S sub_80873F4 }; -bool8 (*const gUnknown_0839F354[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F354[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80874CC, sub_80874FC, sub_8087548, sub_808759C }; -bool8 (*const gUnknown_0839F364[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F364[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80876C8, sub_80876F8, sub_8087774, @@ -1085,7 +1085,7 @@ void mapldr_080842E8(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1122,13 +1122,13 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; if (gPlayerAvatar.flags & 0x08) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); } ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1148,7 +1148,7 @@ void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(taskId); } } @@ -1162,7 +1162,7 @@ void sub_8086748(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8086774, 0); gFieldCallback = NULL; } @@ -1176,14 +1176,14 @@ void sub_8086774(u8 taskId) bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[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 = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; gPlayerAvatar.preventStep = TRUE; - EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1210,7 +1210,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1218,10 +1218,10 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] bool8 sub_80868E4(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) @@ -1235,15 +1235,15 @@ bool8 sub_80868E4(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]++; } @@ -1280,7 +1280,7 @@ bool8 sub_80869F8(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_8086774)); return FALSE; @@ -1319,7 +1319,7 @@ void sub_8086A68(u8 taskId) bool8 sub_8086AA0(struct Task *task) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); sub_80B4824(task->data[1]); task->data[0]++; @@ -1328,11 +1328,11 @@ bool8 sub_8086AA0(struct Task *task) bool8 sub_8086AC0(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; @@ -1443,13 +1443,13 @@ void sub_8086CBC(u8 taskId) bool8 sub_8086CF4(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]++; @@ -1541,13 +1541,13 @@ bool8 sub_8086EB0(struct Task *task) bool8 sub_8086ED4(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_8086CBC)); } return FALSE; @@ -1566,10 +1566,10 @@ bool8 FldEff_UseWaterfall(void) void sub_8086F64(u8 taskId) { - while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); + while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])); } -bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject) +bool8 sub_8086FB0(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1577,12 +1577,12 @@ bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject) return FALSE; } -bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) +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]++; @@ -1590,7 +1590,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventO return FALSE; } -bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) +bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1600,20 +1600,20 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObjec return TRUE; } -bool8 sub_8087030(struct Task *task, struct EventObject *eventObject) +bool8 sub_8087030(struct Task *task, struct ObjectEvent *objectEvent) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -bool8 sub_8087058(struct Task *task, struct EventObject *eventObject) +bool8 sub_8087058(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; @@ -1664,7 +1664,7 @@ 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); } @@ -1681,22 +1681,22 @@ void sub_80871B8(u8 priority) void sub_80871D0(u8 taskId) { - while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_808722C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_808722C(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; } -bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087264(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1709,12 +1709,12 @@ bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087298(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); @@ -1723,7 +1723,7 @@ bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Spr return TRUE; } -bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80872E4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -1755,7 +1755,7 @@ bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Spr if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -1766,7 +1766,7 @@ bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80873D8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeScreen(); @@ -1774,7 +1774,7 @@ bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_80873F4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80873F4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1799,25 +1799,25 @@ void mapldr_080851BC(void) void sub_8087470(u8 taskId) { - while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80874CC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80874CC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { CameraObjectReset2(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - eventObject->invisible = 1; + objectEvent->invisible = 1; task->data[0]++; return FALSE; } -bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80874FC(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); @@ -1826,27 +1826,27 @@ bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_8087548(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - eventObject->invisible = 0; + objectEvent->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; } -bool8 sub_808759C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_808759C(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_8087470)); } return FALSE; @@ -1882,27 +1882,27 @@ void sub_8087654(u8 priority) void sub_808766C(u8 taskId) { - while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80876C8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80876C8(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; } -bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80876F8(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); @@ -1910,24 +1910,24 @@ bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Spr } else { task->data[1]++; - EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -bool8 sub_8087774(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087774(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - eventObject->invisible = 1; + objectEvent->invisible = 1; task->data[0]++; } return FALSE; } -bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80877AC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -1941,7 +1941,7 @@ bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Spr static void DoEscapeRopeFieldEffect(u8); void mapldr_080859D4(void); -bool8 sub_80877D4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80877D4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1974,7 +1974,7 @@ void sub_808788C(struct Sprite *sprite) void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(DoEscapeRopeFieldEffect, 0x50); } @@ -1992,7 +1992,7 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task) static void EscapeRopeFieldEffect_Step1(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; u8 clockwiseDirections[5] = { DIR_SOUTH, DIR_WEST, @@ -2007,12 +2007,12 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) 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]); sub_8053678(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; @@ -2021,7 +2021,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(clockwiseDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(clockwiseDirections[objectEvent->facingDirection])); if (task->data[2] < 12) task->data[2]++; @@ -2042,9 +2042,9 @@ void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; CreateTask(sub_8087A74, 0); } @@ -2065,29 +2065,29 @@ void sub_8087AA4(struct Task *task) void sub_8087AC8(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) { - if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent)) { return; } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - eventObject->invisible = 0; + objectEvent->invisible = 0; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087A74)); 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; } static void ExecuteTeleportFieldEffectTask(u8); @@ -2117,7 +2117,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; @@ -2126,14 +2126,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; @@ -2146,12 +2146,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]; @@ -2190,9 +2190,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; CameraObjectReset2(); CreateTask(sub_8087E1C, 0); } @@ -2217,7 +2217,7 @@ void sub_8087E4C(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 = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2230,14 +2230,14 @@ void sub_8087E4C(struct Task *task) void sub_8087ED8(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 ((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 @@ -2255,7 +2255,7 @@ void sub_8087ED8(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) { @@ -2269,16 +2269,16 @@ void sub_8087ED8(struct Task *task) void sub_8087FDC(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) { - 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_8087E1C)); } } @@ -2830,31 +2830,31 @@ void sub_8088954(u8 taskId) void sub_8088984(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]++; } void sub_80889E4(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_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_8088A30(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); @@ -2864,32 +2864,32 @@ void sub_8088A30(struct Task *task) void sub_8088A78(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectClearHeldMovementIfFinished(eventObject); - EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + 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]++; } } void sub_8088AF4(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_8127ED0(eventObject->fieldEffectSpriteId, 1); - UnfreezeEventObjects(); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 1); + UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_8088954)); @@ -2969,24 +2969,24 @@ void sub_8088C70(u8 taskId) void sub_8088CA0(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[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_8088CF8(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -2996,14 +2996,14 @@ void sub_8088CF8(struct Task *task) void sub_8088D3C(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[15] & 0x08) { - sub_8127ED0(eventObject->fieldEffectSpriteId, 2); - sub_8127EFC(eventObject->fieldEffectSpriteId, 0); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 2); + sub_8127EFC(objectEvent->fieldEffectSpriteId, 0); } task->data[1] = sub_8088F60(); task->data[0]++; @@ -3017,15 +3017,15 @@ void sub_8088D94(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); } } void sub_8088DD8(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; PlaySE(SE_W019); @@ -3035,17 +3035,17 @@ void sub_8088DD8(struct Task *task) void sub_8088E2C(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((++task->data[2]) >= 8) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->inanimate = 1; - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + 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; @@ -3054,14 +3054,14 @@ void sub_8088E2C(struct Task *task) void sub_8088EB4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((++task->data[2]) >= 10) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(eventObject); - eventObject->inanimate = 0; - eventObject->hasShadow = 0; - sub_8088FFC(task->data[1], eventObject->spriteId); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(objectEvent); + objectEvent->inanimate = 0; + objectEvent->hasShadow = 0; + sub_8088FFC(task->data[1], objectEvent->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3266,9 +3266,9 @@ void sub_8089270(u8 taskId) void sub_80892A0(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; @@ -3277,27 +3277,27 @@ void sub_80892A0(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_8127ED0(eventObject->fieldEffectSpriteId, 0); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 0); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); CameraObjectReset2(); - EventObjectTurn(eventObject, DIR_WEST); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->invisible = 0; + ObjectEventTurn(objectEvent, DIR_WEST); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->invisible = 0; task->data[1] = sub_8088F60(); sub_8088FC0(task->data[1]); - sub_8088FFC(task->data[1], eventObject->spriteId); + sub_8088FFC(task->data[1], objectEvent->spriteId); } } void sub_8089354(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_8088FFC(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3340,26 +3340,26 @@ void sub_80893C0(struct Task *task) void sub_8089414(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (sub_8088FA4(task->data[1])) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->inanimate = 0; - sub_805C058(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->inanimate = 0; + sub_805C058(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_808948C(struct Task *task) { - if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { task->data[0]++; sub_8089230(task->data[1]); @@ -3379,18 +3379,18 @@ void sub_80894C4(struct Task *task) void fishE(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 = PLAYER_AVATAR_STATE_NORMAL; if (task->data[15] & 0x08) { state = PLAYER_AVATAR_STATE_SURFING; - sub_8127ED0(eventObject->fieldEffectSpriteId, 1); + sub_8127ED0(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); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 641cbad8f..4e4ff7432 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -12,9 +12,9 @@ #include "constants/songs.h" 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 FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step0(struct Sprite *); @@ -22,13 +22,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step2(struct Sprite *); static void sub_812882C(struct Sprite *, u8, u8); static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); -static void sub_8127FD4(struct EventObject *, struct Sprite *); -static void sub_812800C(struct EventObject *, struct Sprite *); -static void sub_81280A0(struct EventObject *, struct Sprite *, struct Sprite *); +static void sub_8127FD4(struct ObjectEvent *, struct Sprite *); +static void sub_812800C(struct ObjectEvent *, struct Sprite *); +static void sub_81280A0(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void sub_8128174(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); -void InitObjectReflectionSprite(struct EventObject *eventObject, struct Sprite *sprite, bool8 stillReflection) +void InitObjectReflectionSprite(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection) { struct Sprite *reflectionSprite; @@ -43,40 +43,40 @@ void InitObjectReflectionSprite(struct EventObject *eventObject, struct Sprite * 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); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->bridgeReflectionPaletteTag != 0x11ff) { if (graphicsInfo->paletteSlot == 0) @@ -97,11 +97,11 @@ 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); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->bridgeReflectionPaletteTag != 0x11ff) { PatchObjectPalette(graphicsInfo->bridgeReflectionPaletteTag, paletteNum); @@ -111,12 +111,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; } @@ -132,7 +132,7 @@ 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; @@ -209,12 +209,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) { @@ -229,27 +229,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); } @@ -292,8 +292,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]; @@ -307,21 +307,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_812882C(sprite, sprite->data[0], metatileBehavior); } } @@ -398,8 +398,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]; @@ -413,18 +413,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_812882C(sprite, sprite->data[0], 0); } } @@ -449,44 +449,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]) @@ -503,7 +503,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); } } @@ -577,14 +577,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]); @@ -593,22 +593,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]; @@ -621,17 +621,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); } } @@ -673,22 +673,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]; @@ -702,26 +702,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); @@ -748,46 +748,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); } } @@ -919,13 +919,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); } @@ -984,18 +984,18 @@ static u8 sub_8127F70(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]; - sub_8127FD4(eventObject, sprite); - sub_812800C(eventObject, sprite); - sub_81280A0(eventObject, linkedSprite, sprite); + objectEvent = &gObjectEvents[sprite->data[2]]; + linkedSprite = &gSprites[objectEvent->spriteId]; + sub_8127FD4(objectEvent, sprite); + sub_812800C(objectEvent, sprite); + sub_81280A0(objectEvent, linkedSprite, sprite); sprite->oam.priority = linkedSprite->oam.priority; } -static void sub_8127FD4(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_8127FD4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { 0, // DIR_NONE @@ -1006,18 +1006,18 @@ static void sub_8127FD4(struct EventObject *eventObject, struct Sprite *sprite) }; if (sub_8127F64(sprite) == 0) - StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[eventObject->movementDirection]); + StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]); } #ifdef NONMATCHING -static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_812800C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 x; s16 y; u8 i; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; if (sprite->pos2.y == 0 && (x != sprite->data[6] || y != sprite->data[7])) { sprite->data[5] = sprite->pos2.y; @@ -1033,7 +1033,7 @@ static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite) } } #else -NAKED static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite) +NAKED static void sub_812800C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r8\n" @@ -1114,7 +1114,7 @@ NAKED static void sub_812800C(struct EventObject *eventObject, struct Sprite *sp } #endif -static void sub_81280A0(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite) +static void sub_81280A0(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite) { u16 unk_8401E5A[] = {3, 7}; u8 v0 = sub_8127F5C(sprite); @@ -1193,26 +1193,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); } @@ -1221,18 +1221,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; @@ -1244,8 +1244,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); } } @@ -1270,7 +1270,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); @@ -1317,7 +1317,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; @@ -1338,17 +1338,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; @@ -1368,30 +1368,30 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite) } } -void sub_812869C(struct EventObject *eventObject) +void sub_812869C(struct ObjectEvent *objectEvent) { - if (eventObject->directionSequenceIndex == 1) + if (objectEvent->directionSequenceIndex == 1) { - gSprites[eventObject->fieldEffectSpriteId].data[0]++; + gSprites[objectEvent->fieldEffectSpriteId].data[0]++; } } -bool8 sub_81286C4(struct EventObject *eventObject) +bool8 sub_81286C4(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; } @@ -1440,7 +1440,7 @@ void UpdateJumpLandingFieldEffect(struct Sprite *sprite) } else { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); } } @@ -1450,7 +1450,7 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite) if (sprite->animEnded) FieldEffectStop(sprite, sprite->data[0]); else - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } #ifdef NONMATCHING @@ -1464,18 +1464,18 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) s16 ly; s16 ylo; s16 yhi; - struct EventObject *eventObject; // r4 - const struct EventObjectGraphicsInfo *graphicsInfo; // destroyed + struct ObjectEvent *objectEvent; // r4 + const struct ObjectEventGraphicsInfo *graphicsInfo; // destroyed struct Sprite *linkedSprite; // r5 SetObjectSubpriorityByZCoord(z, sprite, offset); for (i = 0; i < 16; i ++) { - eventObject = &gEventObjects[i]; - if (eventObject->active) + 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; xlo = sprite->pos1.x - sprite->centerToCornerVecX; lx = linkedSprite->pos1.x; @@ -1514,14 +1514,14 @@ NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) "\tlsls r0, r7, 3\n" "\tadds r0, r7\n" "\tlsls r0, 2\n" - "\tldr r1, _081288DC @ =gEventObjects\n" + "\tldr r1, _081288DC @ =gObjectEvents\n" "\tadds r4, r0, r1\n" "\tldrb r0, [r4]\n" "\tlsls r0, 31\n" "\tcmp r0, 0\n" "\tbeq _081288E4\n" "\tldrb r0, [r4, 0x5]\n" - "\tbl GetEventObjectGraphicsInfo\n" + "\tbl GetObjectEventGraphicsInfo\n" "\tldrb r1, [r4, 0x4]\n" "\tlsls r0, r1, 4\n" "\tadds r0, r1\n" @@ -1588,7 +1588,7 @@ NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset) "\tstrb r0, [r2]\n" "\tb _081288EE\n" "\t.align 2, 0\n" - "_081288DC: .4byte gEventObjects\n" + "_081288DC: .4byte gObjectEvents\n" "_081288E0: .4byte gSprites\n" "_081288E4:\n" "\tadds r0, r7, 0x1\n" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 670d8c54b..d0773cead 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -221,7 +221,7 @@ void sub_8080B9C(u8 taskId) { case 0: sub_8080958(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); task->data[0] = 1; @@ -229,27 +229,27 @@ void sub_8080B9C(u8 taskId) case 1: if (sub_8080E70()) { - u8 eventObjId; + u8 objEventId; sub_8080958(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; @@ -270,24 +270,24 @@ void task_map_chg_seq_0807E20C(u8 taskId) { case 0: sub_8080958(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); task->data[0] = 1; break; case 1: if (sub_8080E70()) { - u8 eventObjId; + u8 objEventId; sub_8080958(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; @@ -303,14 +303,14 @@ 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 (sub_8080E70()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -340,7 +340,7 @@ void task_mpl_807E3C8(u8 taskId) { ScriptContext2_Disable(); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); } } @@ -532,7 +532,7 @@ void task0A_fade_n_map_maybe(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -559,7 +559,7 @@ void sub_808115C(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); @@ -568,21 +568,21 @@ void sub_808115C(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_8080958(0); task->data[0] = 3; } @@ -610,7 +610,7 @@ void sub_80812C8(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index d3b6ba7ed..4657593e6 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -31,8 +31,8 @@ EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0}; // Static declarations -static bool8 sub_8058854(struct EventObject *, u8); -static void npc_clear_strange_bits(struct EventObject *a); +static bool8 sub_8058854(struct ObjectEvent *, u8); +static void npc_clear_strange_bits(struct ObjectEvent *a); static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c); static void PlayerAllowForcedMovementIfMovingSameDirection(void); static bool8 TryDoMetatileBehaviorForcedMovement(void); @@ -65,13 +65,13 @@ static bool8 ShouldJumpLedge(s16 a, s16 b, u8 c); static u8 sub_8058F6C(s16 a, s16 b, u8 c); static void check_acro_bike_metatile(s16 unused1, s16 unused2, u8 c, u8 *d); static void DoPlayerAvatarTransition(void); -static void nullsub_49(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 *eventObj); +static void nullsub_49(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 *objEvent); static bool8 player_is_anim_in_certain_ranges(void); static bool8 sub_80592A4(void); static bool8 PlayerIsAnimActive(void); @@ -79,21 +79,21 @@ static bool8 PlayerCheckIfAnimFinishedOrInactive(void); static void PlayerRun(u8 a); static void PlayerNotOnBikeCollide(u8 a); static void PlayCollisionSoundIfNotFacingWarp(u8 a); -static void sub_8059D60(struct EventObject *a); +static void sub_8059D60(struct ObjectEvent *a); static void StartStrengthAnim(u8 a, u8 b); static void Task_BumpBoulder(u8 taskId); -static bool8 sub_8059E84(struct Task *task, struct EventObject *b, struct EventObject *c); -static bool8 do_boulder_dust(struct Task *task, struct EventObject *b, struct EventObject *c); -static bool8 sub_8059F40(struct Task *task, struct EventObject *b, struct EventObject *c); +static bool8 sub_8059E84(struct Task *task, struct ObjectEvent *b, struct ObjectEvent *c); +static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *b, struct ObjectEvent *c); +static bool8 sub_8059F40(struct Task *task, struct ObjectEvent *b, struct ObjectEvent *c); 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 sub_805A20C(u8 a); static void taskFF_0805D1D4(u8 taskId); static void sub_805A2D0(u8 taskId); @@ -177,7 +177,7 @@ static bool8 (*const gUnknown_0830FBF8[])(u8) = MetatileBehavior_IsHorizontalRail, }; static const u8 gUnknown_0830FC0C[] = {9, 10, 11, 12, 13}; -static void (*const gUnknown_0830FC14[])(struct EventObject *) = +static void (*const gUnknown_0830FC14[])(struct ObjectEvent *) = { PlayerAvatarTransition_Normal, PlayerAvatarTransition_MachBike, @@ -197,43 +197,43 @@ 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 gUnknown_0830FC64[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}, } }; static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of sArrowWarpMetatileBehaviorChecks @@ -243,17 +243,17 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of MetatileBehavior_IsWestArrowWarp, MetatileBehavior_IsEastArrowWarp, }; -static u8 (*const gUnknown_0830FC88[])(struct Task *, struct EventObject *, struct EventObject *) = +static u8 (*const gUnknown_0830FC88[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) = { sub_8059E84, do_boulder_dust, sub_8059F40, }; -static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) = +static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_DoSecretBaseMatJump, }; -static u8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) = +static u8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep1, @@ -265,15 +265,15 @@ movement_type_empty_callback(MovementType_Player); void player_step(u8 direction, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - sub_8059D60(playerEventObj); + sub_8059D60(playerObjEvent); if (gPlayerAvatar.preventStep == FALSE) { Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); - if (!sub_8058854(playerEventObj, direction)) + if (!sub_8058854(playerObjEvent, direction)) { - npc_clear_strange_bits(playerEventObj); + npc_clear_strange_bits(playerObjEvent); DoPlayerAvatarTransition(); if (TryDoMetatileBehaviorForcedMovement() == 0) { @@ -284,15 +284,15 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) } } -static bool8 sub_8058854(struct EventObject *playerEventObj, u8 direction) +static bool8 sub_8058854(struct ObjectEvent *playerObjEvent, u8 direction) { - if (EventObjectIsMovementOverridden(playerEventObj) - && !EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerObjEvent) + && !ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { - u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj); - if (heldMovementActionId > 24 && heldMovementActionId < 29 && direction != DIR_NONE && playerEventObj->movementDirection != direction) + u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerObjEvent); + if (heldMovementActionId > 24 && heldMovementActionId < 29 && direction != DIR_NONE && playerObjEvent->movementDirection != direction) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerObjEvent); return FALSE; } else @@ -303,11 +303,11 @@ static bool8 sub_8058854(struct EventObject *playerEventObj, u8 direction) 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; } @@ -341,7 +341,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++) { @@ -356,11 +356,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; @@ -398,10 +398,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) @@ -451,10 +451,10 @@ static bool8 ForcedMovement_RideCurrentEast(void) static 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); } @@ -492,12 +492,12 @@ static bool8 ForcedMovement_SecretBaseSpinMat(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 @@ -565,7 +565,7 @@ static void sub_8058D0C(u8 direction, u16 heldKeys) return; } 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; @@ -580,15 +580,15 @@ static void sub_8058D0C(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)); } -u8 CheckForEventObjectCollision(struct EventObject *a, s16 x, s16 y, u8 direction, u8 e) +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 x, s16 y, u8 direction, u8 e) { u8 collision; @@ -616,7 +616,7 @@ static bool8 sub_8058EF0(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetEventObjectIdByXYZ(x, y, 3) == 16) + && GetObjectEventIdByXYZ(x, y, 3) == 16) { sub_805A20C(direction); return TRUE; @@ -639,17 +639,17 @@ static u8 sub_8058F6C(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) == 0 + if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == 0 && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) { - StartStrengthAnim(eventObjectId, direction); + StartStrengthAnim(objectEventId, direction); return 1; } } @@ -689,13 +689,13 @@ static void DoPlayerAvatarTransition(void) #ifdef NONMATCHING if (flags & 1) { - gUnknown_0830FC14[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + gUnknown_0830FC14[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } #else if (flags & 1) { - register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_0830FC14; - funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + register void (*const *funcs)(struct ObjectEvent *) asm("r0") = gUnknown_0830FC14; + funcs[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } #endif } @@ -703,58 +703,58 @@ static void DoPlayerAvatarTransition(void) } } -static void nullsub_49(struct EventObject *eventObj) +static void nullsub_49(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_8127ED0(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_8128124(eventObj->spriteId); + objEvent->fieldEffectSpriteId = sub_8128124(objEvent->spriteId); } -static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj) +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent) { gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; } @@ -779,7 +779,7 @@ void sub_8059204(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId; + u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId; if (movementActionId < 4 || (movementActionId >= 16 && movementActionId < 0x15) @@ -801,27 +801,27 @@ static bool8 sub_80592A4(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_8059348(u8 a) { - EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a); + ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a); } void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) @@ -829,7 +829,7 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) if (!PlayerIsAnimActive()) { PlayerSetCopyableMovement(copyableMovement); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId); } } @@ -894,7 +894,7 @@ void sub_80594C0(void) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { if (player_should_look_direction_be_enforced_upon_movement()) - sub_8059348(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection)); + sub_8059348(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection)); } } @@ -968,7 +968,7 @@ void sub_8059630(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)) { @@ -985,35 +985,35 @@ 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 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 unref_sub_8059790(s16 a, s16 b) { - sub_805C058(&gEventObjects[gPlayerAvatar.eventObjectId], a, b); + sub_805C058(&gObjectEvents[gPlayerAvatar.objectEventId], a, b); } u8 TestPlayerAvatarFlags(u8 a) @@ -1038,10 +1038,10 @@ void sub_80597E8(void) void sub_80597F4(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(); @@ -1068,14 +1068,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; @@ -1086,14 +1086,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; @@ -1127,12 +1127,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) == 3 && PlayerGetZCoord() == 3 + MoveCoords(playerObjEvent->facingDirection, &x, &y); + if (GetCollisionAtCoords(playerObjEvent, x, y, playerObjEvent->facingDirection) == 3 && PlayerGetZCoord() == 3 && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y))) return TRUE; else @@ -1185,87 +1185,87 @@ void SetPlayerAvatarExtraStateTransition(u8 a, u8 b) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) { - struct EventObjectTemplate playerEventObjTemplate; - u8 eventObjectId; - struct EventObject *eventObject; - - playerEventObjTemplate.localId = 0xFF; - 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 = 0xFF; + 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_8059B88(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_8059BF4(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); } static void sub_8059C3C(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_8059C94(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_8059D08(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_8059D60(struct EventObject *eventObject) +static void sub_8059D60(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 */ @@ -1282,12 +1282,12 @@ static void StartStrengthAnim(u8 a, u8 b) static void Task_BumpBoulder(u8 taskId) { while (gUnknown_0830FC88[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_8059E84(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_8059E84(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1295,15 +1295,15 @@ static bool8 sub_8059E84(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 (!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; @@ -1315,13 +1315,13 @@ static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject return FALSE; } -static bool8 sub_8059F40(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_8059F40(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)); @@ -1338,18 +1338,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) { @@ -1372,29 +1372,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]++; @@ -1404,7 +1404,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, @@ -1414,19 +1414,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)); @@ -1453,29 +1453,29 @@ static void sub_805A20C(u8 a) static void taskFF_0805D1D4(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_8127ED0(playerEventObj->fieldEffectSpriteId, 2); - EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); + sub_8127ED0(playerObjEvent->fieldEffectSpriteId, 2); + ObjectEventSetHeldMovement(playerObjEvent, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = sub_805A2D0; } static void sub_805A2D0(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); } } @@ -1542,17 +1542,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_8059C3C(playerEventObj->facingDirection); + task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId; + playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(playerObjEvent); + playerObjEvent->enableAnim = 1; + sub_8059C3C(playerObjEvent->facingDirection); task->tStep++; return FALSE; } @@ -1704,12 +1704,12 @@ static bool8 Fishing11(struct Task *task) { if (Menu_UpdateWindowText()) { - 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_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; Menu_EraseScreen(); @@ -1763,12 +1763,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_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; task->tStep++; @@ -1782,7 +1782,7 @@ static bool8 Fishing16(struct Task *task) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); Menu_EraseScreen(); sub_80BE97C(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); @@ -1826,7 +1826,7 @@ static void AlignFishingAnimationFrames(void) if (animType == 10 || animType == 11) playerSprite->pos2.y = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); + sub_8127F28(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } #if DEBUG @@ -1842,8 +1842,8 @@ u8 debug_sub_805F2B0(u8 a) u8 debug_sub_805F2DC(u8 a) { if (a == 0) - PlayerFaceDirection(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection); - else if (gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera && !CanCameraMoveInDirection(a)) + PlayerFaceDirection(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection); + else if (gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera && !CanCameraMoveInDirection(a)) PlayerOnBikeCollide(a); else PlayerGoSpeed4(a); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 8f98d8187..78c425bc5 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -27,8 +27,8 @@ enum STEP_END = 0xFE, }; -const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/19.gbapal"); +const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal"); static const s8 gTruckCamera_HorizontalTable[] = { @@ -349,7 +349,7 @@ void Task_HandlePorthole(u8 taskId) void sub_80C78A0(void) { - u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoObjectEvent(0x8C, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; @@ -366,7 +366,7 @@ void sub_80C78A0(void) void sub_80C791C(void) { sub_80C78A0(); - 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 5e0315e73..491578369 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -365,7 +365,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void) if (myLinkPlayerNumber != i) { rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gLinkPlayers[i].gender); - SpawnSpecialEventObjectParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); + SpawnSpecialObjectEventParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); j++; if (j == 4) { @@ -1134,7 +1134,7 @@ void sub_810E984(u8 taskId) gSpecialVar_Result = 1; gSpecialVar_0x8005 = gUnknown_0203925B; ShakeScreenInElevator(); - EventObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); + ObjectEventTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH); sub_810EEDC(); Menu_EraseScreen(); DestroyTask(taskId); @@ -1595,15 +1595,15 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { - u8 eventObjectId = SpawnSpecialEventObjectParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gEventObjects[eventObjectId].invisible = 1; - CameraObjectSetFollowedObjectId(gEventObjects[eventObjectId].spriteId); + u8 objectEventId = SpawnSpecialObjectEventParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); + gObjectEvents[objectEventId].invisible = 1; + CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId); } void RemoveCameraDummy(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1871,9 +1871,9 @@ u16 ScriptGetPartyMonSpecies(void) return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL); } -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - TryInitLocalEventObject(6); + TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c index a319c959b..b46ba5f54 100644 --- a/src/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c @@ -16,26 +16,26 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(playerEventObj) - || EventObjectClearHeldMovementIfFinished(playerEventObj)) + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(playerObjEvent) + || ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { sub_8059D08(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]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(playerObjEvent)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) { - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObjEvent, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); } else { diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 8d76ecccb..23448cb93 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -92,7 +92,7 @@ void Debug_SetUpFieldMove_Cut(void) u8 i, j; u8 metatileBehavior; - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE) { gLastFieldPokeMenuOpened = 0; FieldCallback_CutTree(); @@ -131,7 +131,7 @@ bool8 SetUpFieldMove_Cut(void) u8 i, j; u8 tileBehavior; - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_CUTTABLE_TREE) == TRUE) { // Standing in front of cuttable tree. gFieldCallback = FieldCallback_PrepareFadeInFromMenu; @@ -377,7 +377,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) for (i = 1; i < 8; i++) DestroySprite(&gSprites[eCutGrassSpriteArray[i]]); FieldEffectStop(&gSprites[eCutGrassSpriteArray[0]], FLDEFF_CUT_GRASS); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c index d65a23e95..62e02df12 100644 --- a/src/fldeff_decoration.c +++ b/src/fldeff_decoration.c @@ -236,8 +236,8 @@ 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_8060470(&x, &y, 8, 4); diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index e10e18cc1..b7e19fe51 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -31,7 +31,7 @@ void debug_sub_8130318(void) gSpecialVar_Result = 0; sub_811AA38(); } - else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + else if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) == TRUE) { gLastFieldPokeMenuOpened = 0; gSpecialVar_Result = 0; @@ -54,7 +54,7 @@ bool8 SetUpFieldMove_Strength(void) } else { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) != TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) != TRUE) return 0; gSpecialVar_Result = gLastFieldPokeMenuOpened; gFieldCallback = FieldCallback_PrepareFadeInFromMenu; diff --git a/src/item_menu.c b/src/item_menu.c index b69866453..f782bafef 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -53,7 +53,7 @@ extern void Shop_FadeReturnToMartMenu(void); extern void sub_80546B8(u8); extern void sub_804E990(u8); extern void sub_802E424(u8); -extern void ScriptUnfreezeEventObjects(void); +extern void ScriptUnfreezeObjectEvents(void); struct UnknownStruct2 { @@ -2518,7 +2518,7 @@ void CleanUpOverworldMessage(u8 taskId) { Menu_EraseWindowRect(0, 13, 29, 19); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } @@ -3141,7 +3141,7 @@ bool32 UseRegisteredKeyItem(void) u8 taskId; ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_80594C0(); sub_80597F4(); gSpecialVar_ItemId = gSaveBlock1.registeredItem; diff --git a/src/item_use.c b/src/item_use.c index 9c8c2da57..17a17327d 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -213,7 +213,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) if (ItemId_GetSecondaryId(gSpecialVar_ItemId) == 1) GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -321,7 +321,7 @@ void RunItemfinderResults(u8 taskId) void ExitItemfinder(u8 taskId) { Menu_EraseWindowRect(0, 14, 29, 19); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -548,15 +548,15 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY) void SetPlayerDirectionTowardsItem(u8 direction) { - EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); - UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); + ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); + UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]); PlayerTurnInPlace(direction); } void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gOtherText_ItemfinderResponding, ExitItemfinder, 0); } @@ -564,7 +564,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId) { s16 *data = gTasks[taskId].data; - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE || data[2] == FALSE) { SetPlayerDirectionTowardsItem(gItemFinderDirections[data[5]]); diff --git a/src/load_save.c b/src/load_save.c index a1ca7ce76..94a39857f 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -81,32 +81,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1.playerParty[i]; } -static void SaveEventObjects(void) +static void SaveObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gSaveBlock1.eventObjects[i] = gEventObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gSaveBlock1.objectEvents[i] = gObjectEvents[i]; } -static void LoadEventObjects(void) +static void LoadObjectEvents(void) { int i; - for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gEventObjects[i] = gSaveBlock1.eventObjects[i]; + for (i = 0; i < OBJECT_EVENTS_COUNT; i++) + gObjectEvents[i] = gSaveBlock1.objectEvents[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveEventObjects(); + SaveObjectEvents(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadEventObjects(); + LoadObjectEvents(); } void LoadPlayerBag(void) diff --git a/src/mauville_man.c b/src/mauville_man.c index 7eab67823..64c41f3bf 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -806,7 +806,7 @@ static void Task_BardSong(u8 taskId) void sub_80F83D0(void) { - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD + GetCurrentMauvilleOldMan()); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD + GetCurrentMauvilleOldMan()); } struct Story diff --git a/src/menu.c b/src/menu.c index d50fb4f22..869e5b3b3 100644 --- a/src/menu.c +++ b/src/menu.c @@ -54,7 +54,7 @@ void CloseMenu(void) { PlaySE(SE_SELECT); Menu_EraseScreen(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); Menu_DestroyCursor(); } diff --git a/src/naming_screen.c b/src/naming_screen.c index 1f904be1b..bfd9cd54f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1302,7 +1302,7 @@ static void sub_80B6E68(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, namingScreenDataPtr->speciesOrPlayerGender); - spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); + spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index 934b09dbc..67bf498c5 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -97,7 +97,7 @@ EWRAM_DATA struct WarpData gFixedHoleWarp = {0}; EWRAM_DATA 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}; static u8 gUnknown_03000580[4]; static u16 (*gUnknown_03000584)(u32); @@ -113,8 +113,8 @@ static void InitOverworldGraphicsRegisters(void); static void ChooseAmbientCrySpecies(void); static void SetFieldVBlankCallback(void); static void VBlankCB_Field(void); -static void SpawnLinkPlayerEventObject(u8, s16, s16, u8); -static void InitLinkPlayerEventObjectPos(struct EventObject *, s16, s16); +static void SpawnLinkPlayerObjectEvent(u8, s16, s16, u8); +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *, s16, s16); static u8 GetLinkPlayerIdAt(s16, s16); static u8 npc_something3(u8, u8); static u8 LinkPlayerDetectCollision(u8, u8, s16, s16); @@ -166,22 +166,22 @@ static const struct ScanlineEffectParams sFlashEffectParams = 0, }; -static u8 sub_8055C68(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055C88(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055C8C(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_8055C68(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055C88(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055C8C(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gUnknown_082166A0[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gUnknown_082166A0[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { sub_8055C68, sub_8055C88, sub_8055C8C, }; -static u8 sub_8055CAC(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055CB0(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 sub_8055D18(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 sub_8055CAC(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055CB0(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 sub_8055D18(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gUnknown_082166AC[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gUnknown_082166AC[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { sub_8055CAC, sub_8055CB0, @@ -196,10 +196,10 @@ static u8 (*const gUnknown_082166AC[])(struct LinkPlayerEventObject *, struct Ev sub_8055D18, }; -static void sub_8055D30(struct LinkPlayerEventObject *, struct EventObject *); -static void sub_8055D38(struct LinkPlayerEventObject *, struct EventObject *); +static void sub_8055D30(struct LinkPlayerObjectEvent *, struct ObjectEvent *); +static void sub_8055D38(struct LinkPlayerObjectEvent *, struct ObjectEvent *); -static void (*const gUnknown_082166D8[])(struct LinkPlayerEventObject *, struct EventObject *) = +static void (*const gUnknown_082166D8[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) = { sub_8055D30, sub_8055D38, @@ -299,51 +299,51 @@ void SetGameStat(u8 stat, u32 value) gSaveBlock1.gameStats[stat] = value; } -void LoadEventObjTemplatesFromHeader(void) +void LoadObjEventTemplatesFromHeader(void) { - // Clear event object templates - CpuFill32(0, gSaveBlock1.eventObjectTemplates, sizeof(gSaveBlock1.eventObjectTemplates)); + // Clear object event templates + CpuFill32(0, gSaveBlock1.objectEventTemplates, sizeof(gSaveBlock1.objectEventTemplates)); // Copy map header events to save block - CpuCopy32(gMapHeader.events->eventObjects, - gSaveBlock1.eventObjectTemplates, - gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); + CpuCopy32(gMapHeader.events->objectEvents, + gSaveBlock1.objectEventTemplates, + gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate)); } -static void LoadSaveblockEventObjScripts(void) +static void LoadSaveblockObjEventScripts(void) { - struct EventObjectTemplate *eventObjectTemplates = gSaveBlock1.eventObjectTemplates; + struct ObjectEventTemplate *objectEventTemplates = gSaveBlock1.objectEventTemplates; s32 i; for (i = 0; i < 64; i++) - eventObjectTemplates[i].script = gMapHeader.events->eventObjects[i].script; + objectEventTemplates[i].script = gMapHeader.events->objectEvents[i].script; } -void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) +void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; for (i = 0; i < 64; i++) { - struct EventObjectTemplate *eventObjectTemplate = &gSaveBlock1.eventObjectTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &gSaveBlock1.objectEventTemplates[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; for (i = 0; i < 64; i++) { - struct EventObjectTemplate *eventObjectTemplate = &gSaveBlock1.eventObjectTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &gSaveBlock1.objectEventTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; return; } } @@ -610,7 +610,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) sub_8053F0C(); ApplyCurrentWarp(); LoadCurrentMapData(); - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); ClearTempFieldEventData(); ResetCyclingRoadChallengeData(); RestartWildEncounterImmunitySteps(); @@ -643,7 +643,7 @@ void sub_8053994(u32 a1) bool8 v3; LoadCurrentMapData(); - LoadEventObjTemplatesFromHeader(); + LoadObjEventTemplatesFromHeader(); v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType); v3 = Overworld_MapTypeIsIndoors(gMapHeader.mapType); ClearTempFieldEventData(); @@ -1472,8 +1472,8 @@ void CB2_ContinueSavedGame(void) #endif ResetSafariZoneFlag_(); LoadSaveblockMapHeader(); - LoadSaveblockEventObjScripts(); - UnfreezeEventObjects(); + LoadSaveblockObjEventScripts(); + UnfreezeObjectEvents(); DoTimeBasedEvents(); sub_805308C(); sub_8055FC0(); @@ -1822,7 +1822,7 @@ void sub_8054D4C(u32 a1) ScanlineEffect_Clear(); ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); - InitEventObjectPalettes(0); + InitObjectEventPalettes(0); FieldEffectActiveListClear(); InitFieldMessageBox(); StartWeather(); @@ -1836,8 +1836,8 @@ void sub_8054D90(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); - TrySpawnEventObjects(0, 0); + ResetObjectEvents(); + TrySpawnObjectEvents(0, 0); mapheader_run_first_tag4_script_list_match(); } @@ -1847,13 +1847,13 @@ void mli4_mapscripts_and_other(void) struct InitialPlayerAvatarState *initialPlayerAvatarState; gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); + ResetObjectEvents(); sav1_camera_get_focus_coords(&x, &y); initialPlayerAvatarState = GetInitialPlayerAvatarState(); InitPlayerAvatar(x, y, initialPlayerAvatarState->direction, gSaveBlock2.playerGender); SetPlayerAvatarTransitionFlags(initialPlayerAvatarState->transitionFlags); ResetInitialPlayerAvatarState(); - TrySpawnEventObjects(0, 0); + TrySpawnObjectEvents(0, 0); ResetBerryTreeSparkleFlags(); mapheader_run_first_tag4_script_list_match(); } @@ -1866,7 +1866,7 @@ void sub_8054E20(void) void sub_8054E34(void) { - gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; + gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -1897,7 +1897,7 @@ void sub_8054EC8(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); } @@ -2285,7 +2285,7 @@ void sub_80555B0(int linkPlayerId, int a2, struct UnkStruct_8054FF8 *a3) a3->a = linkPlayerId; a3->b = (linkPlayerId == a2) ? 1 : 0; - a3->c = gLinkPlayerEventObjects[linkPlayerId].mode; + a3->c = gLinkPlayerObjectEvents[linkPlayerId].mode; a3->d = sub_8055B30(linkPlayerId); sub_8055B08(linkPlayerId, &x, &y); a3->sub.x = x; @@ -2487,109 +2487,109 @@ bool32 sub_8055940(void) return TRUE; } -void ClearLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) +void ClearLinkPlayerObjectEvent(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 ClearEventObject(struct EventObject *eventObj) +static void ClearObjectEvent(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]; - ClearLinkPlayerEventObject(linkPlayerEventObj); - ClearEventObject(eventObj); + ClearLinkPlayerObjectEvent(linkPlayerObjEvent); + ClearObjectEvent(objEvent); - linkPlayerEventObj->active = 1; - linkPlayerEventObj->linkPlayerId = linkPlayerId; - linkPlayerEventObj->eventObjId = eventObjId; - linkPlayerEventObj->mode = 0; + linkPlayerObjEvent->active = 1; + linkPlayerObjEvent->linkPlayerId = linkPlayerId; + linkPlayerObjEvent->objEventId = objEventId; + linkPlayerObjEvent->mode = 0; - 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; - sub_80603CC(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; + sub_80603CC(x, y, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + objEvent->initialCoords.x += 8; + ObjectEventUpdateZCoord(objEvent); } void unref_sub_8055A6C(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; } } void unref_sub_8055A9C(u8 linkPlayerId) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (eventObj->spriteId != 64 ) - 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 != 64 ) + DestroySprite(&gSprites[objEvent->spriteId]); + linkPlayerObjEvent->active = 0; + objEvent->active = 0; } u8 sub_8055AE8(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; } void sub_8055B08(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; } u8 sub_8055B30(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; } u8 sub_8055B50(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; } s32 unref_sub_8055B74(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) @@ -2597,11 +2597,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) u8 i; for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active - && (gLinkPlayerEventObjects[i].mode == 0 || gLinkPlayerEventObjects[i].mode == 2)) + if (gLinkPlayerObjectEvents[i].active + && (gLinkPlayerObjectEvents[i].mode == 0 || gLinkPlayerObjectEvents[i].mode == 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; } } @@ -2610,79 +2610,79 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) void sub_8055BFC(u8 linkPlayerId, u8 a2) { - 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 (a2 > 10) - eventObj->triggerGroundEffectsOnMove = 1; + objEvent->triggerGroundEffectsOnMove = 1; else - gUnknown_082166D8[gUnknown_082166A0[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj); + gUnknown_082166D8[gUnknown_082166A0[linkPlayerObjEvent->mode](linkPlayerObjEvent, objEvent, a2)](linkPlayerObjEvent, objEvent); } } -static u8 sub_8055C68(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055C68(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gUnknown_082166AC[a3](linkPlayerEventObj, eventObj, a3); + return gUnknown_082166AC[a3](linkPlayerObjEvent, objEvent, a3); } -static u8 sub_8055C88(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055C88(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return 1; } -static u8 sub_8055C8C(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055C8C(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - return gUnknown_082166AC[a3](linkPlayerEventObj, eventObj, a3); + return gUnknown_082166AC[a3](linkPlayerObjEvent, objEvent, a3); } -static u8 sub_8055CAC(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055CAC(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { return 0; } -static u8 sub_8055CB0(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055CB0(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { s16 x, y; - eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); - EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); + objEvent->range.as_byte = npc_something3(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 0; } else { - eventObj->directionSequenceIndex = 16; - ShiftEventObjectCoords(eventObj, x, y); - EventObjectUpdateZCoord(eventObj); + objEvent->directionSequenceIndex = 16; + ShiftObjectEventCoords(objEvent, x, y); + ObjectEventUpdateZCoord(objEvent); return 1; } } -static u8 sub_8055D18(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 sub_8055D18(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent, u8 a3) { - eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte); + objEvent->range.as_byte = npc_something3(a3, objEvent->range.as_byte); return 0; } -static void sub_8055D30(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void sub_8055D30(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - linkPlayerEventObj->mode = 0; + linkPlayerObjEvent->mode = 0; } -static void sub_8055D38(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void sub_8055D38(struct LinkPlayerObjectEvent *linkPlayerObjEvent, struct ObjectEvent *objEvent) { - eventObj->directionSequenceIndex--; - linkPlayerEventObj->mode = 1; - MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - if (!eventObj->directionSequenceIndex) + objEvent->directionSequenceIndex--; + linkPlayerObjEvent->mode = 1; + MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + if (!objEvent->directionSequenceIndex) { - ShiftStillEventObjectCoords(eventObj); - linkPlayerEventObj->mode = 2; + ShiftStillObjectEventCoords(objEvent); + linkPlayerObjEvent->mode = 2; } } @@ -2706,15 +2706,15 @@ static u8 npc_something3(u8 a1, u8 a2) return a2; } -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; } @@ -2725,36 +2725,36 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId) { - 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) { - u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive); - eventObj->spriteId = AddPseudoEventObject(val, SpriteCB_LinkPlayer, 0, 0, 0); - sprite = &gSprites[eventObj->spriteId]; + u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, objEvent->singleMovementActive); + objEvent->spriteId = AddPseudoObjectEvent(val, SpriteCB_LinkPlayer, 0, 0, 0); + 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); - if (!linkPlayerEventObj->mode) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); + 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 (!linkPlayerObjEvent->mode) + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); - UpdateEventObjectSpriteVisibility(sprite, 0); - if (eventObj->triggerGroundEffectsOnMove) + StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte)); + UpdateObjectEventSpriteVisibility(sprite, 0); + if (objEvent->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/rom6.c b/src/rom6.c index f28216529..c81e7d1bc 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -36,18 +36,18 @@ static void sub_810B634(void); 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; } } @@ -60,13 +60,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) { @@ -76,7 +76,7 @@ static void task08_080C9820(u8 taskId) else { sub_8059BF4(); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); gTasks[taskId].func = sub_810B3DC; } } @@ -84,7 +84,7 @@ static void task08_080C9820(u8 taskId) static void sub_810B3DC(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_810B428; @@ -104,7 +104,7 @@ static void sub_810B428(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_810B4CC; @@ -123,7 +123,7 @@ static void sub_810B4CC(u8 taskId) #if DEBUG void debug_sub_8120968(void) { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE) { gLastFieldPokeMenuOpened = 0; sub_810B53C(); @@ -137,7 +137,7 @@ void debug_sub_8120968(void) bool8 SetUpFieldMove_RockSmash(void) { - if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_BREAKABLE_ROCK) == TRUE) { gFieldCallback = FieldCallback_PrepareFadeInFromMenu; gPostMenuFieldCallback = sub_810B53C; diff --git a/src/scrcmd.c b/src/scrcmd.c index 4dd5d08a2..7ba527890 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1013,7 +1013,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); return FALSE; } @@ -1023,7 +1023,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; } @@ -1061,7 +1061,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; } @@ -1069,7 +1069,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - TryOverrideTemplateCoordsForEventObject(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); return FALSE; } @@ -1116,9 +1116,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; @@ -1129,7 +1129,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction); + ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction); return FALSE; } @@ -1138,7 +1138,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; } @@ -1157,10 +1157,10 @@ bool8 ScrCmd_createvobject(struct ScriptContext *ctx) bool8 ScrCmd_turnvobject(struct ScriptContext *ctx) { - u8 eventObjectId = ScriptReadByte(ctx); + u8 objectEventId = ScriptReadByte(ctx); u8 direction = ScriptReadByte(ctx); - TurnEventObject(eventObjectId, direction); + TurnObjectEvent(objectEventId, direction); return FALSE; } @@ -1172,7 +1172,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_8064CFC); return TRUE; } @@ -1186,14 +1186,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - LockSelectedEventObject(); + LockSelectedObjectEvent(); SetupNativeScript(ctx, sub_8064DB4); } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_8064CFC); } return TRUE; @@ -1205,10 +1205,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 objectId; HideFieldMessageBox(); - objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); + objectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); return FALSE; } @@ -1217,12 +1217,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 objectId; HideFieldMessageBox(); - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + objectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectId]); sub_80A2178(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); return FALSE; } diff --git a/src/script_movement.c b/src/script_movement.c index fec3da88e..72e23e938 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -18,25 +18,25 @@ static void sub_80A2490(u8, u8, u8, const u8 *); 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(Task_80A244C)) sub_80A2198(50); - return sub_80A21F4(sub_80A21E0(), eventObjId, movementScript); + return sub_80A21F4(sub_80A21E0(), objEventId, movementScript); } bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank) { - u8 eventObjId; + u8 objEventId; u8 r4; u8 r1; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapBank, &objEventId)) return TRUE; r4 = sub_80A21E0(); - r1 = sub_80A2260(r4, eventObjId); + r1 = sub_80A2260(r4, objEventId); if (r1 == 16) return TRUE; return sub_80A2370(r4, r1); @@ -69,11 +69,11 @@ static u8 sub_80A21E0(void) return FindTaskIdByFunc(Task_80A244C); } -static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript) +static bool8 sub_80A21F4(u8 taskId, u8 objEventId, const u8 *movementScript) { u8 r4; - r4 = sub_80A2260(taskId, eventObjId); + r4 = sub_80A2260(taskId, objEventId); if (r4 != 16) { if (sub_80A2370(taskId, r4) == 0) @@ -82,7 +82,7 @@ static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript) } else { - sub_80A23C8(taskId, r4, eventObjId, movementScript); + sub_80A23C8(taskId, r4, objEventId, movementScript); return FALSE; } } @@ -93,7 +93,7 @@ static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript) } else { - sub_80A23C8(taskId, r4, eventObjId, movementScript); + sub_80A23C8(taskId, r4, objEventId, movementScript); return FALSE; } } @@ -169,23 +169,23 @@ static const u8 *sub_80A23B8(u8 a) return gUnknown_020384F8[a]; } -static void sub_80A23C8(u8 taskId, u8 b, u8 eventObjId, const u8 *movementScript) +static void sub_80A23C8(u8 taskId, u8 b, u8 objEventId, const u8 *movementScript) { sub_80A2318(taskId, b); npc_obj_offscreen_culling_and_flag_update(b, movementScript); - sub_80A22D0(taskId, b, eventObjId); + sub_80A22D0(taskId, b, objEventId); } static void UnfreezeObjects(u8 taskId) { - u8 *pEventObjId; + u8 *pObjEventId; u8 i; - pEventObjId = (u8 *)&gTasks[taskId].data[1]; - for (i = 0; i < 16; i++, pEventObjId++) + pObjEventId = (u8 *)&gTasks[taskId].data[1]; + for (i = 0; i < 16; i++, pObjEventId++) { - if (*pEventObjId != 0xFF) - UnfreezeEventObject(&gEventObjects[*pEventObjId]); + if (*pObjEventId != 0xFF) + UnfreezeObjectEvent(&gObjectEvents[*pObjEventId]); } } @@ -202,23 +202,23 @@ static void Task_80A244C(u8 taskId) } } -static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d) +static void sub_80A2490(u8 taskId, u8 b, u8 objEventId, const u8 *d) { u8 var; - if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) - && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId]) + && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) return; var = *d; if (var == 0xFE) { sub_80A2348(taskId, b); - FreezeEventObject(&gEventObjects[eventObjId]); + FreezeObjectEvent(&gObjectEvents[objEventId]); } else { - if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], var)) + if (!ObjectEventSetHeldMovement(&gObjectEvents[objEventId], var)) { d++; npc_obj_offscreen_culling_and_flag_update(b, d); diff --git a/src/secret_base.c b/src/secret_base.c index 0892016d9..795696a13 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -387,7 +387,7 @@ bool8 sub_80BBB24(void) void sub_80BBB50(u8 taskid) { - EventObjectTurn(&(gEventObjects[gPlayerAvatar.eventObjectId]), 2); + ObjectEventTurn(&(gObjectEvents[gPlayerAvatar.objectEventId]), 2); if (IsWeatherNotFadingIn() == 1) { EnableBothScriptContexts(); @@ -500,25 +500,25 @@ void sub_80BBDD0(void) permission = gDecorations[roomdecor[decidx]].permission; if (permission == DECORPERM_SOLID_MAT) { - for (objid = 0; objid < gMapHeader.events->eventObjectCount; objid++) + for (objid = 0; objid < gMapHeader.events->objectEventCount; objid++) { - if (gMapHeader.events->eventObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE) + if (gMapHeader.events->objectEvents[objid].flagId == gSpecialVar_0x8004 + 0xAE) break; } - if (objid != gMapHeader.events->eventObjectCount) + if (objid != gMapHeader.events->objectEventCount) { gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4; gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF; metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->objectEvents[objid].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->eventObjects[objid].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[objid].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); show_sprite(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); sub_805C0F8(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideTemplateCoordsForEventObject(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); gSpecialVar_0x8004 ++; } } diff --git a/src/shop.c b/src/shop.c index e2b796a75..3e399f0da 100644 --- a/src/shop.c +++ b/src/shop.c @@ -447,25 +447,25 @@ static void Shop_LoadViewportObjects(void) GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY); playerHeight = PlayerGetZCoord(); for (y = 0; y < 16; y++) - gMartViewportObjects[y][EVENT_OBJ_ID] = 16; + gMartViewportObjects[y][OBJ_EVENT_ID] = 16; for (y = 0; y < 5; y++) { for (x = 0; x < 7; x++) { - u8 eventObjId = GetEventObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight); + u8 objEventId = GetObjectEventIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight); - if (eventObjId != 16) + if (objEventId != 16) { - gMartViewportObjects[r8][EVENT_OBJ_ID] = eventObjId; + gMartViewportObjects[r8][OBJ_EVENT_ID] = objEventId; gMartViewportObjects[r8][X_COORD] = x; gMartViewportObjects[r8][Y_COORD] = y; - if (gEventObjects[eventObjId].facingDirection == DIR_SOUTH) + if (gObjectEvents[objEventId].facingDirection == DIR_SOUTH) gMartViewportObjects[r8][ANIM_NUM] = 0; - if (gEventObjects[eventObjId].facingDirection == DIR_NORTH) + if (gObjectEvents[objEventId].facingDirection == DIR_NORTH) gMartViewportObjects[r8][ANIM_NUM] = 1; - if (gEventObjects[eventObjId].facingDirection == DIR_WEST) + if (gObjectEvents[objEventId].facingDirection == DIR_WEST) gMartViewportObjects[r8][ANIM_NUM] = 2; - if (gEventObjects[eventObjId].facingDirection == DIR_EAST) + if (gObjectEvents[objEventId].facingDirection == DIR_EAST) gMartViewportObjects[r8][ANIM_NUM] = 3; r8++; } @@ -479,11 +479,11 @@ static void Shop_AnimViewportObjects(void) for (i = 0; i < 16; i++) // max objects? { - if (gMartViewportObjects[i][EVENT_OBJ_ID] == 16) + if (gMartViewportObjects[i][OBJ_EVENT_ID] == 16) continue; - StartSpriteAnim(&gSprites[AddPseudoEventObject( - gEventObjects[gMartViewportObjects[i][EVENT_OBJ_ID]].graphicsId, + StartSpriteAnim(&gSprites[AddPseudoObjectEvent( + gObjectEvents[gMartViewportObjects[i][OBJ_EVENT_ID]].graphicsId, SpriteCallbackDummy, (u16)gMartViewportObjects[i][X_COORD] * 16 + 8, (u16)gMartViewportObjects[i][Y_COORD] * 16 + 32, diff --git a/src/start_menu.c b/src/start_menu.c index 2024ba89a..77f57966c 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -405,7 +405,7 @@ void sub_8071310(void) { if (!is_c1_link_related_active()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_80594C0(); sub_80597F4(); } @@ -588,7 +588,7 @@ static u8 SaveCallback2(void) case SAVE_SUCCESS: case SAVE_ERROR: Menu_EraseScreen(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); return TRUE; } diff --git a/src/trainer_card.c b/src/trainer_card.c index 5e07fdcc8..b6eb28005 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -49,7 +49,7 @@ struct Struct2000000 /*0x9C*/ u8 language; // 0x9C }; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[]; EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0}; @@ -225,7 +225,7 @@ void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2) #endif TrainerCard_InitScreenForLinkPlayer(playerIndex, arg2); SetMainCallback2(sub_8093174); - ewram0_2.language = gLinkPlayers[gLinkPlayerEventObjects[playerIndex].linkPlayerId].language; + ewram0_2.language = gLinkPlayers[gLinkPlayerObjectEvents[playerIndex].linkPlayerId].language; } #if DEBUG diff --git a/src/trainer_see.c b/src/trainer_see.c index edb178c4e..109bc612c 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -14,21 +14,21 @@ static bool8 CheckTrainer(u8); static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3); static void objc_exclamation_mark_probably(struct Sprite *sprite); -static bool8 TrainerCanApproachPlayer(struct EventObject *); -static void sub_80842C8(struct EventObject *, u8); -static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); +static bool8 TrainerCanApproachPlayer(struct ObjectEvent *); +static void sub_80842C8(struct ObjectEvent *, u8); +static bool8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction); static void RunTrainerSeeFuncList(u8 taskId); const u8 gSpriteImage_839B308[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/0.4bpp"); const u8 gSpriteImage_839B388[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/1.4bpp"); const u8 gSpriteImage_839B408[] = INCBIN_U8("graphics/unknown_sprites/839B408.4bpp"); -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 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 u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *, s16, s16, s16) = +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *, s16, s16, s16) = { GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceNorth, @@ -38,21 +38,21 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *, s16 bool8 CheckTrainers(void) { - u8 eventObjId; + u8 objEventId; - for (eventObjId = 0; eventObjId < 16; eventObjId++) + for (objEventId = 0; objEventId < 16; objEventId++) { - if (gEventObjects[eventObjId].active - && (gEventObjects[eventObjId].trainerType == 1 || gEventObjects[eventObjId].trainerType == 3) - && CheckTrainer(eventObjId)) + if (gObjectEvents[objEventId].active + && (gObjectEvents[objEventId].trainerType == 1 || gObjectEvents[objEventId].trainerType == 3) + && CheckTrainer(objEventId)) return TRUE; } return FALSE; } -static bool8 CheckTrainer(u8 eventObjId) +static bool8 CheckTrainer(u8 objEventId) { - const u8 *scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjId); + const u8 *scriptPtr = GetObjectEventScriptPointerByObjectEventId(objEventId); if (GetTrainerFlagFromScriptPointer(scriptPtr)) { @@ -60,12 +60,12 @@ static bool8 CheckTrainer(u8 eventObjId) } else { - struct EventObject *trainerObj = &gEventObjects[eventObjId]; + struct ObjectEvent *trainerObj = &gObjectEvents[objEventId]; bool8 canApproach = TrainerCanApproachPlayer(trainerObj); if (canApproach) { - TrainerWantsBattle(eventObjId, scriptPtr); + TrainerWantsBattle(objEventId, scriptPtr); sub_80842C8(trainerObj, (canApproach - 1)); return TRUE; } @@ -76,7 +76,7 @@ static bool8 CheckTrainer(u8 eventObjId) } } -static bool8 TrainerCanApproachPlayer(struct EventObject *trainerObj) +static bool8 TrainerCanApproachPlayer(struct ObjectEvent *trainerObj) { s16 x, y; u8 i; @@ -101,7 +101,7 @@ static bool8 TrainerCanApproachPlayer(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 @@ -112,7 +112,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 @@ -123,7 +123,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 @@ -134,7 +134,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 @@ -150,7 +150,7 @@ static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 ran #define COLLISION_MASK 1 #endif -static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) +static bool8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction) { s16 x, y; u8 unk19_temp; @@ -177,7 +177,7 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 trainerObj->range.as_nybbles.x = 0; trainerObj->range.as_nybbles.y = 0; - collision = GetCollisionAtCoords((struct EventObject *)trainerObj, x, y, direction); + collision = GetCollisionAtCoords((struct ObjectEvent *)trainerObj, x, y, direction); trainerObj->range.as_nybbles.x = unk19_temp; trainerObj->range.as_nybbles.y = unk19b_temp; @@ -190,7 +190,7 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 #define tTrainerObjHi data[1] #define tTrainerObjLo data[2] -static void sub_80842C8(struct EventObject *trainerObj, u8 b) +static void sub_80842C8(struct ObjectEvent *trainerObj, u8 b) { u8 taskId = CreateTask(RunTrainerSeeFuncList, 0x50); struct Task *task = &gTasks[taskId]; @@ -210,20 +210,20 @@ static void sub_80842FC(TaskFunc followupFunc) taskFunc(taskId); } -static bool8 sub_8084394(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084398(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084478(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084534(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084578(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80845AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_8084394(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084398(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80843DC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_808441C(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084478(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084534(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084578(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80845AC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80845C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80845FC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_8084654(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 sub_80846C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); -static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { sub_8084394, sub_8084398, @@ -242,7 +242,7 @@ static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct static void RunTrainerSeeFuncList(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *trainerObj = (struct EventObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo)); + struct ObjectEvent *trainerObj = (struct ObjectEvent *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo)); if (!trainerObj->active) { @@ -255,24 +255,24 @@ static void RunTrainerSeeFuncList(u8 taskId) } } -static bool8 sub_8084394(u8 taskId, struct Task *task, struct EventObject *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments. +static bool8 sub_8084394(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments. { return FALSE; } -static bool8 sub_8084398(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084398(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->data[0]++; return TRUE; } -static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80843DC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -289,88 +289,88 @@ static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *train } } -static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_808441C(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!(ObjectEventIsMovementOverridden(trainerObj)) || ObjectEventClearHeldMovementIfFinished(trainerObj)) { if (task->data[3]) { - EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); + ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); task->data[3]--; } else { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->data[0]++; } } return FALSE; } -static bool8 sub_8084478(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084478(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)); - OverrideMovementTypeForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - OverrideTemplateCoordsForEventObject(trainerObj); + OverrideMovementTypeForObjectEvent(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_80597E8(); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->data[0]++; return FALSE; } -static bool8 sub_8084534(u8 taskId, struct Task *task, struct EventObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call. +static bool8 sub_8084534(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call. { - 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 sub_8084578(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084578(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->data[0]++; } return FALSE; } -static bool8 sub_80845AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80845AC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventClearHeldMovementIfFinished(trainerObj)) task->data[0] = 3; return FALSE; } -static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80845C8(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->data[0]++; } return FALSE; } -static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80845FC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectCheckHeldMovementStatus(trainerObj)) + if (ObjectEventCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -382,7 +382,7 @@ static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_8084654(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { struct Sprite *sprite; @@ -393,14 +393,14 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *train sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - EventObjectClearHeldMovementIfFinished(trainerObj); - EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); + ObjectEventClearHeldMovementIfFinished(trainerObj); + ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); task->data[0]++; } return FALSE; } -static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80846C8(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->data[0] = 3; @@ -408,7 +408,7 @@ static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct EventObject *) = +static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct ObjectEvent *) = { sub_80845C8, sub_80845FC, @@ -419,29 +419,29 @@ static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct EventObje void sub_80846E4(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]++; } - gTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); + gTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); - OverrideMovementTypeForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); + SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); + OverrideMovementTypeForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); DestroyTask(taskId); } else { - eventObj->heldMovementFinished = 0; + objEvent->heldMovementFinished = 0; } } -void sub_8084794(struct EventObject *var) +void sub_8084794(struct ObjectEvent *var) { StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], (u32)var); } @@ -540,21 +540,21 @@ static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3) static void objc_exclamation_mark_probably(struct Sprite *sprite) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjId) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objEventId) || sprite->animEnded) { FieldEffectStop(sprite, (u8)sprite->data[7]); } else { - struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; + struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId]; sprite->data[4] += sprite->data[3]; - 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->data[4]; + 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->data[4]; if (sprite->data[4]) sprite->data[3]++; else @@ -720,7 +720,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) return 0; } -void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) +void GabbyAndTySetScriptVarsToObjectEventLocalIds(void) { switch (GabbyAndTyGetBattleNum()) { @@ -2185,7 +2185,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80BFD20(void) { VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); - RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } typedef union ewramStruct_02007000 diff --git a/sym_common.txt b/sym_common.txt index 8948ba9e1..fe75d4d0e 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -179,7 +179,7 @@ SYMBOL(gTotalCameraPixelOffsetY, 4) SYMBOL(gTotalCameraPixelOffsetX, 4) // event_object_movement.c -SYMBOL(gEventObjects, 576) +SYMBOL(gObjectEvents, 576) #if DEBUG gUnknown_Debug_03004BC0 = .; @@ -187,7 +187,7 @@ gUnknown_Debug_03004BC0 = .; #endif // field_control_avatar.c -SYMBOL(gSelectedEventObject, 4) +SYMBOL(gSelectedObjectEvent, 4) // ??? SYMBOL(gPokemonItemUseCallback, 4) diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 1cf196fda..baa93233b 100755 --- 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]; |
