diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 9db57daf1d..cef18bc8d2 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -765,7 +765,7 @@ .2byte \y .endm - @ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. + @ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen. .macro copyobjectxytoperm index:req .byte 0x64 .2byte \index diff --git a/common_syms/field_control_avatar.txt b/common_syms/field_control_avatar.txt index 0f336a407d..268f60c641 100644 --- a/common_syms/field_control_avatar.txt +++ b/common_syms/field_control_avatar.txt @@ -1 +1 @@ -gSelectedEventObject +gSelectedObjectEvent diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index bfa2aa8115..1384b2e2ea 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -4412,4 +4412,4 @@ "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index b75fcf3acd..60d8481ad0 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -129,4 +129,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 04868ad92e..986ed6d4eb 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -110,4 +110,4 @@ "script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index b12ff40575..8e8529716a 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -53,4 +53,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 81e19fd1fd..87d802c596 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -93,4 +93,4 @@ "script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index f937eb649f..3f81080f18 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -215,4 +215,4 @@ "script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash" } ] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index b8e2a71da4..e5b88f7b69 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 6f39d4827d..a24e2947aa 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index 672d2c54ec..be7dd5cddd 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index 28feaf9403..0c325b4b72 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -113,4 +113,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 0af0a05ac9..b8ccd9ee42 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index de9c778159..e333a9e9fb 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index c1c9f24d36..85a060efe8 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json index 848eb95c19..0c28b77b8c 100644 --- a/data/maps/AlteringCave/map.json +++ b/data/maps/AlteringCave/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index 9229f7581c..fefcaaa98c 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -78,4 +78,4 @@ "script": "AncientTomb_EventScript_CaveEntranceSide" } ] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 25fe48a9ed..d873d332dd 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index f31180f8bd..3eff8d6fbf 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -311,4 +311,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index 1ae0fcecd3..af4602595e 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -186,4 +186,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json index 22b6454134..ac21b7f2d9 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json index 5bee651589..26dde7f5ba 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json index 03cafd7dc0..26ed361ae5 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/map.json +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json index dc7792d8a4..8f238a042c 100644 --- a/data/maps/ArtisanCave_1F/map.json +++ b/data/maps/ArtisanCave_1F/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json index 2fec826cdc..138ad35fed 100644 --- a/data/maps/ArtisanCave_B1F/map.json +++ b/data/maps/ArtisanCave_B1F/map.json @@ -79,4 +79,4 @@ "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json index 18df18491a..04c2da1ecf 100644 --- a/data/maps/BattleColosseum2P/map.json +++ b/data/maps/BattleColosseum2P/map.json @@ -65,4 +65,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum4P/map.json index d17851aaf3..0f6cc8fbec 100644 --- a/data/maps/BattleColosseum4P/map.json +++ b/data/maps/BattleColosseum4P/map.json @@ -83,4 +83,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json index 6299e7b11c..9bb2784963 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json index 02f3cd0194..18bca93664 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/map.json +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json index 49712c5dd8..be03b2704f 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/map.json +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -108,4 +108,4 @@ "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json index e3a6c915b8..65428e6233 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -213,4 +213,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json index 6e7f2c3f5d..afd83f7e54 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json index 89eeb60e46..66bc381a3a 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/map.json +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -144,4 +144,4 @@ "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json index 293a9cc225..2766f023ea 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json index 5f45fa7acb..215165ec6d 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -122,4 +122,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json index 8ed837413f..43599f9d48 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/map.json +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -136,4 +136,4 @@ "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json index fd20b7180c..c532df91f0 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json index cfa4cf97ff..06cb5452e2 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json index 9d635efc78..51e1200a39 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -138,4 +138,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json index c1d79ee509..cd22af8260 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/map.json +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -143,4 +143,4 @@ "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json index 98b061e9fe..11bab3e77d 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json index 5854c6bf7a..656686bcf0 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/map.json +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -109,4 +109,4 @@ "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json index 630a0e3354..c50612631c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -108,4 +108,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json index a07464a15d..bf2b05e94c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json index 6e0e749605..a2a00a3a9c 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json @@ -81,4 +81,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json index ac9230c533..d6fa8acd48 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -126,4 +126,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json index 3f4739b26b..606367cbab 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -226,4 +226,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json index 4f99b94881..69ceef7980 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -95,4 +95,4 @@ "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json index d73dc16923..25104660ed 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/map.json +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -54,4 +54,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json index c8efe3399c..193eec7245 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json index 698edcc65b..53717b450b 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -96,4 +96,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json index 5081edd82d..6961d2ba5d 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json index de898bef45..bf5f7c8f2a 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -70,4 +70,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json index f4cbd3590c..4df8652e7d 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/map.json +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json index d758b365b0..b7cf2d9e7e 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/map.json +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -198,4 +198,4 @@ "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json index f3b0807320..1e461f09f9 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -135,4 +135,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json index 055b6e56e5..c4400bfffe 100644 --- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json +++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json @@ -157,4 +157,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json index d631907761..a33406ffc6 100644 --- a/data/maps/BattleFrontier_Lounge1/map.json +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json index 575f2898ee..64e4e80d3c 100644 --- a/data/maps/BattleFrontier_Lounge2/map.json +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json index 843fc6e109..68f862a903 100644 --- a/data/maps/BattleFrontier_Lounge3/map.json +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -91,4 +91,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json index 0c86ccf3c8..21b6517f0f 100644 --- a/data/maps/BattleFrontier_Lounge4/map.json +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json index 6d9eab35fe..a403e8fc58 100644 --- a/data/maps/BattleFrontier_Lounge5/map.json +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json index 5888ea7c05..a0d53ac562 100644 --- a/data/maps/BattleFrontier_Lounge6/map.json +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json index 5ebc789baa..349707d5a9 100644 --- a/data/maps/BattleFrontier_Lounge7/map.json +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json index 519f008fcf..bd5feaf387 100644 --- a/data/maps/BattleFrontier_Lounge8/map.json +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json index 9f0a56ba01..7d55c46588 100644 --- a/data/maps/BattleFrontier_Lounge9/map.json +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json index f4adf6c367..f42d5e24b8 100644 --- a/data/maps/BattleFrontier_Mart/map.json +++ b/data/maps/BattleFrontier_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index cccf8fb8a4..87cf27b70b 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -526,4 +526,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json index 42b76323a5..991b29ba95 100644 --- a/data/maps/BattleFrontier_OutsideWest/map.json +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -455,4 +455,4 @@ "script": "Common_EventScript_ShowPokemartSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json index 743bab8b00..8c79311ee8 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json index fa93cde5f9..4175b037ee 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json index f26e03e416..58c15fc0ab 100644 --- a/data/maps/BattleFrontier_RankingHall/map.json +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -169,4 +169,4 @@ "script": "BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn" } ] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json index ff891ad5bb..699eb4b0e7 100644 --- a/data/maps/BattleFrontier_ReceptionGate/map.json +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json index 13cb13dd47..552d555085 100644 --- a/data/maps/BattleFrontier_ScottsHouse/map.json +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json index d4cbfd71d9..002671d4a5 100644 --- a/data/maps/BattlePyramidSquare01/map.json +++ b/data/maps/BattlePyramidSquare01/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json index e68b71284f..8d5704b7ea 100644 --- a/data/maps/BattlePyramidSquare02/map.json +++ b/data/maps/BattlePyramidSquare02/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json index 8a495158e7..ebf439db25 100644 --- a/data/maps/BattlePyramidSquare03/map.json +++ b/data/maps/BattlePyramidSquare03/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json index e413a7e5fc..a051f94947 100644 --- a/data/maps/BattlePyramidSquare04/map.json +++ b/data/maps/BattlePyramidSquare04/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json index d16a87646e..b7127dc195 100644 --- a/data/maps/BattlePyramidSquare05/map.json +++ b/data/maps/BattlePyramidSquare05/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json index ddf011814a..70352aec3c 100644 --- a/data/maps/BattlePyramidSquare06/map.json +++ b/data/maps/BattlePyramidSquare06/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json index 8719c6d25c..afcddbb5e5 100644 --- a/data/maps/BattlePyramidSquare07/map.json +++ b/data/maps/BattlePyramidSquare07/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json index 54cfa4fe80..78cb972ecf 100644 --- a/data/maps/BattlePyramidSquare08/map.json +++ b/data/maps/BattlePyramidSquare08/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json index 67b9ceb1fe..09c06273e6 100644 --- a/data/maps/BattlePyramidSquare09/map.json +++ b/data/maps/BattlePyramidSquare09/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json index 0a5e88bf7f..3a90be443c 100644 --- a/data/maps/BattlePyramidSquare10/map.json +++ b/data/maps/BattlePyramidSquare10/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json index 5dc7736a3a..373b02b6ee 100644 --- a/data/maps/BattlePyramidSquare11/map.json +++ b/data/maps/BattlePyramidSquare11/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json index dcb57812d9..fd5015559d 100644 --- a/data/maps/BattlePyramidSquare12/map.json +++ b/data/maps/BattlePyramidSquare12/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json index d277c5b1bc..c950579ed0 100644 --- a/data/maps/BattlePyramidSquare13/map.json +++ b/data/maps/BattlePyramidSquare13/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json index 5727356edb..73815cdf15 100644 --- a/data/maps/BattlePyramidSquare14/map.json +++ b/data/maps/BattlePyramidSquare14/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json index 62c7e34f33..6443401c32 100644 --- a/data/maps/BattlePyramidSquare15/map.json +++ b/data/maps/BattlePyramidSquare15/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json index a69a0ed5a3..c1c060aac3 100644 --- a/data/maps/BattlePyramidSquare16/map.json +++ b/data/maps/BattlePyramidSquare16/map.json @@ -109,4 +109,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 50bd57f0b7..bd354987a0 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index ea124d9efb..4848c8b223 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 989b1cf305..91f2b7ccd1 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index 61d8dc715d..abde3377cf 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 07c7af816d..2dea419988 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json index e131e4f0c7..effba642d9 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json index 8b83029e3a..62dc60a8e2 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json index 2b7c6db194..7127dfc195 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json index 1402a9afa0..b8dcf0c420 100644 --- a/data/maps/ContestHall/map.json +++ b/data/maps/ContestHall/map.json @@ -213,4 +213,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc index e1ef9b7084..a5fd02d937 100644 --- a/data/maps/ContestHall/scripts.inc +++ b/data/maps/ContestHall/scripts.inc @@ -79,7 +79,7 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834 call ContestHall_EventScript_CreateAudience end -@ There are 8 audience member event objects, 7 of which are given random gfx below (the 8th is the Artist) +@ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist) @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842 call ContestHall_EventScript_GetRandomAudienceGfxId diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json index daad0f9626..a521bb6afb 100644 --- a/data/maps/ContestHallBeauty/map.json +++ b/data/maps/ContestHallBeauty/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json index d1c2e985c2..4e9678ec67 100644 --- a/data/maps/ContestHallCool/map.json +++ b/data/maps/ContestHallCool/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json index d6b16dc4ef..0bde219488 100644 --- a/data/maps/ContestHallCute/map.json +++ b/data/maps/ContestHallCute/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json index 12d3cccd8a..4f5e6f4076 100644 --- a/data/maps/ContestHallSmart/map.json +++ b/data/maps/ContestHallSmart/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json index 0702111732..1142738da7 100644 --- a/data/maps/ContestHallTough/map.json +++ b/data/maps/ContestHallTough/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 441157d861..54f5e1663d 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -78,4 +78,4 @@ "script": "DesertRuins_EventScript_CaveEntranceSide" } ] -} \ No newline at end of file +} diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json index a3a80d41ed..634fbcc069 100644 --- a/data/maps/DesertUnderpass/map.json +++ b/data/maps/DesertUnderpass/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index bfa5a2e8bb..739eac766c 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -171,4 +171,4 @@ "script": "DewfordTown_EventScript_HallSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 35ba61064b..e3e3cb9489 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -170,4 +170,4 @@ "script": "DewfordTown_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 087981fdef..2271696cb7 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -167,4 +167,4 @@ "script": "DewfordTown_Hall_EventScript_Painting" } ] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index beb6d52759..898cecb1ef 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index ac1abca367..fa54854499 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 67e0e57219..30b94e5547 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 6ebca2ae0c..7d45123e9a 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 0fd6e9eca5..2758236ece 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -193,4 +193,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 4819c3b894..1cfe9d16c8 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -72,4 +72,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 5ff9107909..21388e4626 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -46,4 +46,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 8d220202e4..49de0534da 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json index 1ebb9c9251..862ccf4bbe 100644 --- a/data/maps/EverGrandeCity_Hall1/map.json +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json index 0631c14f0f..06403ed9cd 100644 --- a/data/maps/EverGrandeCity_Hall2/map.json +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json index f181843bf6..4c4ebfca55 100644 --- a/data/maps/EverGrandeCity_Hall3/map.json +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json index b2c095e77f..297170f8fe 100644 --- a/data/maps/EverGrandeCity_Hall4/map.json +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json index 04597cf656..4d67b6b3ee 100644 --- a/data/maps/EverGrandeCity_Hall5/map.json +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index d0588f76a9..387ded6e1e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -39,4 +39,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 73ee3357d1..7e15516d96 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -46,4 +46,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 23bbe085f2..da17bd1979 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index b995908296..81a0388279 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json index 8efb63b9a2..7a70ef9682 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -106,4 +106,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json index a016be34be..edaf0124ee 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 0aa57a944b..86ebc8211a 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -46,4 +46,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 b0475451ae..b394b13e4d 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -182,4 +182,4 @@ "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" } ] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json index da4c9fd4f4..93b8f97e0c 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json index 60168264f3..abcfa98f97 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/map.json +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json index 4c565ff8ca..26eff92e0c 100644 --- a/data/maps/FallarborTown_BattleTentLobby/map.json +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -107,4 +107,4 @@ "script": "FallarborTown_BattleTentLobby_EventScript_20024F" } ] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json index a31c1c5bfa..3a56d2dc29 100644 --- a/data/maps/FallarborTown_CozmosHouse/map.json +++ b/data/maps/FallarborTown_CozmosHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index f58c0d9e2f..f90ce102c4 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json index c444c1e382..af97d2b024 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json +++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index 0b55de01a9..e841014693 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 60bca57a90..a65da7770a 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index fe81fd10a7..c8f4835968 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -96,4 +96,4 @@ "script": "FarawayIsland_Entrance_EventScript_Sign" } ] -} \ No newline at end of file +} diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json index 4998380e1a..47be4d5df6 100644 --- a/data/maps/FarawayIsland_Interior/map.json +++ b/data/maps/FarawayIsland_Interior/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 70d1a2cfdb..0858d14706 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index ce1dcee3e1..20b5b12d4b 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -233,4 +233,4 @@ "script": "Common_EventScript_ShowPokemartSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index ac0ca1f89d..676081aa35 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index 7b17c58c0c..e5483d9445 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -154,4 +154,4 @@ "script": "FortreeCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index f984e2be56..c67a599e72 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index c4988e863a..ca3d48ff67 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index ce70f46054..923b8ee396 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 01d1a99e8e..b3bdea382f 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index a53b4e35c9..52805ad532 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index a8bca3743f..29ba47cb5c 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 38f133cc0a..1d85a0a800 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 42aca81648..c0b6d1f183 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 1822dd0c94..667e390e40 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 5a45481645..f67dbac6bf 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -81,4 +81,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 72e4030465..60914f2249 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -188,4 +188,4 @@ "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2" } ] -} \ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 87264cd544..8d9a7b4d9e 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -39,4 +39,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 256c7c1a59..2dad355ec6 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -148,4 +148,4 @@ "script": "InsideOfTruck_EventScript_MovingBox" } ] -} \ No newline at end of file +} diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index dbecdf4ed9..e6cb5856b2 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -78,4 +78,4 @@ "script": "IslandCave_EventScript_CaveEntranceSide" } ] -} \ No newline at end of file +} diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index ea13d94c2e..ddb8b8f371 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -243,4 +243,4 @@ "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL" } ] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index 1212f3354f..7c0303036c 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -259,4 +259,4 @@ "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" } ] -} \ 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 51665cdeb3..99f2c33ffe 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -296,4 +296,4 @@ "script": "LavaridgeTown_Gym_1F_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 7b03d4f533..8e3ae0260e 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -239,4 +239,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 1e7048b3f7..905c9aaba8 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 77ebb268e9..04d735f8d0 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index d55b562dbf..ca2630ebaa 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index 4df734a49d..0522494a23 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -99,4 +99,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 2ee196f9ba..bc345bddda 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 4f7c3ab0f7..ca20cb74a1 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -519,4 +519,4 @@ "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 456c7eec81..38a9bfd41c 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -512,4 +512,4 @@ "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 744ed41742..b2795ff3cf 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -469,4 +469,4 @@ "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults" } ] -} \ 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 c447bb41d9..6260eac154 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -63,4 +63,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 17c93e5a1a..b73679a44b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -117,4 +117,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index abc4e18dde..572e018745 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index 44f54006c9..91a94af6d2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -95,4 +95,4 @@ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 0fc05dd5a5..8857d3bd1b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -134,4 +134,4 @@ "script": "LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index fd30dc5164..c179d1fd51 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index cf25e1798f..850b0175bb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index a95cf6c3e4..106d10327f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 98d15787ed..fe82bd3a0f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -131,4 +131,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index 1b97c298d7..d402e1517f 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -98,4 +98,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 4f3fbcc28f..51951bd01c 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index c92a504991..359206ad08 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index e8010956d9..f10334edce 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 95fc79d35e..61dcd58f80 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index 83028fbeb4..54cf821c9d 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -299,4 +299,4 @@ "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet" } ] -} \ 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 54d6fbc639..f486507a46 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -175,4 +175,4 @@ "script": "LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture" } ] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index 30c5a413f9..ede184d570 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index 4f87f50b0a..0ad98c8d24 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index cd1324cbe4..a2fb65a398 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index f918c86ecd..93a8159f9c 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -150,4 +150,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 44cd20815a..afa6c739cc 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index 8b0c762f94..9536daa09f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -168,4 +168,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 01af64e7d3..7ea29e671b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -267,4 +267,4 @@ "script": "PlayersHouse_2F_EventScript_GameCube" } ] -} \ 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 118e3e8193..a549eccc33 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -168,4 +168,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 33cdfb7c16..b2ac8ca0b9 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -267,4 +267,4 @@ "script": "LittlerootTown_MaysHouse_2F_EventScript_PC" } ] -} \ No newline at end of file +} diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 7aadfe03a8..b6e4e2c0c3 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -232,4 +232,4 @@ "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC" } ] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index ce7474c6f9..bc96ab846f 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -125,4 +125,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index a059ed3d9b..7760094081 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index 5d70de4899..1adf44511d 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json index 186fa9dd82..af9dbd731c 100644 --- a/data/maps/MagmaHideout_2F_3R/map.json +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index edf3e66716..e381630c0c 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index 70dd1bdf8f..b2a316f4e8 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json index 6ec900c315..a0e32eca54 100644 --- a/data/maps/MagmaHideout_3F_3R/map.json +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index b01200f08a..11f7f2fa32 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -137,4 +137,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json index 133d89fe0c..969d7b55af 100644 --- a/data/maps/MarineCave_End/map.json +++ b/data/maps/MarineCave_End/map.json @@ -49,4 +49,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json index 545fe1c9bd..4ae306651c 100644 --- a/data/maps/MarineCave_Entrance/map.json +++ b/data/maps/MarineCave_Entrance/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index 1708008bde..a09618d047 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -297,4 +297,4 @@ "script": "MauvilleCity_EventScript_GameCornerSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 488ab5a4ee..4e95779685 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -76,4 +76,4 @@ "script": "MauvilleCity_BikeShop_EventScript_AcroBikeHandbook" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index efebc685ad..c0b450f226 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -382,4 +382,4 @@ "script": "Roulette_EventScript_Table2" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index ecc9f13c20..c2ac492833 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -178,4 +178,4 @@ "script": "MauvilleCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index 9df540885a..b51016cbda 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index acdb4f504a..5751183e7a 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 72e323bfed..8521e5d1d7 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index 6540334bef..8647fd8c80 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -105,4 +105,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 000f0cf640..e4c76a7bd2 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 46e031857a..e4933a07e6 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -210,4 +210,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 1b27e859eb..3280695ca9 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -95,4 +95,4 @@ "script": "0x0" } ] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index c234bd8b8d..a58929a28e 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -60,4 +60,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 8fd3eb4a2a..ee282dc16f 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json index c5ad268054..ba720f6517 100644 --- a/data/maps/MeteorFalls_StevensCave/map.json +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json index 886e0bf88a..3ec89b5ae9 100644 --- a/data/maps/MirageTower_1F/map.json +++ b/data/maps/MirageTower_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json index d8953d3da3..d49f2418a8 100644 --- a/data/maps/MirageTower_2F/map.json +++ b/data/maps/MirageTower_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index c24e2a006d..ea1db23441 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index 71e080a231..c25fb01527 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ 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 c86bf2b6e1..f10456fdef 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 33bd1d4349..d068a92e37 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -684,4 +684,4 @@ "script": "MossdeepCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 6b57ca6eff..019b7f7a27 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 967fc0a55b..bc917dcbd3 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index b2d7cb4045..d5c812a734 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 7166674a32..3161c18468 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index 8be148fada..423ca5a195 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index c8018bc364..c6c5cf2e96 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index aa8691ac8a..d78833d965 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 22f008ed17..b59688e911 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -183,4 +183,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index 61729d0037..bb98ffb223 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -143,4 +143,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 c061999eff..de718e7060 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -105,4 +105,4 @@ "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 52a795bdb8..a80bfc3cd2 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -454,4 +454,4 @@ "script": "MtChimney_EventScript_RouteSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index 49d1028789..625fa7f4be 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -59,4 +59,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 2e03ae728a..862988960e 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -100,4 +100,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index e6882c311a..59ed69806f 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -158,4 +158,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index 058c4db0a9..ff9fc3822b 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -113,4 +113,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index 5c3d72ef83..8b20b5125f 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -87,4 +87,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 1f814bda82..61f412cb0c 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -80,4 +80,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index c2de09055e..d376fab123 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 2fbcd56732..1a6eb4758e 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -129,4 +129,4 @@ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER" } ] -} \ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index f032fbbdf1..7e4b8e33d4 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -216,4 +216,4 @@ "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" } ] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index 6b5cd00893..f2354522f4 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json index 1ae004107a..9a7669224e 100644 --- a/data/maps/NavelRock_Bottom/map.json +++ b/data/maps/NavelRock_Bottom/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json index 50f60b52e5..ef8effb571 100644 --- a/data/maps/NavelRock_Down01/map.json +++ b/data/maps/NavelRock_Down01/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json index fb2d151457..5b9715dc86 100644 --- a/data/maps/NavelRock_Down02/map.json +++ b/data/maps/NavelRock_Down02/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json index a82e036101..9d81409551 100644 --- a/data/maps/NavelRock_Down03/map.json +++ b/data/maps/NavelRock_Down03/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json index 58e81b709e..b3ff4f6784 100644 --- a/data/maps/NavelRock_Down04/map.json +++ b/data/maps/NavelRock_Down04/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json index a1fcef804b..d477fcf823 100644 --- a/data/maps/NavelRock_Down05/map.json +++ b/data/maps/NavelRock_Down05/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json index 204a2a2cfe..91356a4954 100644 --- a/data/maps/NavelRock_Down06/map.json +++ b/data/maps/NavelRock_Down06/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json index f48063d8a0..4fc93ba1b4 100644 --- a/data/maps/NavelRock_Down07/map.json +++ b/data/maps/NavelRock_Down07/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json index d5f7ea8fea..2572c991af 100644 --- a/data/maps/NavelRock_Down08/map.json +++ b/data/maps/NavelRock_Down08/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json index 348739b31b..23d33233cb 100644 --- a/data/maps/NavelRock_Down09/map.json +++ b/data/maps/NavelRock_Down09/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json index 3aa128fa0b..88d0f679a3 100644 --- a/data/maps/NavelRock_Down10/map.json +++ b/data/maps/NavelRock_Down10/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json index 0ed44f0fcd..2de0d57718 100644 --- a/data/maps/NavelRock_Down11/map.json +++ b/data/maps/NavelRock_Down11/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json index 983df45df5..50c075fe9d 100644 --- a/data/maps/NavelRock_Entrance/map.json +++ b/data/maps/NavelRock_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index b98f08d4e4..c65aa2062c 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index 728b8a7aa4..08404c8720 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index e91dfa8d1a..1abd5a1ecd 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json index c906c4ceb9..4f7afda38a 100644 --- a/data/maps/NavelRock_Top/map.json +++ b/data/maps/NavelRock_Top/map.json @@ -58,4 +58,4 @@ "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH" } ] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json index 24d1b5a323..2ad457e366 100644 --- a/data/maps/NavelRock_Up1/map.json +++ b/data/maps/NavelRock_Up1/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json index 2d16e798c6..a3f108da15 100644 --- a/data/maps/NavelRock_Up2/map.json +++ b/data/maps/NavelRock_Up2/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json index 2e984b3792..6f8b626085 100644 --- a/data/maps/NavelRock_Up3/map.json +++ b/data/maps/NavelRock_Up3/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json index e448e6a9a0..8d3a5b0d2b 100644 --- a/data/maps/NavelRock_Up4/map.json +++ b/data/maps/NavelRock_Up4/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 593e23a627..c12d086c19 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -42,4 +42,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 8909fcbaa5..34078353c7 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -286,4 +286,4 @@ "script": "NewMauville_Inside_EventScript_Generator" } ] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index 03155a6238..42502742a0 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 754f98c498..f2b1db4abb 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index a27fad4972..d287baec64 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index 2f92a004c5..8dada1ede9 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index c3e41775d0..e0811a74e8 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index ff64a59678..c522bf8b75 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -136,4 +136,4 @@ "script": "Common_EventScript_ShowPokemonCenterSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8f7357246c..f3fa5a370a 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index 8c9cd91af9..de95d43155 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 11bd0761bb..066aec4bb8 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index f196f6a8aa..ea5d3fa4b2 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index c828d7a296..41328a6512 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index dd5dfcb9c9..3f7f76cbe8 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 25d8abd04e..4aa6c736dc 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 30cb6e2096..1d71f69dda 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -541,4 +541,4 @@ "script": "PetalburgCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index ce3dc3b162..cbff5d4b72 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 9354b49269..7509e66981 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 82519cb5cb..9e843180af 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index d673ecf4dc..e6b4addb52 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 067d6f2373..f2601e1b2c 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 49af9f43d6..3c0c42c5b1 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -59,4 +59,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 d43017f99d..8d1f278dff 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -298,4 +298,4 @@ "script": "PetalburgWoods_EventScript_Sign2" } ] -} \ No newline at end of file +} diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index d34ad49030..255e636ef4 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -97,4 +97,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 71dbf96cc6..18b5578e94 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -198,4 +198,4 @@ "script": "Route101_EventScript_RouteSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index f8930a21df..50fe8d0de3 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -163,4 +163,4 @@ "script": "Route102_EventScript_RouteSignOldale" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 0a870a06e4..b645cf502a 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -306,4 +306,4 @@ "script": "Route103_EventScript_RouteSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index dc6c0ab4dd..d536139884 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index dcda9afeb8..d6e827500b 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index 168cee142c..2e77358b68 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index f50dced01e..e450403ab2 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index bb6aadd549..d30b6102f7 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -163,4 +163,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 273f59aa5b..86f32abd94 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -135,4 +135,4 @@ "script": "Route106_EventScript_TrainerTipsSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index b0bb63a14a..d163019cca 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -120,4 +120,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index ecdb81f6f6..253ff6ba45 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -137,4 +137,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index 4ba9baf9fe..b5eb3499f3 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -414,4 +414,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index ebd5583c6f..4367a40b19 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index f0aea1aec8..3414f97f90 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -79,4 +79,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 6077876f7d..6e41c77042 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -79,4 +79,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 a488e96613..75ef7519a6 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 84233313b2..6bf0d79858 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -65,4 +65,4 @@ "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 58ba81aea8..346efc3aae 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -99,4 +99,4 @@ "script": "Route110_TrickHouseEntrance_EventScript_Door" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index f656b0a48a..586e0b6be8 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -244,4 +244,4 @@ "script": "Route110_TrickHousePuzzle1_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index 71b3f8916d..0701407b14 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -151,4 +151,4 @@ "script": "Route110_TrickHousePuzzle2_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index 612edc6bfa..7cb2ee7a4f 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -177,4 +177,4 @@ "script": "Route110_TrickHousePuzzle3_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 26a58166f2..e781e6d1ca 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -231,4 +231,4 @@ "script": "Route110_TrickHousePuzzle4_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index 30f4cfe479..0b2b24282e 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -313,4 +313,4 @@ "script": "Route110_TrickHousePuzzle5_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 797bb9f607..bc17c15514 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -101,4 +101,4 @@ "script": "Route110_TrickHousePuzzle6_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index 1e31e2f745..d0bcf043f6 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -273,4 +273,4 @@ "script": "Route110_TrickHousePuzzle7_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 9e4be0cfca..fbc4751c9d 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -101,4 +101,4 @@ "script": "Route110_TrickHousePuzzle8_EventScript_Scroll" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 5770ab0c0c..f267fe332f 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -1112,4 +1112,4 @@ "script": "Route111_EventScript_TrainerHillSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 71afc39f8d..5c389d3976 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index 640de23cbc..59ac356857 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index e52468f328..ef6306c159 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -284,4 +284,4 @@ "script": "Route112_EventScript_RouteSignLavaridge" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index 5ed7fc4a79..5bd9a10f9b 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -59,4 +59,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 ba3cf24524..a7cf388ca9 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -462,4 +462,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 0f57ce2b8f..008dee0cc7 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 76a9083f48..ea330f94e5 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -506,4 +506,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 7a629f44ad..ee0d08dd95 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -86,4 +86,4 @@ "script": "Route114_FossilManiacsHouse_EventScript_Bookshelf" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index da3241ed15..df360541fa 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -72,4 +72,4 @@ } ], "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 6709d055e9..8fd9dcaa9d 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -71,4 +71,4 @@ "script": "Route114_LanettesHouse_EventScript_PC" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index c9f1d88334..2f0616c5e6 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -452,4 +452,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 366fe1ed53..d6ee64b4d6 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -524,4 +524,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_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 470ccadfe8..2af75c05ec 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 4bb513cdf7..49337c76ec 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -382,4 +382,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 9cb052633d..57fe13f319 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index d64adbb860..6d5e413057 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -418,4 +418,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 2d1be06353..e90d5984be 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -917,4 +917,4 @@ "script": "Route119_EventScript_TrainerTipsDecoration" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index f071566539..943d6e7819 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -124,4 +124,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 626d008fc0..fc72d98127 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -138,4 +138,4 @@ "script": "Route119_WeatherInstitute_1F_EventScript_Bed" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index c8048db6f2..c5b0adcc6f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -130,4 +130,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 61e7d2892d..a4fa1c8495 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -855,4 +855,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 9d91c47d16..dfe86e324a 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -533,4 +533,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 6cf7b57915..d5aa0a0f02 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -105,4 +105,4 @@ "script": "Route121_SafariZoneEntrance_EventScript_TrainerTipSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 9dee984d92..e9d2984a2b 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index fc4af6b3c4..14e69a690e 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -837,4 +837,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index b7f2523af4..181bccd37d 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 01bc84377e..4788b30fe9 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -217,4 +217,4 @@ "script": "Route124_EventScript_HuntersHouseSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index c8ec142f2b..6c0da86611 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -55,4 +55,4 @@ "script": "Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 402c429329..7e7f6f414d 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -201,4 +201,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index db01091ac1..1a435accc9 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -151,4 +151,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 626982ca21..bde39b5a1e 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -218,4 +218,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index a7de8ed190..d9f7577025 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -194,4 +194,4 @@ "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" } ] -} \ No newline at end of file +} diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 6b19cc320a..d43893ef77 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -99,4 +99,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index c0b92a1a5d..2b1cdc347c 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -81,4 +81,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index af73808b6f..5b7ad0cb0a 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -141,4 +141,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 947f8d9cf8..912d91f163 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -159,4 +159,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index fe492458aa..58b88682cd 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -159,4 +159,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index fb4da1f925..588681ccbe 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -172,4 +172,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index a4bc474762..e0e3c74498 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 9223872b91..698b4c2efa 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -96,4 +96,4 @@ "script": "RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay" } ] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index b7dbdb3d51..3bb61b6dd2 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -111,4 +111,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index 8e0f6d2aef..3a6fdaa51d 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -82,4 +82,4 @@ "script": "RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay" } ] -} \ 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 a35fe32cf7..3949fddb0a 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index b937d323af..51897b8fe8 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -130,4 +130,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index 6ca0fbd1b9..d755db2c94 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -66,4 +66,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 9667ebf929..ac3423dc87 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index a9c1e40cd0..c24eaa04ee 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 99ae9ebd85..74d9bdb1d8 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -115,4 +115,4 @@ "script": "RustboroCity_Gym_EventScript_RightGymStatue" } ] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index 5d30008461..d36b51345a 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index 6dcd38ab4c..652e83bce8 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 66fa988339..0f076e0676 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index d56aa3095b..328ad2bc77 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index db28ddcf3d..e7dec7aef8 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index 812cb7c024..f94ad13983 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index a60add1ee3..bcc6729c7e 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -165,4 +165,4 @@ "script": "RustboroCity_PokemonSchool_EventScript_StudentNotebook" } ] -} \ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index b682f84a2e..aa5d20e1d3 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -216,4 +216,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 3cf4b2cd06..d7ed34d33b 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -244,4 +244,4 @@ "script": "SSTidalCorridor_EventScript_Cabin4Sign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 45610454ae..c15757ae22 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -61,4 +61,4 @@ "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS" } ] -} \ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index b2da534c30..ecc45d7aa4 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -224,4 +224,4 @@ "script": "SSTidalRooms_EventScript_Bed" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 90ecec8c2d..b35b2b74f2 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -151,4 +151,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index d362f8de32..f74add57a3 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -163,4 +163,4 @@ "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 7805c872e6..792b5ea032 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -55,4 +55,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index fd9ae9dcb7..8babd7e8a5 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json index b23420ba42..9c4a791c71 100644 --- a/data/maps/SafariZone_South/map.json +++ b/data/maps/SafariZone_South/map.json @@ -120,4 +120,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 f17a9acd3a..6aabd774da 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -111,4 +111,4 @@ "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE" } ] -} \ No newline at end of file +} diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index 261f7f49d3..314a60412f 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -72,4 +72,4 @@ "script": "SafariZone_Southwest_EventScript_RestHouseSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 5abcf9adfe..8df5d77fcb 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 12000c6996..efa3d036f7 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 68cbba71db..9eeb712564 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -105,4 +105,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index f402b50d08..972b8c1cea 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -151,4 +151,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 428070faf6..f97b702d08 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -157,4 +157,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index c04e22e39d..951533e79c 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index b9c85c9bf1..6902bf8541 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -118,4 +118,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index 69c5330ead..0fbb31e718 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 65c103aafb..b7b8cf2173 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index c1d3b6cc24..e28b49e35a 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -189,4 +189,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 9a2ab1d3ec..811b055106 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -127,4 +127,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 4549a1bbd8..4b78bdae0b 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -98,4 +98,4 @@ "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall" } ] -} \ No newline at end of file +} diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index 54a10ee70c..d8e8f45b69 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -258,4 +258,4 @@ "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere" } ] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index 8ac45a1473..c7fdf2e26c 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 1e8cf98fde..e3b2f7b201 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index d057ade305..5882ffbc1a 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 4cdb8de60d..6f8db58791 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index 39d7d3d92f..3c9b0f87c0 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index d268e604a5..a8405f6b93 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index f1a4f656c0..ce2db65994 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 80199de730..c2c7d55f93 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index b485575b38..ed55a18959 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index fb2dd3da3a..ba4e6b3d5a 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index ac1b8c1037..a23b9a08ce 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index b3f5998f2c..aef7939742 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index b43accd3c9..f2b8879b66 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index 86590e0c39..928f88b2df 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index ac14a8e45b..a6f7071a1b 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index c8b86decb5..4c673cea6b 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 93f119a926..0aab640d6b 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 96a4fc7f7d..dd296177ce 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 89fd3cf494..fdef0a4090 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index da6c9e727a..df7b2f2e27 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index e8ebdd91af..ae17a6c6a2 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index 9eb60caabd..d3a7945ef6 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index 567255385b..4f168d90af 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 26a3873fc1..01c1f85a46 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -222,4 +222,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index 046fe49668..5da56ae2a4 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index ff2231d67c..43bafd0bf9 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -17,4 +17,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 9845375949..b505d51cac 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -73,4 +73,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index d2f69b51f3..419ae4ea03 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -52,4 +52,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 5bc7ef756a..e5a91af3d1 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -137,4 +137,4 @@ "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4" } ] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 6e8cbe8c94..032e9075a5 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -82,4 +82,4 @@ "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4" } ] -} \ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 7280cf1401..251b7dc448 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -55,4 +55,4 @@ "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3" } ] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index 3d1fbf51ad..82dbd2934d 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index 1e543db403..9eb0a04061 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 56a85256f9..09d4c4e43f 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index babc00f6c6..4cbc4bca42 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -39,4 +39,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 233e86dfee..1ad2917685 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 379d6fcfb3..a829a62d13 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 4c401ccf98..02a7b769e3 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -46,4 +46,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 eba1eff393..6cb13c7b24 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -62,4 +62,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 53c482597c..509d221094 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -682,4 +682,4 @@ "script": "SlateportCity_EventScript_BerryCrushRankingsSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json index e39f043637..8c9b257f57 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json index eea0cac800..08f633adfe 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/map.json +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json index 45783e2c96..1c3482b23d 100644 --- a/data/maps/SlateportCity_BattleTentLobby/map.json +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -107,4 +107,4 @@ "script": "SlateportCity_BattleTentLobby_EventScript_208A99" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index c9aaf1d7a1..a7c85503f9 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -188,4 +188,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json index 9052e19b1b..38093133b7 100644 --- a/data/maps/SlateportCity_House/map.json +++ b/data/maps/SlateportCity_House/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index ca1c23717d..bcd304fc55 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json index 1e464b9fd5..aa661a99a8 100644 --- a/data/maps/SlateportCity_NameRatersHouse/map.json +++ b/data/maps/SlateportCity_NameRatersHouse/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index 87fc0f6ee5..8d026830e4 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -346,4 +346,4 @@ "script": "SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine" } ] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 0c45541e4c..ca94abc062 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -286,4 +286,4 @@ "script": "SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica" } ] -} \ 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 4f8cefda93..c73748e171 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -79,4 +79,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 74cccebf0e..f617902f12 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index 5e0e0616cd..f0148730a8 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index d5d8fce4e4..a71cde2aee 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index 78b39989f5..1fdce590f9 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -65,4 +65,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 9462063473..b96d5c1430 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -393,4 +393,4 @@ "script": "SootopolisCity_EventScript_CitySign" } ] -} \ 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 9726e98aa7..835a5c896a 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -83,4 +83,4 @@ "script": "SootopolisCity_Gym_1F_EventScript_RightGymStatue" } ] -} \ 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 0af53d062a..dc6ed875bf 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -156,4 +156,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index bd1488d14e..5899e1579f 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index ae30df6c68..32b3114ee4 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index b87274eee3..469f6057e5 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index 586c88e906..b57e243dd4 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index fcfce0abb0..33b2d154aa 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index bd7e238828..443a916eda 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 497b36bbab..4ce7a16765 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json index bf19b4e034..207eb1a07b 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -76,4 +76,4 @@ "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord" } ] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index 9d8ef277dc..46810b94d2 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -72,4 +72,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json index 014a07dde5..065c7f6c4c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -53,4 +53,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json index dbb651a443..82b48fa831 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -39,4 +39,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 4a5eec7474..ca7361a86a 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 6c00e8e215..4be59d375e 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index cf8be22279..1aa14a8f45 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -68,4 +68,4 @@ "script": "SouthernIsland_Exterior_EventScript_Sign" } ] -} \ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index a647076bad..d571473486 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -68,4 +68,4 @@ "script": "SouthernIsland_Interior_EventScript_TryLatiEncounter" } ] -} \ No newline at end of file +} diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json index 2854ec9759..f32c4167eb 100644 --- a/data/maps/TerraCave_End/map.json +++ b/data/maps/TerraCave_End/map.json @@ -49,4 +49,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json index 8ca5c69dff..f741c70404 100644 --- a/data/maps/TerraCave_Entrance/map.json +++ b/data/maps/TerraCave_Entrance/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index 98e7d46c12..1919d40a52 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -65,4 +65,4 @@ } ], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json index 77c8ee094f..9dd32783c3 100644 --- a/data/maps/TrainerHill_1F/map.json +++ b/data/maps/TrainerHill_1F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json index a10f68baf4..4c4dbb5f6a 100644 --- a/data/maps/TrainerHill_2F/map.json +++ b/data/maps/TrainerHill_2F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json index dfaa57f59d..c3225ef6ea 100644 --- a/data/maps/TrainerHill_3F/map.json +++ b/data/maps/TrainerHill_3F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json index 01f20a8f7f..fd208e0122 100644 --- a/data/maps/TrainerHill_4F/map.json +++ b/data/maps/TrainerHill_4F/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json index 07cdaa80da..9e06784a0f 100644 --- a/data/maps/TrainerHill_Elevator/map.json +++ b/data/maps/TrainerHill_Elevator/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json index f581988b6c..adbc129821 100644 --- a/data/maps/TrainerHill_Entrance/map.json +++ b/data/maps/TrainerHill_Entrance/map.json @@ -124,4 +124,4 @@ "script": "TrainerHill_Entrance_EventScript_Records" } ] -} \ No newline at end of file +} diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json index 2804947880..d6db93dc1e 100644 --- a/data/maps/TrainerHill_Roof/map.json +++ b/data/maps/TrainerHill_Roof/map.json @@ -46,4 +46,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index 7fd45b45f3..f624ae2ae1 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -85,4 +85,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 7977faa4f0..55eff4cca2 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -106,4 +106,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index ea87b52354..6617380112 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -81,4 +81,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index 9226717c34..09b1d05da2 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -53,4 +53,4 @@ "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json index abd13a187a..9a890427cc 100644 --- a/data/maps/Underwater5/map.json +++ b/data/maps/Underwater5/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json index 9b19a1fe79..771587fbc0 100644 --- a/data/maps/Underwater6/map.json +++ b/data/maps/Underwater6/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json index afabfeeecf..32e3a3a78e 100644 --- a/data/maps/Underwater7/map.json +++ b/data/maps/Underwater7/map.json @@ -38,4 +38,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json index c969239c5a..618807dc45 100644 --- a/data/maps/Underwater_MarineCave/map.json +++ b/data/maps/Underwater_MarineCave/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index f94f110e11..87b4a5436f 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -25,4 +25,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index eedec45002..b25b7a1348 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 7579f15d57..6c82073bdf 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -34,4 +34,4 @@ "script": "Underwater_SealedChamber_EventScript_Braille" } ] -} \ No newline at end of file +} diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index a3b0a1290d..10358d2ba5 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -32,4 +32,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index 4c7b487fb2..914fe500f4 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -150,4 +150,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json index bcad9e1d71..c767b7ebfa 100644 --- a/data/maps/UnknownLinkContestRoom_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json index 4a67080068..837148655f 100644 --- a/data/maps/UnknownLinkContestRoom_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json index da7f875b3f..b70b755b39 100644 --- a/data/maps/UnknownLinkContestRoom_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json index 8d5b033dbc..d870cb7eae 100644 --- a/data/maps/UnknownLinkContestRoom_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json index 89c95c51b0..1db8019c98 100644 --- a/data/maps/UnknownLinkContestRoom_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json index 3e28789623..d9c30d0036 100644 --- a/data/maps/UnknownLinkContestRoom_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -15,4 +15,4 @@ "connections": null, "shared_events_map": "ContestHall", "shared_scripts_map": "ContestHall" -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index e3fa08b03f..7bdc25c322 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -196,4 +196,4 @@ "script": "VerdanturfTown_EventScript_RusturfTunnelSign" } ] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json index 2722518ebf..b9f9493f84 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -57,4 +57,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json index 1577459148..88e8516357 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -31,4 +31,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json index 2a56602716..98026448f9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/map.json +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -120,4 +120,4 @@ "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" } ] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index fa620e6820..1c35ca9f51 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index f50e62a4e4..972cb773cd 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -59,4 +59,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index 702a70f3dd..b3be7f53bd 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -85,4 +85,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 056e82ed14..59f0556b65 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index 26f0d3aaa9..5f0453e8b9 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -92,4 +92,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index c09a612743..c599df1e03 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -98,4 +98,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d769156486..e17afd483d 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -199,4 +199,4 @@ "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL" } ] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 3241c1364a..404b3f8cc0 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -341,4 +341,4 @@ ], "coord_events": [], "bg_events": [] -} \ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index d78339b52c..0d837b617e 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -155,4 +155,4 @@ "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL" } ] -} \ No newline at end of file +} diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 4035bc3f39..f9c614a9b1 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -688,4 +688,4 @@ "BattleFrontier_OutsideWest", "BattleFrontier_OutsideEast" ] -} \ No newline at end of file +} diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 1d0862a65d..eecd082737 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -682,7 +682,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 - special SpawnLinkPartnerEventObject + special SpawnLinkPartnerObjectEvent goto BerryBlender_EventScript_LinkPlayersArrived end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6b2da5ccb3..354aa045e4 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ BerryTreeScript:: @ 82742F9 - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData switch VAR_0x8004 case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil @@ -54,7 +54,7 @@ BerryTree_EventScript_CancelPlanting:: @ 82743AF BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 lockall - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString message BerryTree_Text_BerryGrowthStage1 waitmessage waitbuttonpress @@ -62,7 +62,7 @@ BerryTree_EventScript_CheckBerryStage1:: @ 82743B1 BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage2 waitmessage waitbuttonpress @@ -70,7 +70,7 @@ BerryTree_EventScript_CheckBerryStage2:: @ 82743C1 BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage3 waitmessage waitbuttonpress @@ -79,14 +79,14 @@ BerryTree_EventScript_CheckBerryStage3:: @ 82743D1 BerryTree_EventScript_CheckBerryStage4:: @ 82743E1 call BerryTree_EventScript_GetCareAdverb lockall - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_BerryGrowthStage4 waitmessage waitbuttonpress goto BerryTree_EventScript_WantToWater @ VAR_0x8005 here is the number of times watered -@ Buffered by EventObjectInteractionGetBerryTreeData +@ Buffered by ObjectEventInteractionGetBerryTreeData BerryTree_EventScript_GetCareAdverb:: @ 82743F6 compare VAR_0x8005, 0 goto_if_eq BerryTree_EventScript_SetAdverbPoor @@ -108,7 +108,7 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock faceplayer - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString msgbox BerryTree_Text_WantToPick, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_PickBerry @@ -116,11 +116,11 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421 goto_if_eq BerryTree_EventScript_CancelPickingBerry BerryTree_EventScript_PickBerry:: @ 8274448 - special EventObjectInteractionPickBerryTree + special ObjectEventInteractionPickBerryTree compare VAR_0x8004, 0 goto_if_eq BerryTree_EventScript_BerryPocketFull special IncrementDailyPickedBerries - special EventObjectInteractionRemoveBerryTree + special ObjectEventInteractionRemoveBerryTree message BerryTree_Text_PickedTheBerry playfanfare MUS_ME_KINOMI waitmessage @@ -148,7 +148,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479 BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482 lockall - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData call BerryTree_EventScript_PlantBerry releaseall end @@ -157,7 +157,7 @@ BerryTree_EventScript_WantToWater:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 goto_if_eq BerryTree_EventScript_DontWater - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq BerryTree_EventScript_WaterBerry @@ -169,13 +169,13 @@ BerryTree_EventScript_DontWater:: @ 82744BE end BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0 - special EventObjectInteractionGetBerryTreeData + special ObjectEventInteractionGetBerryTreeData lockall BerryTree_EventScript_WaterBerry:: @ 82744C4 - special EventObjectInteractionGetBerryName + special ObjectEventInteractionGetBerryName message BerryTree_Text_WateredTheBerry waitmessage - special EventObjectInteractionWaterBerryTree + special ObjectEventInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message BerryTree_Text_PlantIsDelighted @@ -185,10 +185,10 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4 end BerryTree_EventScript_PlantBerry:: @ 82744DD - special EventObjectInteractionPlantBerryTree + special ObjectEventInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES special IncrementDailyPlantedBerries - special EventObjectInteractionGetBerryCountString + special ObjectEventInteractionGetBerryCountString message BerryTree_Text_PlantedOneBerry waitmessage waitbuttonpress diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index cabf923b63..586f5af83d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -490,7 +490,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5 @ For below VAR_TEMP_0 is the number of heart emotes to try to display in the audience @ The number of hearts to try to display is based on the condition of the presented pokemon and the rank @ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart -@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual event objects +@ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual object events @ and are set to 9 if they havent displayed a heart yet, and 1 if they have ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F special GetContestMonCondition diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 456f56f45c..98faa4748d 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -210,7 +210,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36 GabbyAndTy_EventScript_FirstInterview:: @ 828CF56 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, DIR_NORTH call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH @@ -241,7 +241,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1 GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToEventObjectLocalIds + special GabbyAndTySetScriptVarsToObjectEventLocalIds compare VAR_FACING, DIR_NORTH call_if_eq GabbyAndTy_EventScript_FacePlayerNorth compare VAR_FACING, DIR_SOUTH diff --git a/data/specials.inc b/data/specials.inc index 4b23995f26..40e6296ac1 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64 def_special sub_80B3254 def_special TryBerryBlenderLinkup def_special GetLinkPartnerNames - def_special SpawnLinkPartnerEventObject + def_special SpawnLinkPartnerObjectEvent def_special SavePlayerParty def_special LoadPlayerParty def_special ChooseHalfPartyForBattle def_special Script_ShowLinkTrainerCard - def_special EventObjectInteractionGetBerryTreeData - def_special EventObjectInteractionGetBerryName - def_special EventObjectInteractionGetBerryCountString + def_special ObjectEventInteractionGetBerryTreeData + def_special ObjectEventInteractionGetBerryName + def_special ObjectEventInteractionGetBerryCountString def_special Bag_ChooseBerry - def_special EventObjectInteractionPlantBerryTree - def_special EventObjectInteractionPickBerryTree - def_special EventObjectInteractionRemoveBerryTree - def_special EventObjectInteractionWaterBerryTree + def_special ObjectEventInteractionPlantBerryTree + def_special ObjectEventInteractionPickBerryTree + def_special ObjectEventInteractionRemoveBerryTree + def_special ObjectEventInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special GetTrainerBattleMode @@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64 def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToEventObjectLocalIds + def_special GabbyAndTySetScriptVarsToObjectEventLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -339,7 +339,7 @@ gSpecials:: @ 81DBA64 def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special TryInitBattleTowerAwardManEventObject + def_special TryInitBattleTowerAwardManObjectEvent def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag def_special Script_FadeOutMapMusic diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h index d77172d0bc..b22854ed50 100644 --- a/include/battle_pyramid.h +++ b/include/battle_pyramid.h @@ -16,9 +16,9 @@ void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId); u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId); void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); -void LoadBattlePyramidEventObjectTemplates(void); -void LoadBattlePyramidFloorEventObjectScripts(void); -u8 GetNumBattlePyramidEventObjects(void); +void LoadBattlePyramidObjectEventTemplates(void); +void LoadBattlePyramidFloorObjectEventScripts(void); +u8 GetNumBattlePyramidObjectEvents(void); u16 GetBattlePyramidPickupItemId(void); #endif // GUARD_BATTLE_PYRAMID_H diff --git a/include/berry.h b/include/berry.h index ebe1e9a384..afd1bc499f 100644 --- a/include/berry.h +++ b/include/berry.h @@ -6,7 +6,7 @@ void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); const struct Berry *GetBerryInfo(u8 berry); struct BerryTree *GetBerryTreeInfo(u8 id); -bool32 EventObjectInteractionWaterBerryTree(void); +bool32 ObjectEventInteractionWaterBerryTree(void); bool8 IsPlayerFacingEmptyBerryTreePatch(void); bool8 TryToWaterBerryTree(void); void ClearBerryTrees(void); @@ -19,10 +19,10 @@ u8 ItemIdToBerryType(u16 item); void GetBerryNameByBerryType(u8 berry, u8 *string); void ResetBerryTreeSparkleFlag(u8 id); void Bag_ChooseBerry(void); -void EventObjectInteractionGetBerryTreeData(void); -void EventObjectInteractionPlantBerryTree(void); -void EventObjectInteractionPickBerryTree(void); -void EventObjectInteractionRemoveBerryTree(void); +void ObjectEventInteractionGetBerryTreeData(void); +void ObjectEventInteractionPlantBerryTree(void); +void ObjectEventInteractionPickBerryTree(void); +void ObjectEventInteractionRemoveBerryTree(void); bool8 PlayerHasBerries(void); void ResetBerryTreeSparkleFlags(void); diff --git a/include/constants/coins.h b/include/constants/coins.h index fd68f3f9ec..3ae3bb23f9 100644 --- a/include/constants/coins.h +++ b/include/constants/coins.h @@ -3,4 +3,4 @@ #define MAX_COINS 9999 -#endif // GUARD_CONSTANTS_COINS_H \ No newline at end of file +#endif // GUARD_CONSTANTS_COINS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index d39323831a..6901730447 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -25,7 +25,7 @@ // object gfx id vars // These 0x10 vars are used to dynamically control a map object's sprite. // For example, the rival's sprite id is dynamically set based on the player's gender. -// See VarGetEventObjectGraphicsId(). +// See VarGetObjectEventGraphicsId(). #define VAR_OBJ_GFX_ID_0 0x4010 #define VAR_OBJ_GFX_ID_1 0x4011 #define VAR_OBJ_GFX_ID_2 0x4012 diff --git a/include/event_data.h b/include/event_data.h index 11289c1ab8..4c1d4a046d 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -24,7 +24,7 @@ bool32 CanResetRTC(void); u16 *GetVarPointer(u16 id); u16 VarGet(u16 id); bool8 VarSet(u16 id, u16 value); -u8 VarGetEventObjectGraphicsId(u8 id); +u8 VarGetObjectEventGraphicsId(u8 id); u8 *GetFlagPointer(u16 id); u8 FlagSet(u16 id); u8 FlagClear(u16 id); diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h index 037c0080d9..f9ca40199b 100644 --- a/include/event_obj_lock.h +++ b/include/event_obj_lock.h @@ -2,12 +2,12 @@ #define GUARD_EVENT_OBJ_LOCK_H bool8 sub_80983C4(void); -void ScriptFreezeEventObjects(void); +void ScriptFreezeObjectEvents(void); bool8 sub_809847C(void); -void LockSelectedEventObject(void); +void LockSelectedObjectEvent(void); void sub_8098630(void); bool8 sub_8098734(void); -void ScriptUnfreezeEventObjects(void); +void ScriptUnfreezeObjectEvents(void); void sub_8098524(void); #endif // GUARD_EVENT_OBJ_LOCK_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 93f73e6357..956f888f90 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -52,80 +52,80 @@ struct PairedPalettes const u16 *data; }; -struct LockedAnimEventObjects +struct LockedAnimObjectEvents { - u8 eventObjectIds[EVENT_OBJECTS_COUNT]; + u8 objectEventIds[EVENT_OBJECTS_COUNT]; u8 count; }; -extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[]; -extern const struct OamData gEventObjectBaseOam_32x8; -extern const struct OamData gEventObjectBaseOam_32x32; +extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[]; +extern const struct OamData gObjectEventBaseOam_32x8; +extern const struct OamData gObjectEventBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; -extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; +extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[]; extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; extern const u8 *const gBerryTreePaletteSlotTablePointers[]; -void ResetEventObjects(void); +void ResetObjectEvents(void); u8 GetMoveDirectionAnimNum(u8); -u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); -bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *); -u8 GetEventObjectIdByXY(s16, s16); -void SetEventObjectDirection(struct EventObject *, u8); -u8 GetFirstInactiveEventObjectId(void); -void RemoveEventObjectByLocalIdAndMap(u8, u8, u8); +u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8); +bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *); +u8 GetObjectEventIdByXY(s16, s16); +void SetObjectEventDirection(struct ObjectEvent *, u8); +u8 GetFirstInactiveObjectEventId(void); +void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); -void TryMoveEventObjectToMapCoords(u8, u8, u8, s16, s16); +void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); void sub_808E16C(s16, s16); void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); void sub_80930E0(s16 *, s16 *, s16, s16); -void EventObjectClearHeldMovement(struct EventObject *); -void EventObjectClearHeldMovementIfActive(struct EventObject *); -void TrySpawnEventObjects(s16, s16); +void ObjectEventClearHeldMovement(struct ObjectEvent *); +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); +void TrySpawnObjectEvents(s16, s16); u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction); -u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); -u8 TrySpawnEventObject(u8, u8, u8); -u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); -u8 SpawnSpecialEventObject(struct EventObjectTemplate *); +u8 AddPseudoObjectEvent(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); +u8 TrySpawnObjectEvent(u8, u8, u8); +u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z); +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *); void CameraObjectReset1(void); -void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId); -void EventObjectTurn(struct EventObject *, u8); -void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8); -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId); +void ObjectEventSetGraphicsId(struct ObjectEvent *, u8 graphicsId); +void ObjectEventTurn(struct ObjectEvent *, u8); +void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void FreeAndReserveObjectSpritePalettes(void); void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup); -void ShiftEventObjectCoords(struct EventObject *, s16, s16); -void MoveEventObjectToMapCoords(struct EventObject *, s16, s16); -void TryOverrideEventObjectTemplateCoords(u8, u8, u8); -void InitEventObjectPalettes(u8 palSlot); -void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *)); -u8 EventObjectFaceOppositeDirection(struct EventObject *, u8); +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); +void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16); +void MoveObjectEventToMapCoords(struct ObjectEvent *, s16, s16); +void TryOverrideObjectEventTemplateCoords(u8, u8, u8); +void InitObjectEventPalettes(u8 palSlot); +void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *)); +u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8); u8 GetOppositeDirection(u8); u8 GetWalkInPlaceFastestMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceNormalMovementAction(u32); u8 GetWalkInPlaceSlowMovementAction(u32); -u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32); +u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32); void MoveCoords(u8, s16 *, s16 *); -bool8 EventObjectIsHeldMovementActive(struct EventObject *); -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *); -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z); -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType); +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *); +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z); +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType); u8 GetTrainerFacingDirectionMovementType(u8 direction); -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId); -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction); +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId); +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction); u8 GetFaceDirectionMovementAction(u32); u8 GetWalkNormalMovementAction(u32); u8 GetWalkFastMovementAction(u32); @@ -148,56 +148,56 @@ u8 GetFishingDirectionAnimNum(u8 direction); u8 GetAcroWheelieDirectionAnimNum(u8 direction); u8 GetFishingBiteDirectionAnimNum(u8 direction); u8 GetFishingNoCatchDirectionAnimNum(u8 direction); -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId); -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId); -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject); -u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject); -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject); -void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType); -void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject); -void ShiftStillEventObjectCoords(struct EventObject *pObject); -void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 specialAnimId); +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId); +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent); +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent); +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent); +void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType); +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent); +void ShiftStillObjectEventCoords(struct ObjectEvent *pObject); +void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1); u8 AddCameraObject(u8 linkedSpriteId); -void UpdateEventObjectsForCameraUpdate(s16 x, s16 y); +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y); u8 GetWalkSlowMovementAction(u32); u8 GetJumpMovementAction(u32); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8); -void EventObjectUpdateZCoord(struct EventObject *pObject); +void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8); bool8 IsZCoordMismatchAt(u8, s16, s16); -void UnfreezeEventObject(struct EventObject *); -u8 FindLockedEventObjectIndex(struct EventObject *); +void UnfreezeObjectEvent(struct ObjectEvent *); +u8 FindLockedObjectEventIndex(struct ObjectEvent *); bool8 obj_npc_ministep(struct Sprite *sprite); bool8 sub_80976EC(struct Sprite *sprite); void sub_80976DC(struct Sprite *, u8); void sub_809783C(struct Sprite *, u8, u8, u8); -void DoShadowFieldEffect(struct EventObject *); +void DoShadowFieldEffect(struct ObjectEvent *); u8 sub_809785C(struct Sprite *); u8 sub_80978E4(struct Sprite *); void SetAndStartSpriteAnim(struct Sprite *, u8, u8); bool8 SpriteAnimEnded(struct Sprite *); void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); -void CreateLevitateMovementTask(struct EventObject *); +void CreateLevitateMovementTask(struct ObjectEvent *); void DestroyExtraMovementTask(u8); -void UnfreezeEventObjects(void); -void FreezeEventObjectsExceptOne(u8 eventObjectId); +void UnfreezeObjectEvents(void); +void FreezeObjectEventsExceptOne(u8 objectEventId); void sub_8097B78(u8, u8); void sub_8098074(u8 var1, u8 var2); -void FreezeEventObjects(void); -bool8 FreezeEventObject(struct EventObject *eventObject); +void FreezeObjectEvents(void); +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent); u8 GetMoveDirectionFastAnimNum(u8); u8 GetMoveDirectionFasterAnimNum(u8); u8 GetMoveDirectionFastestAnimNum(u8); u8 GetLedgeJumpDirection(s16, s16, u8); void CameraObjectSetFollowedObjectId(u8 objectId); u16 GetObjectPaletteTag(u8 palSlot); -void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible); +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); s16 sub_809773C(s16 a1); s16 sub_8097728(s16 a1); void CameraObjectReset2(void); -u8 EventObjectGetBerryTreeId(u8 eventObjectId); +u8 ObjectEventGetBerryTreeId(u8 objectEventId); void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup); bool8 IsBerryTreeSparkling(u8, u8, u8); @@ -262,13 +262,13 @@ u8 GetJumpMovementAction(u32); u8 GetJump2MovementAction(u32); u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); -u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *); +u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *); u8 GetVectorDirection(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16); u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16); @@ -280,143 +280,143 @@ u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16); u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16); -u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *); -u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *); -bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8)); -bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8)); -u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *); -u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *); +u8 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *); +bool8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); +u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); void sub_8097C44(u8 var, bool32 var2); bool32 sub_8097C8C(u8 var); void sub_8097BB4(u8 var1, u8 graphicsId); diff --git a/include/faraway_island.h b/include/faraway_island.h index 4946bda8ad..084b5a2779 100755 --- a/include/faraway_island.h +++ b/include/faraway_island.h @@ -2,9 +2,9 @@ #define GUARD_FARAWAY_ISLAND_H u32 GetMewMoveDirection(void); -bool8 sub_81D4A58(struct EventObject*); +bool8 sub_81D4A58(struct ObjectEvent*); void UpdateFarawayIslandStepCounter(void); -bool8 EventObjectIsFarawayIslandMew(struct EventObject *); +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *); bool8 IsMewPlayingHideAndSeek(void); #endif // GUARD_FARAWAY_ISLAND_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index feb20cef6d..f722a60634 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -29,7 +29,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8); void overworld_poison_timer_set(void); void RestartWildEncounterImmunitySteps(void); u8 *sub_8068E24(struct MapPosition *); -const u8 *GetEventObjectScriptPointerPlayerFacing(void); +const u8 *GetObjectEventScriptPointerPlayerFacing(void); bool8 sub_8068870(u16 a); bool8 sub_8068894(void); bool8 sub_8068A64(struct MapPosition *, u16); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 6ea9771e61..8257bc110b 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -9,11 +9,11 @@ u8 CreateWarpArrowSprite(void); u8 sub_8155800(u8 oldSpriteId); void sub_81555AC(u8, u8); -bool8 sub_8155DA0(struct EventObject *); -void sub_8155D78(struct EventObject *); +bool8 sub_8155DA0(struct ObjectEvent *); +void sub_8155D78(struct ObjectEvent *); void StartAshFieldEffect(s16, s16, u16, s16); -void SetUpReflection(struct EventObject*, struct Sprite*, u8); -u32 StartFieldEffectForEventObject(u8, struct EventObject*); +void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8); +u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void sub_8155F80(struct Sprite*); void UpdateShadowFieldEffect(struct Sprite*); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 8d87779e6d..db045e540d 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a); void PlayerSetAnimId(u8 a, u8 b); bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction); void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction); -u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e); +u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e); u8 PlayerGetZCoord(void); void SetPlayerAvatarTransitionFlags(u16 a); void sub_808BCE8(void); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index de08fd1ec1..81f638c8d3 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -50,7 +50,7 @@ struct BackupMapLayout u16 *map; }; -struct EventObjectTemplate +struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; @@ -102,11 +102,11 @@ struct BgEvent struct MapEvents { - u8 eventObjectCount; + u8 objectEventCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; struct WarpEvent *warps; struct CoordEvent *coordEvents; struct BgEvent *bgEvents; @@ -143,7 +143,7 @@ struct MapHeader /* 0x1B */ u8 battleType; }; -struct EventObject +struct ObjectEvent { /*0x00*/ u32 active:1; u32 singleMovementActive:1; @@ -206,7 +206,7 @@ struct EventObject /*size = 0x24*/ }; -struct EventObjectGraphicsInfo +struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; /*0x02*/ u16 paletteTag1; @@ -298,7 +298,7 @@ struct PlayerAvatar /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving. /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning. /*0x04*/ u8 spriteId; - /*0x05*/ u8 eventObjectId; + /*0x05*/ u8 objectEventId; /*0x06*/ bool8 preventStep; /*0x07*/ u8 gender; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie @@ -320,8 +320,8 @@ struct Camera s32 y; }; -extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT]; -extern u8 gSelectedEventObject; +extern struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT]; +extern u8 gSelectedObjectEvent; extern struct MapHeader gMapHeader; extern struct PlayerAvatar gPlayerAvatar; extern struct Camera gCamera; diff --git a/include/global.h b/include/global.h index af33f13cb8..56899dc68d 100644 --- a/include/global.h +++ b/include/global.h @@ -918,8 +918,8 @@ struct SaveBlock1 /*0x9C2*/ u8 field_9C2[6]; /*0x9C8*/ u16 trainerRematchStepCounter; /*0x9CA*/ u8 trainerRematches[100]; - /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT]; - /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; + /*0xA30*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT]; + /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[EVENT_OBJECT_TEMPLATES_COUNT]; /*0x1270*/ u8 flags[FLAGS_COUNT]; /*0x139C*/ u16 vars[VARS_COUNT]; /*0x159C*/ u32 gameStats[NUM_GAME_STATS]; diff --git a/include/load_save.h b/include/load_save.h index bf50bffd75..2f4a9ace6b 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -22,8 +22,8 @@ void SetContinueGameWarpStatusToDynamicWarp(void); void ClearContinueGameWarpStatus2(void); void SavePlayerParty(void); void LoadPlayerParty(void); -void SaveEventObjects(void); -void LoadEventObjects(void); +void SaveObjectEvents(void); +void LoadObjectEvents(void); void SaveSerializedGame(void); void LoadSerializedGame(void); void LoadPlayerBag(void); diff --git a/include/overworld.h b/include/overworld.h index b860677014..dced95007e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -30,17 +30,17 @@ struct InitialPlayerAvatarState u8 direction; }; -struct LinkPlayerEventObject +struct LinkPlayerObjectEvent { u8 active; u8 linkPlayerId; - u8 eventObjId; + u8 objEventId; u8 movementMode; }; // Exported RAM declarations extern struct WarpData gLastUsedWarp; -extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4]; +extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; @@ -157,6 +157,6 @@ bool32 sub_8087598(void); bool32 sub_80875C8(void); bool32 sub_8087634(void); bool32 sub_808766C(void); -void ClearLinkPlayerEventObjects(void); +void ClearLinkPlayerObjectEvents(void); #endif // GUARD_OVERWORLD_H diff --git a/include/script.h b/include/script.h index 3f92964acd..f9fb09b5de 100644 --- a/include/script.h +++ b/include/script.h @@ -59,7 +59,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 const u8 *GetRamScript(u8 objectId, const u8 *script); bool32 ValidateSavedRamScript(void); u8 *GetSavedRamScriptIfValid(void); -void InitRamScript_NoEventObject(u8 *script, u16 scriptSize); +void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize); // srccmd.h void SetMovingNpcId(u16 npcId); diff --git a/include/script_movement.h b/include/script_movement.h index f9a97cf46f..03f8bf0b76 100644 --- a/include/script_movement.h +++ b/include/script_movement.h @@ -3,6 +3,6 @@ bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript); bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup); -void ScriptMovement_UnfreezeEventObjects(void); +void ScriptMovement_UnfreezeObjectEvents(void); #endif // GUARD_SCRIPT_MOVEMENT_H diff --git a/include/trainer_hill.h b/include/trainer_hill.h index c07aeb6d72..c849bcceda 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -60,15 +60,15 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId); bool8 InTrainerHillChallenge(void); void nullsub_129(void); void PrintOnTrainerHillRecordsWindow(void); -void LoadTrainerHillEventObjectTemplates(void); -bool32 LoadTrainerHillFloorEventObjectScripts(void); +void LoadTrainerHillObjectEventTemplates(void); +bool32 LoadTrainerHillFloorObjectEventScripts(void); void GenerateTrainerHillFloorLayout(u16 *mapArg); bool32 InTrainerHill(void); u8 GetCurrentTrainerHillMapId(void); const struct WarpEvent* SetWarpDestinationTrainerHill4F(void); const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId); u16 LocalIdToHillTrainerId(u8 localId); -bool8 GetHillTrainerFlag(u8 eventObjectId); +bool8 GetHillTrainerFlag(u8 objectEventId); void SetHillTrainerFlag(void); const u8 *GetTrainerHillTrainerScript(void); void FillHillTrainerParty(void); diff --git a/include/trainer_see.h b/include/trainer_see.h index daf9d02984..9d88e05fac 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -3,7 +3,7 @@ struct ApproachingTrainer { - u8 eventObjectId; + u8 objectEventId; u8 radius; // plus 1 const u8 *trainerScriptPtr; u8 taskId; @@ -17,14 +17,14 @@ extern bool8 gTrainerApproachedPlayer; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); -void sub_80B4578(struct EventObject *var); +void sub_80B4578(struct ObjectEvent *var); void EndTrainerApproach(void); void TryPrepareSecondApproachingTrainer(void); u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); -u8 GetCurrentApproachingTrainerEventObjectId(void); -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); +u8 GetCurrentApproachingTrainerObjectEventId(void); +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId); void PlayerFaceTrainerAfterBattle(void); #endif // GUARD_TRAINER_SEE_H diff --git a/src/apprentice.c b/src/apprentice.c index 189647991f..7b68cd25b3 100644 --- a/src/apprentice.c +++ b/src/apprentice.c @@ -1823,7 +1823,7 @@ static void PrintMessage(void) static void Script_PrintMessage(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); DrawDialogueFrame(0, 1); diff --git a/src/battle_pike.c b/src/battle_pike.c index 36bf8dcbff..85a214b0f5 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -52,7 +52,7 @@ static void SetRoomType(void); static void GetBattlePikeData(void); static void SetBattlePikeData(void); static void GetInFinalRoom(void); -static void SetupRoomEventObjects(void); +static void SetupRoomObjectEvents(void); static void GetRoomType(void); static void sub_81A7400(void); static void sub_81A740C(void); @@ -483,7 +483,7 @@ static void (* const sBattlePikeFunctions[])(void) = GetBattlePikeData, SetBattlePikeData, GetInFinalRoom, - SetupRoomEventObjects, + SetupRoomObjectEvents, GetRoomType, sub_81A7400, sub_81A740C, @@ -551,7 +551,7 @@ static void SetRoomType(void) sRoomType = roomType; } -static void SetupRoomEventObjects(void) +static void SetupRoomObjectEvents(void) { bool32 setObjGfx1, setObjGfx2; u32 objGfx1; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 6dcd4063bf..b8e8dca76d 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -95,8 +95,8 @@ static void GetPyramidEntranceAndExitSquareIds(u8 *, u8 *); static void SetPyramidObjectPositionsUniformly(u8); static bool8 SetPyramidObjectPositionsInAndNearSquare(u8, u8); static bool8 SetPyramidObjectPositionsNearSquare(u8, u8); -static bool8 TrySetPyramidEventObjectPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); -static bool8 TrySetPyramidEventObjectPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId); +static bool8 TrySetPyramidObjectEventPositionInSquare(u8 arg0, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId); +static bool8 TrySetPyramidObjectEventPositionAtCoords(bool8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId); // Const rom data. #define ABILITY_RANDOM 2 // For wild mons data. @@ -1008,14 +1008,14 @@ static void SetPickupItem(void) static void HidePyramidItem(void) { - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; int i = 0; for (;;) { if (events[i].localId == gSpecialVar_LastTalked) { - // Rather than using event flags to hide the item event object, + // Rather than using event flags to hide the item object event, // it moves them far off the map bounds. events[i].x = 0x7FFF; events[i].y = 0x7FFF; @@ -1039,8 +1039,8 @@ static void ShowPostBattleHintText(void) u8 id; int textGroup = 0; int textIndex = 0; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; - u16 trainerId = LocalIdToPyramidTrainerId(gEventObjects[gSelectedEventObject].localId); + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; + u16 trainerId = LocalIdToPyramidTrainerId(gObjectEvents[gSelectedObjectEvent].localId); for (i = 0; i < ARRAY_COUNT(sTrainerTextGroups); i++) { @@ -1051,7 +1051,7 @@ static void ShowPostBattleHintText(void) } } - hintType = sHintTextTypes[gEventObjects[gSelectedEventObject].localId - 1]; + hintType = sHintTextTypes[gObjectEvents[gSelectedObjectEvent].localId - 1]; i = 0; while (!i) { @@ -1062,7 +1062,7 @@ static void ShowPostBattleHintText(void) i = 1; break; case HINT_REMAINING_ITEMS: - for (i = 0; i < GetNumBattlePyramidEventObjects(); i++) + for (i = 0; i < GetNumBattlePyramidObjectEvents(); i++) { if (events[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL && events[i].x != 0x7FFF && events[i].y != 0x7FFF) textIndex++; @@ -1241,8 +1241,8 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx { if ((map[x] & METATILE_ID_MASK) == FLOOR_EXIT_METATILE) { - x += 7 - gEventObjects[gSelectedEventObject].initialCoords.x; - y += 7 - gEventObjects[gSelectedEventObject].initialCoords.y; + x += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.x; + y += 7 - gObjectEvents[gSelectedObjectEvent].initialCoords.y; if (x >= minDistanceForExitHint || x <= -minDistanceForExitHint || y >= minDistanceForExitHint @@ -1309,7 +1309,7 @@ u16 LocalIdToPyramidTrainerId(u8 localId) bool8 GetBattlePyramidTrainerFlag(u8 eventId) { - return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gEventObjects[eventId].localId - 1]; + return gSaveBlock2Ptr->frontier.pyramidTrainerFlags & gBitTable[gObjectEvents[eventId].localId - 1]; } void MarkApproachingPyramidTrainersAsBattled(void) @@ -1317,7 +1317,7 @@ void MarkApproachingPyramidTrainersAsBattled(void) MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_A); if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { - gSelectedEventObject = GetChosenApproachingTrainerEventObjectId(1); + gSelectedObjectEvent = GetChosenApproachingTrainerObjectEventId(1); MarkPyramidTrainerAsBattled(gTrainerBattleOpponent_B); } } @@ -1332,10 +1332,10 @@ static void MarkPyramidTrainerAsBattled(u16 trainerId) gSaveBlock2Ptr->frontier.pyramidTrainerFlags |= gBitTable[i]; } - gEventObjects[gSelectedEventObject].movementType = MOVEMENT_TYPE_WANDER_AROUND; - gSaveBlock1Ptr->eventObjectTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; - gEventObjects[gSelectedEventObject].initialCoords.x = gEventObjects[gSelectedEventObject].currentCoords.x; - gEventObjects[gSelectedEventObject].initialCoords.y = gEventObjects[gSelectedEventObject].currentCoords.y; + gObjectEvents[gSelectedObjectEvent].movementType = MOVEMENT_TYPE_WANDER_AROUND; + gSaveBlock1Ptr->objectEventTemplates[gSpecialVar_LastTalked - 1].movementType = MOVEMENT_TYPE_WANDER_AROUND; + gObjectEvents[gSelectedObjectEvent].initialCoords.x = gObjectEvents[gSelectedObjectEvent].currentCoords.x; + gObjectEvents[gSelectedObjectEvent].initialCoords.y = gObjectEvents[gSelectedObjectEvent].currentCoords.y; } void GenerateBattlePyramidWildMon(void) @@ -1478,7 +1478,7 @@ void sub_81A9F80(void) ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); } -static u16 GetUniqueTrainerId(u8 eventObjectId) +static u16 GetUniqueTrainerId(u8 objectEventId) { int i; u16 trainerId; @@ -1490,24 +1490,24 @@ static u16 GetUniqueTrainerId(u8 eventObjectId) do { trainerId = sub_8162548(challengeNum + 1, battleNum); - for (i = 0; i < eventObjectId; i++) + for (i = 0; i < objectEventId; i++) { if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != eventObjectId); + } while (i != objectEventId); } else { do { trainerId = sub_8162548(challengeNum, battleNum); - for (i = 0; i < eventObjectId; i++) + for (i = 0; i < objectEventId; i++) { if (gSaveBlock2Ptr->frontier.trainerIds[i] == trainerId) break; } - } while (i != eventObjectId); + } while (i != objectEventId); } return trainerId; @@ -1566,7 +1566,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio free(floorLayoutOffsets); } -void LoadBattlePyramidEventObjectTemplates(void) +void LoadBattlePyramidObjectEventTemplates(void) { int i; u8 id; @@ -1577,7 +1577,7 @@ void LoadBattlePyramidEventObjectTemplates(void) id = GetPyramidFloorTemplateId(); GetPyramidEntranceAndExitSquareIds(&entranceSquareId, &exitSquareId); - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); for (i = 0; i < 2; i++) { u8 objectPositionsType; @@ -1612,10 +1612,10 @@ void LoadBattlePyramidEventObjectTemplates(void) } } -void LoadBattlePyramidFloorEventObjectScripts(void) +void LoadBattlePyramidFloorObjectEventScripts(void) { int i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { @@ -1689,7 +1689,7 @@ static void SetPyramidObjectPositionsUniformly(u8 objType) } } while (!(bits & 2)); - } while (!(bits & 4) && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); + } while (!(bits & 4) && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)); bits &= 1; } free(floorLayoutOffsets); @@ -1722,14 +1722,14 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) { if (r7 == 0) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, squareId, objectStartIndex + i)) r7 = 1; else numPlacedObjects++; } if (r7 & 1) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)) { do { @@ -1737,7 +1737,7 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId) if (sBorderedSquareIds[squareId][borderedIndex] == 0xFF || borderedIndex >= 4) borderedIndex = 0; r7 += 2; - } while (r7 >> 1 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); + } while (r7 >> 1 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderedIndex], objectStartIndex + i)); numPlacedObjects++; } else @@ -1784,7 +1784,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) for (i = 0; i < numObjects; i++) { - if (TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) + if (TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)) { do { @@ -1792,7 +1792,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) if (sBorderedSquareIds[squareId][borderOffset] == 0xFF || borderOffset >= 4) borderOffset = 0; r8++; - } while (r8 != 4 && TrySetPyramidEventObjectPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); + } while (r8 != 4 && TrySetPyramidObjectEventPositionInSquare(objType, floorLayoutOffsets, sBorderedSquareIds[squareId][borderOffset], objectStartIndex + i)); numPlacedObjects++; } else @@ -1811,7 +1811,7 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId) return (numObjects / 2) > numPlacedObjects; } -static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidObjectEventPositionInSquare(u8 objType, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId) { int x, y; @@ -1821,7 +1821,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou { for (x = 7; x > -1; x--) { - if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId)) return FALSE; } } @@ -1832,7 +1832,7 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou { for (x = 0; x < 8; x++) { - if (!TrySetPyramidEventObjectPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, eventObjectId)) + if (!TrySetPyramidObjectEventPositionAtCoords(objType, x, y, floorLayoutOffsets, squareId, objectEventId)) return FALSE; } } @@ -1841,42 +1841,42 @@ static bool8 TrySetPyramidEventObjectPositionInSquare(u8 objType, u8 *floorLayou return TRUE; } -static bool8 TrySetPyramidEventObjectPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 eventObjectId) +static bool8 TrySetPyramidObjectEventPositionAtCoords(u8 objType, u8 x, u8 y, u8 *floorLayoutOffsets, u8 squareId, u8 objectEventId) { int i, j; const struct MapHeader *mapHeader; - struct EventObjectTemplate *floorEvents = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *floorEvents = gSaveBlock1Ptr->objectEventTemplates; mapHeader = Overworld_GetMapHeaderByGroupAndId(MAP_GROUP(BATTLE_PYRAMID_SQUARE01), floorLayoutOffsets[squareId] + MAP_NUM(BATTLE_PYRAMID_SQUARE01)); - for (i = 0; i < mapHeader->events->eventObjectCount; i++) + for (i = 0; i < mapHeader->events->objectEventCount; i++) { - if (mapHeader->events->eventObjects[i].x != x || mapHeader->events->eventObjects[i].y != y) + if (mapHeader->events->objectEvents[i].x != x || mapHeader->events->objectEvents[i].y != y) continue; - if (objType != OBJ_TRAINERS || mapHeader->events->eventObjects[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_TRAINERS || mapHeader->events->objectEvents[i].graphicsId == EVENT_OBJ_GFX_ITEM_BALL) { - if (objType != OBJ_ITEMS || mapHeader->events->eventObjects[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + if (objType != OBJ_ITEMS || mapHeader->events->objectEvents[i].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) continue; } // Ensure an object wasn't previously placed in the exact same position. - for (j = 0; j < eventObjectId; j++) + for (j = 0; j < objectEventId; j++) { if (floorEvents[j].x == x + ((squareId % 4) * 8) && floorEvents[j].y == y + ((squareId / 4) * 8)) break; } - if (j == eventObjectId) + if (j == objectEventId) { - floorEvents[eventObjectId] = mapHeader->events->eventObjects[i]; - floorEvents[eventObjectId].x += (squareId % 4) * 8; - floorEvents[eventObjectId].y += (squareId / 4) * 8; - floorEvents[eventObjectId].localId = eventObjectId + 1; - if (floorEvents[eventObjectId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) + floorEvents[objectEventId] = mapHeader->events->objectEvents[i]; + floorEvents[objectEventId].x += (squareId % 4) * 8; + floorEvents[objectEventId].y += (squareId / 4) * 8; + floorEvents[objectEventId].localId = objectEventId + 1; + if (floorEvents[objectEventId].graphicsId != EVENT_OBJ_GFX_ITEM_BALL) { - i = GetUniqueTrainerId(eventObjectId); - floorEvents[eventObjectId].graphicsId = GetBattleFacilityTrainerGfxId(i); - gSaveBlock2Ptr->frontier.trainerIds[eventObjectId] = i; + i = GetUniqueTrainerId(objectEventId); + floorEvents[objectEventId].graphicsId = GetBattleFacilityTrainerGfxId(i); + gSaveBlock2Ptr->frontier.trainerIds[objectEventId] = i; } return FALSE; } @@ -1917,10 +1917,10 @@ static u8 GetPyramidFloorTemplateId(void) return 0; } -u8 GetNumBattlePyramidEventObjects(void) +u8 GetNumBattlePyramidObjectEvents(void) { u8 i; - struct EventObjectTemplate *events = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *events = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < 16; i++) { diff --git a/src/battle_setup.c b/src/battle_setup.c index b98b5df06f..c63d38e706 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -91,7 +91,7 @@ EWRAM_DATA static u16 sTrainerBattleMode = 0; EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; EWRAM_DATA u16 gPartnerTrainerId = 0; -EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0; +EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0; EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL; EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL; @@ -145,7 +145,7 @@ static const struct TrainerBattleParameter sOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -158,7 +158,7 @@ static const struct TrainerBattleParameter sContinueScriptBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -171,7 +171,7 @@ static const struct TrainerBattleParameter sDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -184,7 +184,7 @@ static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -197,7 +197,7 @@ static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -210,7 +210,7 @@ static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] = { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -223,7 +223,7 @@ static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[] { {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, - {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, @@ -384,7 +384,7 @@ void BattleSetup_StartBattlePikeWildBattle(void) static void DoStandardWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = 0; @@ -403,7 +403,7 @@ static void DoStandardWildBattle(void) void BattleSetup_StartRoamerBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; @@ -417,7 +417,7 @@ void BattleSetup_StartRoamerBattle(void) static void DoSafariBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndSafariBattle; gBattleTypeFlags = BATTLE_TYPE_SAFARI; @@ -427,7 +427,7 @@ static void DoSafariBattle(void) static void DoBattlePikeWildBattle(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808BCF4(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_PIKE; @@ -1008,7 +1008,7 @@ static void InitTrainerBattleVariables(void) sTrainerBDefeatSpeech = NULL; sTrainerBBattleScriptRetAddr = NULL; } - sTrainerEventObjectLocalId = 0; + sTrainerObjectEventLocalId = 0; sTrainerVictorySpeech = NULL; sTrainerCannotBattleSpeech = NULL; sTrainerBattleEndScript = NULL; @@ -1071,10 +1071,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co void SetMapVarsToTrainer(void) { - if (sTrainerEventObjectLocalId != 0) + if (sTrainerObjectEventLocalId != 0) { - gSpecialVar_LastTalked = sTrainerEventObjectLocalId; - gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + gSpecialVar_LastTalked = sTrainerObjectEventLocalId; + gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } @@ -1170,8 +1170,8 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerEventObjId; + gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); ScriptContext1_SetupScript(EventScript_271354); ScriptContext2_Enable(); @@ -1179,8 +1179,8 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerSc void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript) { - gSelectedEventObject = trainerEventObjId; - gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId; + gSelectedObjectEvent = trainerEventObjId; + gSpecialVar_LastTalked = gObjectEvents[trainerEventObjId].localId; BattleSetup_ConfigureTrainerBattle(trainerScript + 1); } @@ -1198,9 +1198,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data) void SetUpTrainerMovement(void) { - struct EventObject *eventObject = &gEventObjects[gSelectedEventObject]; + struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent]; - SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); + SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection)); } u8 GetTrainerBattleMode(void) @@ -1211,9 +1211,9 @@ u8 GetTrainerBattleMode(void) bool8 GetTrainerFlag(void) { if (InBattlePyramid()) - return GetBattlePyramidTrainerFlag(gSelectedEventObject); + return GetBattlePyramidTrainerFlag(gSelectedObjectEvent); else if (InTrainerHill()) - return GetHillTrainerFlag(gSelectedEventObject); + return GetHillTrainerFlag(gSelectedObjectEvent); else return FlagGet(GetTrainerAFlag()); } @@ -1358,7 +1358,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gSpecialVar_LastTalked)); else - CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyPyramidTrainerSpeechBefore(LocalIdToPyramidTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId)); sub_80982B8(); } @@ -1367,7 +1367,7 @@ void ShowTrainerIntroSpeech(void) if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gSpecialVar_LastTalked)); else - CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gEventObjects[gApproachingTrainers[gApproachingTrainerId].eventObjectId].localId)); + CopyTrainerHillTrainerText(TRAINER_HILL_TEXT_INTRO, LocalIdToHillTrainerId(gObjectEvents[gApproachingTrainers[gApproachingTrainerId].objectEventId].localId)); sub_80982B8(); } diff --git a/src/battle_tower.c b/src/battle_tower.c index 27fdc9d6e7..e1d54f0532 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2508,9 +2508,9 @@ static void sub_81642A0(void) s32 challengeNum; u32 species1, species2; u32 level; - struct EventObjectTemplate *eventObjTemplates; + struct ObjectEventTemplate *objEventTemplates; - eventObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + objEventTemplates = gSaveBlock1Ptr->objectEventTemplates; lvlMode = gSaveBlock2Ptr->frontier.lvlMode; battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7; @@ -2540,7 +2540,7 @@ static void sub_81642A0(void) for (i = 0; i < 6; i++) { trainerId = gSaveBlock2Ptr->frontier.trainerIds[i]; - eventObjTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); + objEventTemplates[i + 1].graphicsId = GetBattleFacilityTrainerGfxId(trainerId); for (j = 0; j < 2; j++) { while (1) @@ -2594,7 +2594,7 @@ static void sub_81642A0(void) if (r10 != 0) { gSaveBlock2Ptr->frontier.trainerIds[6] = spArray[Random() % r10]; - eventObjTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); + objEventTemplates[7].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[6]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1); sub_81640E0(gSaveBlock2Ptr->frontier.trainerIds[6]); } @@ -2637,7 +2637,7 @@ static void sub_81642A0(void) if (r10 != 0) { gSaveBlock2Ptr->frontier.trainerIds[7] = spArray[Random() % r10]; - eventObjTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); + objEventTemplates[8].graphicsId = GetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[7]); FlagClear(FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2); sub_8164188(gSaveBlock2Ptr->frontier.trainerIds[7]); } diff --git a/src/battle_transition.c b/src/battle_transition.c index c344190489..df1d7b02be 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -750,7 +750,7 @@ static const struct SpriteTemplate gUnknown_085C8E68 = { .tileTag = 0xFFFF, .paletteTag = 4105, - .oam = &gEventObjectBaseOam_32x32, + .oam = &gObjectEventBaseOam_32x32, .anims = sSpriteAnimTable_85C8E3C, .images = sSpriteImageTable_85C8E2C, .affineAnims = sSpriteAffineAnimTable_85C8E60, diff --git a/src/berry.c b/src/berry.c index bbaa2b03ba..4c8662e08d 100644 --- a/src/berry.c +++ b/src/berry.c @@ -995,9 +995,9 @@ struct BerryTree *GetBerryTreeInfo(u8 id) return &gSaveBlock1Ptr->berryTrees[id]; } -bool32 EventObjectInteractionWaterBerryTree(void) +bool32 ObjectEventInteractionWaterBerryTree(void) { - struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject)); + struct BerryTree *tree = GetBerryTreeInfo(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); switch (tree->stage) { @@ -1021,8 +1021,8 @@ bool32 EventObjectInteractionWaterBerryTree(void) bool8 IsPlayerFacingEmptyBerryTreePatch(void) { - if (GetEventObjectScriptPointerPlayerFacing() == BerryTreeScript - && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY) + if (GetObjectEventScriptPointerPlayerFacing() == BerryTreeScript + && GetStageByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)) == BERRY_STAGE_NO_BERRY) return TRUE; else return FALSE; @@ -1030,10 +1030,10 @@ bool8 IsPlayerFacingEmptyBerryTreePatch(void) bool8 TryToWaterBerryTree(void) { - if (GetEventObjectScriptPointerPlayerFacing() != BerryTreeScript) + if (GetObjectEventScriptPointerPlayerFacing() != BerryTreeScript) return FALSE; else - return EventObjectInteractionWaterBerryTree(); + return ObjectEventInteractionWaterBerryTree(); } void ClearBerryTrees(void) @@ -1242,7 +1242,7 @@ static u16 GetStageDurationByBerryType(u8 berry) return GetBerryInfo(berry)->stageDuration * 60; } -void EventObjectInteractionGetBerryTreeData(void) +void ObjectEventInteractionGetBerryTreeData(void) { u8 id; u8 berry; @@ -1250,7 +1250,7 @@ void EventObjectInteractionGetBerryTreeData(void) u8 group; u8 num; - id = EventObjectGetBerryTreeId(gSelectedEventObject); + id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); localId = gSpecialVar_LastTalked; @@ -1265,15 +1265,15 @@ void EventObjectInteractionGetBerryTreeData(void) GetBerryCountStringByBerryType(berry, gStringVar1, gSpecialVar_0x8006); } -void EventObjectInteractionGetBerryName(void) +void ObjectEventInteractionGetBerryName(void) { - u8 berryType = GetBerryTypeByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)); + u8 berryType = GetBerryTypeByBerryTreeId(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); GetBerryNameByBerryType(berryType, gStringVar1); } -void EventObjectInteractionGetBerryCountString(void) +void ObjectEventInteractionGetBerryCountString(void) { - u8 treeId = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 treeId = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(treeId); u8 count = GetBerryCountByBerryTreeId(treeId); GetBerryCountStringByBerryType(berry, gStringVar1, count); @@ -1284,25 +1284,25 @@ void Bag_ChooseBerry(void) SetMainCallback2(CB2_ChooseBerry); } -void EventObjectInteractionPlantBerryTree(void) +void ObjectEventInteractionPlantBerryTree(void) { u8 berry = ItemIdToBerryType(gSpecialVar_ItemId); - PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE); - EventObjectInteractionGetBerryTreeData(); + PlantBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent), berry, 1, TRUE); + ObjectEventInteractionGetBerryTreeData(); } -void EventObjectInteractionPickBerryTree(void) +void ObjectEventInteractionPickBerryTree(void) { - u8 id = EventObjectGetBerryTreeId(gSelectedEventObject); + u8 id = ObjectEventGetBerryTreeId(gSelectedObjectEvent); u8 berry = GetBerryTypeByBerryTreeId(id); gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } -void EventObjectInteractionRemoveBerryTree(void) +void ObjectEventInteractionRemoveBerryTree(void) { - RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject)); + RemoveBerryTree(ObjectEventGetBerryTreeId(gSelectedObjectEvent)); sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } @@ -1328,12 +1328,12 @@ void ResetBerryTreeSparkleFlags(void) bottom = top + 8; for (i = 0; i < EVENT_OBJECTS_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 fad61ffabb..615b87a0b8 100644 --- a/src/bike.c +++ b/src/bike.c @@ -46,7 +46,7 @@ static void Bike_UpdateDirTimerHistory(u8); static void Bike_UpdateABStartSelectHistory(u8); static u8 Bike_DPadToDirection(u16); static u8 GetBikeCollision(u8); -static u8 GetBikeCollisionAt(struct EventObject *, s16, s16, u8, u8); +static u8 GetBikeCollisionAt(struct ObjectEvent *, s16, s16, u8, u8); static bool8 IsRunningDisallowedByMetatile(u8); static void Bike_TryAdvanceCyclingRoadCollisions(); static u8 CanBikeFaceDirOnMetatile(u8, u8); @@ -186,7 +186,7 @@ static void MachBikeTransition_FaceDirection(u8 direction) static void MachBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior)) { @@ -201,7 +201,7 @@ static void MachBikeTransition_TurnDirection(u8 direction) static void MachBikeTransition_TrySpeedUp(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; u8 collision; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE) @@ -366,10 +366,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; gPlayerAvatar.runningState = NOT_MOVING; if (heldKeys & B_BUTTON) @@ -413,10 +413,10 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys) { u8 direction; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; direction = GetPlayerMovementDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // B button was released @@ -460,10 +460,10 @@ 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 *playerEventObj; direction = GetPlayerFacingDirection(); - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!(heldKeys & B_BUTTON)) { // we were moving on a wheelie, but we let go while moving. reset bike still status @@ -514,10 +514,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->facingDirectionLocked = 0; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL; return CheckMovementInputAcroBike(ptr, newKeys, heldKeys); } @@ -535,7 +535,7 @@ static void AcroBikeTransition_FaceDirection(u8 direction) static void AcroBikeTransition_TurnDirection(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -545,7 +545,7 @@ static void AcroBikeTransition_TurnDirection(u8 direction) static void AcroBikeTransition_Moving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -570,7 +570,7 @@ static void AcroBikeTransition_Moving(u8 direction) static void AcroBikeTransition_NormalToWheelie(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -579,7 +579,7 @@ static void AcroBikeTransition_NormalToWheelie(u8 direction) static void AcroBikeTransition_WheelieToNormal(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -588,7 +588,7 @@ static void AcroBikeTransition_WheelieToNormal(u8 direction) static void AcroBikeTransition_WheelieIdle(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -597,7 +597,7 @@ static void AcroBikeTransition_WheelieIdle(u8 direction) static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) direction = playerEventObj->movementDirection; @@ -607,7 +607,7 @@ static void AcroBikeTransition_WheelieHoppingStanding(u8 direction) static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -641,7 +641,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction) static void AcroBikeTransition_SideJump(u8 direction) { u8 collision; - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; collision = GetBikeCollision(direction); if (collision) @@ -659,7 +659,7 @@ static void AcroBikeTransition_SideJump(u8 direction) return; } } - playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; PlaySE(SE_JITE_PYOKO); playerEventObj->facingDirectionLocked = 1; PlayerSetAnimId(GetJumpMovementAction(direction), 2); @@ -673,7 +673,7 @@ static void AcroBikeTransition_TurnJump(u8 direction) static void AcroBikeTransition_WheelieMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -707,7 +707,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction) static void AcroBikeTransition_WheelieRisingMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -741,7 +741,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction) static void AcroBikeTransition_WheelieLoweringMoving(u8 direction) { u8 collision; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0) { @@ -868,7 +868,7 @@ static u8 Bike_DPadToDirection(u16 heldKeys) static u8 GetBikeCollision(u8 direction) { u8 metatitleBehavior; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; s16 x = playerEventObj->currentCoords.x; s16 y = playerEventObj->currentCoords.y; MoveCoords(direction, &x, &y); @@ -876,9 +876,9 @@ static u8 GetBikeCollision(u8 direction) return GetBikeCollisionAt(playerEventObj, x, y, direction, metatitleBehavior); } -static u8 GetBikeCollisionAt(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior) +static u8 GetBikeCollisionAt(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatitleBehavior) { - u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior); + u8 collision = CheckForObjectEventCollision(objectEvent, x, y, direction, metatitleBehavior); if (collision > COLLISION_EVENT_OBJECT) return collision; @@ -966,7 +966,7 @@ bool8 IsBikingDisallowedByPlayer(void) bool8 player_should_look_direction_be_enforced_upon_movement(void) { - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE) + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) != FALSE) return FALSE; else return TRUE; diff --git a/src/cable_car.c b/src/cable_car.c index c6e7e724e7..25ebf91091 100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -797,7 +797,7 @@ static void LoadCableCarSprites(void) { case 0: default: - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 200, 73, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -821,7 +821,7 @@ static void LoadCableCarSprites(void) break; case 1: CopyToBgTilemapBufferRect_ChangePalette(0, sCableCar->mtChimneyTilemap + 0x24, 24, 26, 12, 3, 17); - spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); + spriteId = AddPseudoObjectEvent(playerGraphicsIds[gSaveBlock2Ptr->playerGender], sub_8150948, 128, 39, 102); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; @@ -852,7 +852,7 @@ static void LoadCableCarSprites(void) } if ((rval % 64) == 0) { - spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); + spriteId = AddPseudoObjectEvent(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 2; diff --git a/src/data/field_event_obj/base_oam.h b/src/data/event_object/base_oam.h similarity index 63% rename from src/data/field_event_obj/base_oam.h rename to src/data/event_object/base_oam.h index af961f492f..f74feca32f 100755 --- a/src/data/field_event_obj/base_oam.h +++ b/src/data/event_object/base_oam.h @@ -1,46 +1,46 @@ -const struct OamData gEventObjectBaseOam_8x8 = { +const struct OamData gObjectEventBaseOam_8x8 = { .shape = SPRITE_SHAPE(8x8), .size = SPRITE_SIZE(8x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x8 = { +const struct OamData gObjectEventBaseOam_16x8 = { .shape = SPRITE_SHAPE(16x8), .size = SPRITE_SIZE(16x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x16 = { +const struct OamData gObjectEventBaseOam_16x16 = { .shape = SPRITE_SHAPE(16x16), .size = SPRITE_SIZE(16x16), .priority = 2 }; -const struct OamData gEventObjectBaseOam_32x8 = { +const struct OamData gObjectEventBaseOam_32x8 = { .shape = SPRITE_SHAPE(32x8), .size = SPRITE_SIZE(32x8), .priority = 2 }; -const struct OamData gEventObjectBaseOam_64x32 = { +const struct OamData gObjectEventBaseOam_64x32 = { .shape = SPRITE_SHAPE(64x32), .size = SPRITE_SIZE(64x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_16x32 = { +const struct OamData gObjectEventBaseOam_16x32 = { .shape = SPRITE_SHAPE(16x32), .size = SPRITE_SIZE(16x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_32x32 = { +const struct OamData gObjectEventBaseOam_32x32 = { .shape = SPRITE_SHAPE(32x32), .size = SPRITE_SIZE(32x32), .priority = 2 }; -const struct OamData gEventObjectBaseOam_64x64 = { +const struct OamData gObjectEventBaseOam_64x64 = { .shape = SPRITE_SHAPE(64x64), .size = SPRITE_SIZE(64x64), .priority = 2 diff --git a/src/data/event_object/berry_tree_graphics_tables.h b/src/data/event_object/berry_tree_graphics_tables.h new file mode 100755 index 0000000000..75c4bd03c0 --- /dev/null +++ b/src/data/event_object/berry_tree_graphics_tables.h @@ -0,0 +1,565 @@ +const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PechaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_KelpsyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_KelpsyBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_WepearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WepearBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_IapapaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_IapapaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_CheriBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CheriBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_FigyBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_FigyBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_MagoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_MagoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LumBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LumBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_RazzBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RazzBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_GrepaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_GrepaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RabutaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RabutaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_NomelBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_NomelBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LeppaBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LeppaBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_LiechiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LiechiBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_HondewBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_HondewBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; + +const struct SpriteFrameImage gObjectEventPicTable_AguavBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AguavBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_WikiBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_WikiBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PomegBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PomegBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_RawstBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_RawstBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_SpelonBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SpelonBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_ChestoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_ChestoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_OranBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_OranBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_PersimBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PersimBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_SitrusBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_SitrusBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_AspearBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_AspearBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; + +const struct SpriteFrameImage gObjectEventPicTable_PamtreBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_PamtreBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_CornnBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_CornnBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_LansatBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_LansatBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; + +const struct SpriteFrameImage gObjectEventPicTable_DurinBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_DurinBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; + +const struct SpriteFrameImage gObjectEventPicTable_TamatoBerryTree[] = { + overworld_frame(gObjectEventPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gObjectEventPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gObjectEventPic_TamatoBerryTree, 2, 4, 5), +}; + +const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; + +const u8 gDeadBerryTreeObjectEventGraphicsIdTable[] = {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 gBerryTreeObjectEventGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; + +const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CheriBerryTree, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_ChestoBerryTree, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PechaBerryTree, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RawstBerryTree, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AspearBerryTree, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LeppaBerryTree, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_OranBerryTree, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PersimBerryTree, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LumBerryTree, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SitrusBerryTree, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_FigyBerryTree, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WikiBerryTree, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RazzBerryTree, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_MagoBerryTree, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_IapapaBerryTree, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_KelpsyBerryTree, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_WepearBerryTree, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_TamatoBerryTree, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_NomelBerryTree, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_SpelonBerryTree, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PamtreBerryTree, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_RabutaBerryTree, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LiechiBerryTree, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_HondewBerryTree, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_AguavBerryTree, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_PomegBerryTree, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_GrepaBerryTree, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_LansatBerryTree, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_CornnBerryTree, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gObjectEventPicTable_DurinBerryTree, +}; + +const u8 *const gBerryTreePaletteSlotTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, +}; + +const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + // 3 unused berries. + [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, + [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable, +}; diff --git a/src/data/event_object/event_object_anims.h b/src/data/event_object/event_object_anims.h new file mode 100755 index 0000000000..b319c2845f --- /dev/null +++ b/src/data/event_object/event_object_anims.h @@ -0,0 +1,1171 @@ +const union AnimCmd gObjectEventImageAnim_StayStill[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpFaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(3, 8, .hFlip = TRUE), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoNorth[] = +{ + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(4, 8, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoWest[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoEast[] = +{ + ANIMCMD_FRAME(5, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(6, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(4, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastWest[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastEast[] = +{ + ANIMCMD_FRAME(5, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(6, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(3, 2, .hFlip = TRUE), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterNorth[] = +{ + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(4, 2, .hFlip = TRUE), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterWest[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFasterEast[] = +{ + ANIMCMD_FRAME(5, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(6, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(3, 1, .hFlip = TRUE), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestNorth[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(4, 1, .hFlip = TRUE), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestWest[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_QuintyPlumpGoFastestEast[] = +{ + ANIMCMD_FRAME(5, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(6, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceSouth[] = +{ + ANIMCMD_FRAME(0, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceNorth[] = +{ + ANIMCMD_FRAME(1, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceWest[] = +{ + ANIMCMD_FRAME(2, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FaceEast[] = +{ + ANIMCMD_FRAME(2, 16, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoSouth[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoNorth[] = +{ + ANIMCMD_FRAME(5, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(6, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoWest[] = +{ + ANIMCMD_FRAME(7, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(8, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoEast[] = +{ + ANIMCMD_FRAME(7, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(8, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastSouth[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastNorth[] = +{ + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastWest[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastEast[] = +{ + ANIMCMD_FRAME(7, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(8, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterSouth[] = +{ + ANIMCMD_FRAME(3, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(4, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterNorth[] = +{ + ANIMCMD_FRAME(5, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(6, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterWest[] = +{ + ANIMCMD_FRAME(7, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_FRAME(8, 2), + ANIMCMD_FRAME(2, 2), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFasterEast[] = +{ + ANIMCMD_FRAME(7, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_FRAME(8, 2, .hFlip = TRUE), + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestSouth[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(4, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestNorth[] = +{ + ANIMCMD_FRAME(5, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(6, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestWest[] = +{ + ANIMCMD_FRAME(7, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_FRAME(8, 1), + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GoFastestEast[] = +{ + ANIMCMD_FRAME(7, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_FRAME(8, 1, .hFlip = TRUE), + ANIMCMD_FRAME(2, 1, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunSouth[] = +{ + ANIMCMD_FRAME(12, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_FRAME(13, 5), + ANIMCMD_FRAME(9, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunNorth[] = +{ + ANIMCMD_FRAME(14, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_FRAME(15, 5), + ANIMCMD_FRAME(10, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunWest[] = +{ + ANIMCMD_FRAME(16, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_FRAME(17, 5), + ANIMCMD_FRAME(11, 3), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_RunEast[] = +{ + ANIMCMD_FRAME(16, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_FRAME(17, 5, .hFlip = TRUE), + ANIMCMD_FRAME(11, 3, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_FieldMove[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(4, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobSouth[] = +{ + ANIMCMD_FRAME(9, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobNorth[] = +{ + ANIMCMD_FRAME(10, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobWest[] = +{ + ANIMCMD_FRAME(11, 32), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_GetOnOffSurfBlobEast[] = +{ + ANIMCMD_FRAME(11, 32, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(16, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(20, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BunnyHoppyFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(20, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelSouth[] = +{ + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelNorth[] = +{ + ANIMCMD_FRAME(13, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelWest[] = +{ + ANIMCMD_FRAME(17, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieBackWheelEast[] = +{ + ANIMCMD_FRAME(17, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelNorth[] = +{ + ANIMCMD_FRAME(15, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelWest[] = +{ + ANIMCMD_FRAME(19, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_StandingWheelieFrontWheelEast[] = +{ + ANIMCMD_FRAME(19, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieSouth[] = +{ + ANIMCMD_FRAME(21, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(22, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieNorth[] = +{ + ANIMCMD_FRAME(23, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_FRAME(24, 4), + ANIMCMD_FRAME(14, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieWest[] = +{ + ANIMCMD_FRAME(25, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_FRAME(26, 4), + ANIMCMD_FRAME(18, 4), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_MovingWheelieEast[] = +{ + ANIMCMD_FRAME(25, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_FRAME(26, 4, .hFlip = TRUE), + ANIMCMD_FRAME(18, 4, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage0[] = +{ + ANIMCMD_FRAME(0, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage1[] = +{ + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(2, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage2[] = +{ + ANIMCMD_FRAME(3, 48), + ANIMCMD_FRAME(4, 48), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage3[] = +{ + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(5, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_FRAME(6, 32), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_BerryTreeStage4[] = +{ + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(7, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_FRAME(8, 48), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_NurseBow[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(9, 32), + ANIMCMD_FRAME(0, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_RockBreak[] = +{ + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(2, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TreeCut[] = +{ + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodSouth[] = +{ + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(9, 4), + ANIMCMD_FRAME(10, 4), + ANIMCMD_FRAME(11, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodNorth[] = +{ + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(5, 4), + ANIMCMD_FRAME(6, 4), + ANIMCMD_FRAME(7, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodWest[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(3, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_TakeOutRodEast[] = +{ + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodSouth[] = +{ + ANIMCMD_FRAME(11, 4), + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(9, 6), + ANIMCMD_FRAME(8, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodNorth[] = +{ + ANIMCMD_FRAME(7, 4), + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(5, 6), + ANIMCMD_FRAME(4, 6), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodWest[] = +{ + ANIMCMD_FRAME(3, 4), + ANIMCMD_FRAME(2, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_PutAwayRodEast[] = +{ + ANIMCMD_FRAME(3, 4, .hFlip = TRUE), + ANIMCMD_FRAME(2, 4, .hFlip = TRUE), + ANIMCMD_FRAME(1, 4, .hFlip = TRUE), + ANIMCMD_FRAME(0, 4, .hFlip = TRUE), + ANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonSouth[] = +{ + ANIMCMD_FRAME(10, 6), + ANIMCMD_FRAME(11, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(11, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonNorth[] = +{ + ANIMCMD_FRAME(6, 6), + ANIMCMD_FRAME(7, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(7, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonWest[] = +{ + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HookedPokemonEast[] = +{ + ANIMCMD_FRAME(2, 6, .hFlip = TRUE), + ANIMCMD_FRAME(3, 6, .hFlip = TRUE), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(3, 30, .hFlip = TRUE), + ANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8508FD8[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(7), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509008[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), + AFFINEANIMCMD_LOOP(15), + AFFINEANIMCMD_JUMP(0), +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509040[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509050[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509060[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AffineAnimCmd gObjectEventRotScalAnim_8509078[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), + AFFINEANIMCMD_LOOP(8), + AFFINEANIMCMD_END, +}; + +const union AnimCmd gObjectEventImageAnim_HoOhFlapWings[] = +{ + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_FRAME(3, 8), + ANIMCMD_FRAME(4, 8), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_HoOhStayStill[] = +{ + ANIMCMD_FRAME(3, 16), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Inanimate[] = { + gObjectEventImageAnim_StayStill, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_QuintyPlump[] = { + gObjectEventImageAnim_QuintyPlumpFaceSouth, + gObjectEventImageAnim_QuintyPlumpFaceNorth, + gObjectEventImageAnim_QuintyPlumpFaceWest, + gObjectEventImageAnim_QuintyPlumpFaceEast, + gObjectEventImageAnim_QuintyPlumpGoSouth, + gObjectEventImageAnim_QuintyPlumpGoNorth, + gObjectEventImageAnim_QuintyPlumpGoWest, + gObjectEventImageAnim_QuintyPlumpGoEast, + gObjectEventImageAnim_QuintyPlumpGoFastSouth, + gObjectEventImageAnim_QuintyPlumpGoFastNorth, + gObjectEventImageAnim_QuintyPlumpGoFastWest, + gObjectEventImageAnim_QuintyPlumpGoFastEast, + gObjectEventImageAnim_QuintyPlumpGoFasterSouth, + gObjectEventImageAnim_QuintyPlumpGoFasterNorth, + gObjectEventImageAnim_QuintyPlumpGoFasterWest, + gObjectEventImageAnim_QuintyPlumpGoFasterEast, + gObjectEventImageAnim_QuintyPlumpGoFastestSouth, + gObjectEventImageAnim_QuintyPlumpGoFastestNorth, + gObjectEventImageAnim_QuintyPlumpGoFastestWest, + gObjectEventImageAnim_QuintyPlumpGoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Standard[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_HoOh[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_HoOhFlapWings, + gObjectEventImageAnim_HoOhStayStill, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Groudon3[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, +}; + +const union AnimCmd gObjectEventImageAnim_85091F0[] = +{ + ANIMCMD_FRAME(1, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_85091F8[] = +{ + ANIMCMD_FRAME(4, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509200[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509208[] = +{ + ANIMCMD_FRAME(2, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509210[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509218[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509220[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509228[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd gObjectEventImageAnim_8509230[] = +{ + ANIMCMD_FRAME(3, 1), + ANIMCMD_JUMP(0), +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Rayquaza2[] = { + gObjectEventImageAnim_8509218, + gObjectEventImageAnim_8509220, + gObjectEventImageAnim_8509228, + gObjectEventImageAnim_8509230, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_85091F0, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, + gObjectEventImageAnim_8509200, + gObjectEventImageAnim_85091F8, + gObjectEventImageAnim_8509208, + gObjectEventImageAnim_8509210, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BrendanMayNormal[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_RunSouth, + gObjectEventImageAnim_RunNorth, + gObjectEventImageAnim_RunWest, + gObjectEventImageAnim_RunEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_AcroBike[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_BunnyHoppyBackWheelSouth, + gObjectEventImageAnim_BunnyHoppyBackWheelNorth, + gObjectEventImageAnim_BunnyHoppyBackWheelWest, + gObjectEventImageAnim_BunnyHoppyBackWheelEast, + gObjectEventImageAnim_BunnyHoppyFrontWheelSouth, + gObjectEventImageAnim_BunnyHoppyFrontWheelNorth, + gObjectEventImageAnim_BunnyHoppyFrontWheelWest, + gObjectEventImageAnim_BunnyHoppyFrontWheelEast, + gObjectEventImageAnim_StandingWheelieBackWheelSouth, + gObjectEventImageAnim_StandingWheelieBackWheelNorth, + gObjectEventImageAnim_StandingWheelieBackWheelWest, + gObjectEventImageAnim_StandingWheelieBackWheelEast, + gObjectEventImageAnim_StandingWheelieFrontWheelSouth, + gObjectEventImageAnim_StandingWheelieFrontWheelNorth, + gObjectEventImageAnim_StandingWheelieFrontWheelWest, + gObjectEventImageAnim_StandingWheelieFrontWheelEast, + gObjectEventImageAnim_MovingWheelieSouth, + gObjectEventImageAnim_MovingWheelieNorth, + gObjectEventImageAnim_MovingWheelieWest, + gObjectEventImageAnim_MovingWheelieEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Surfing[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_GetOnOffSurfBlobSouth, + gObjectEventImageAnim_GetOnOffSurfBlobNorth, + gObjectEventImageAnim_GetOnOffSurfBlobWest, + gObjectEventImageAnim_GetOnOffSurfBlobEast, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Nurse[] = { + gObjectEventImageAnim_FaceSouth, + gObjectEventImageAnim_FaceNorth, + gObjectEventImageAnim_FaceWest, + gObjectEventImageAnim_FaceEast, + gObjectEventImageAnim_GoSouth, + gObjectEventImageAnim_GoNorth, + gObjectEventImageAnim_GoWest, + gObjectEventImageAnim_GoEast, + gObjectEventImageAnim_GoFastSouth, + gObjectEventImageAnim_GoFastNorth, + gObjectEventImageAnim_GoFastWest, + gObjectEventImageAnim_GoFastEast, + gObjectEventImageAnim_GoFasterSouth, + gObjectEventImageAnim_GoFasterNorth, + gObjectEventImageAnim_GoFasterWest, + gObjectEventImageAnim_GoFasterEast, + gObjectEventImageAnim_GoFastestSouth, + gObjectEventImageAnim_GoFastestNorth, + gObjectEventImageAnim_GoFastestWest, + gObjectEventImageAnim_GoFastestEast, + gObjectEventImageAnim_NurseBow, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_FieldMove[] = { + gObjectEventImageAnim_FieldMove, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BerryTree[] = { + gObjectEventImageAnim_BerryTreeStage0, + gObjectEventImageAnim_BerryTreeStage1, + gObjectEventImageAnim_BerryTreeStage2, + gObjectEventImageAnim_BerryTreeStage3, + gObjectEventImageAnim_BerryTreeStage4, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_BreakableRock[] = { + gObjectEventImageAnim_StayStill, + gObjectEventImageAnim_RockBreak, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_CuttableTree[] = { + gObjectEventImageAnim_StayStill, + gObjectEventImageAnim_TreeCut, +}; + +const union AnimCmd *const gObjectEventImageAnimTable_Fishing[] = { + gObjectEventImageAnim_TakeOutRodSouth, + gObjectEventImageAnim_TakeOutRodNorth, + gObjectEventImageAnim_TakeOutRodWest, + gObjectEventImageAnim_TakeOutRodEast, + gObjectEventImageAnim_PutAwayRodSouth, + gObjectEventImageAnim_PutAwayRodNorth, + gObjectEventImageAnim_PutAwayRodWest, + gObjectEventImageAnim_PutAwayRodEast, + gObjectEventImageAnim_HookedPokemonSouth, + gObjectEventImageAnim_HookedPokemonNorth, + gObjectEventImageAnim_HookedPokemonWest, + gObjectEventImageAnim_HookedPokemonEast, +}; + +const union AffineAnimCmd *const gObjectEventRotScalAnimTable_KyogreGroudon[] = { + gObjectEventRotScalAnim_8508FD8, + gObjectEventRotScalAnim_8509008, + gObjectEventRotScalAnim_8509050, + gObjectEventRotScalAnim_8509040, + gObjectEventRotScalAnim_8509078, + gObjectEventRotScalAnim_8509060, +}; + +const struct UnkStruct_085094AC gUnknown_085094AC[] = { + { + .anims = gObjectEventImageAnimTable_QuintyPlump, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Standard, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_BrendanMayNormal, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_AcroBike, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Surfing, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Nurse, + .animPos = {1, 3, 0, 2}, + }, + { + .anims = gObjectEventImageAnimTable_Fishing, + .animPos = {1, 3, 0, 2}, + }, + { + NULL, + {0, 0, 0, 0}, + }, +}; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/event_object/event_object_graphics.h similarity index 51% rename from src/data/field_event_obj/event_object_graphics.h rename to src/data/event_object/event_object_graphics.h index f7f1f33ba4..3e44e4133c 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/event_object/event_object_graphics.h @@ -1,9 +1,9 @@ -const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); -const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); -const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); -const u32 gEventObjectPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); -const u32 gEventObjectPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); +const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); +const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); +const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); const u16 NullPalette_8499A38[16] = {}; const u16 NullPalette_8499A58[16] = {}; const u16 NullPalette_8499A78[16] = {}; @@ -19,27 +19,27 @@ const u16 NullPalette_8499B98[16] = {}; const u16 NullPalette_8499BB8[16] = {}; const u16 NullPalette_8499BD8[16] = {}; const u16 NullPalette_8499BF8[16] = {}; -const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); -const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); -const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); -const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); -const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); -const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); -const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); -const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); -const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); -const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); -const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); -const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); -const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); -const u32 gEventObjectPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); -const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); -const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); -const u32 gEventObjectPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); -const u32 gEventObjectPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); -const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); +const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); +const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); +const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); +const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp"); +const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp"); +const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp"); +const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp"); +const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); +const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); +const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); +const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); +const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); +const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); +const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); +const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); const u16 NullPalette_84A54F8[16] = {}; const u16 NullPalette_84A5518[16] = {}; const u16 NullPalette_84A5538[16] = {}; @@ -54,241 +54,241 @@ const u16 NullPalette_84A5638[16] = {}; const u16 NullPalette_84A5658[16] = {}; const u16 NullPalette_84A5678[16] = {}; const u16 NullPalette_84A5698[16] = {}; -const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); -const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); -const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); -const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); -const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); -const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); -const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); -const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); -const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); -const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); -const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); -const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); -const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); -const u32 gEventObjectPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); -const u32 gEventObjectPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); -const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); -const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); -const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); -const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); -const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); -const u32 gEventObjectPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); -const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); -const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); -const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); -const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); -const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); -const u32 gEventObjectPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); -const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); -const u32 gEventObjectPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); -const u32 gEventObjectPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); -const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); -const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gEventObjectPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); -const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); -const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gEventObjectPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); -const u32 gEventObjectPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); -const u32 gEventObjectPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); -const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); -const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); -const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); -const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); -const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); -const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); -const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); -const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); -const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); -const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); -const u32 gEventObjectPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); -const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); -const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); -const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); -const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); -const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); -const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); -const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); -const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); -const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); -const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); -const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); -const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); -const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); -const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); -const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); -const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); -const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); -const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); -const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); -const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); -const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); -const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); -const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); -const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); -const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); -const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); -const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); -const u32 gEventObjectPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); -const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); -const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); -const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); -const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); -const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); -const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); -const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); -const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); -const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); -const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); -const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); -const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); -const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); -const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); -const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); -const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); -const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); -const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); -const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); -const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); -const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); -const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); -const u32 gEventObjectPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); -const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); -const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); -const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); -const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); -const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); -const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); -const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); -const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); -const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); -const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); -const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); -const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); -const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); -const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); -const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); -const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); -const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); -const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); -const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); -const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); -const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); -const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); -const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); -const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); -const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); -const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); -const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); -const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); -const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); -const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); -const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); -const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); -const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); -const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); -const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); -const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); -const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); -const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); -const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); -const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); -const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); -const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); -const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); -const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); -const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); -const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); -const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); -const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); -const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); -const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); -const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); -const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); -const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); -const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); -const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); -const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); -const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); -const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); -const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); -const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); -const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); -const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); -const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); -const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); -const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); -const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); -const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); -const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); -const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); -const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); -const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); -const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); -const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); -const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); -const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); -const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); -const u32 gEventObjectPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); -const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); -const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); -const u32 gEventObjectPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); -const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); -const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); -const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); +const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); +const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); +const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); +const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); +const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); +const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); +const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); +const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); +const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); +const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); +const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); +const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); +const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); +const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); +const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); +const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); +const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); +const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); +const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); +const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); +const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); +const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); +const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); +const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); +const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); +const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); +const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); +const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); +const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); +const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); +const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); +const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); +const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); +const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); +const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); +const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); +const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); +const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); +const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); +const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); +const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp"); +const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp"); +const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp"); +const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp"); +const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp"); +const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp"); +const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp"); +const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp"); +const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp"); +const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp"); +const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp"); +const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp"); +const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp"); +const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp"); +const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp"); +const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp"); +const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); +const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); +const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); +const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); +const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); +const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); +const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); +const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp"); +const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp"); +const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp"); +const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp"); +const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp"); +const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp"); +const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); +const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); +const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); +const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); +const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); +const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); +const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); +const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp"); +const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp"); +const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp"); +const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp"); +const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp"); +const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp"); +const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp"); +const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp"); +const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp"); +const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp"); +const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp"); +const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp"); +const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp"); +const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp"); +const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp"); +const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp"); +const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); +const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); +const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); +const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); +const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); +const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); +const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); +const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); +const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp"); +const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp"); +const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp"); +const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp"); +const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp"); +const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp"); +const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp"); +const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp"); +const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp"); +const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp"); +const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); +const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); +const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); +const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); +const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); +const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); +const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp"); +const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp"); +const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp"); +const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp"); +const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp"); +const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp"); +const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp"); +const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp"); +const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp"); +const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp"); +const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp"); +const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp"); +const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp"); +const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp"); +const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp"); +const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp"); +const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp"); +const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp"); +const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp"); +const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp"); +const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp"); +const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp"); +const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp"); +const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp"); +const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp"); +const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp"); +const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp"); +const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp"); +const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp"); +const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp"); +const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp"); +const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp"); +const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp"); +const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp"); +const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp"); +const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp"); +const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp"); +const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp"); +const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp"); +const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp"); +const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp"); +const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp"); +const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp"); +const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp"); +const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp"); +const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); +const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); +const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); +const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); +const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); +const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); +const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); +const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); +const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); +const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); +const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); +const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); +const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); +const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); +const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); +const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); -const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); -const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); -const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); -const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); -const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); -const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); -const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); -const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); -const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); -const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); -const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); -const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); -const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); -const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); -const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); -const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); -const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); -const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); -const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); -const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); -const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); -const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); -const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); -const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); -const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); -const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); -const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); -const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); -const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); -const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); -const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); -const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); +const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); +const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); +const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp"); +const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp"); +const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp"); +const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp"); +const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp"); +const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp"); +const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp"); +const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp"); +const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp"); +const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp"); +const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp"); +const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp"); +const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp"); +const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp"); +const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp"); +const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp"); +const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp"); +const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp"); +const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp"); +const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp"); +const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp"); +const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp"); +const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp"); +const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp"); +const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp"); +const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp"); +const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp"); +const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); +const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); +const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); -const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); -const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); +const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); @@ -331,32 +331,32 @@ const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/p const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); -const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); -const u32 gEventObjectPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); -const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); -const u32 gEventObjectPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); -const u32 gEventObjectPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); -const u32 gEventObjectPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); -const u32 gEventObjectPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); -const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); -const u32 gEventObjectPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); -const u32 gEventObjectPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); -const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); -const u32 gEventObjectPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); -const u32 gEventObjectPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); -const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); -const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); -const u32 gEventObjectPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); -const u32 gEventObjectPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); -const u32 gEventObjectPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); -const u32 gEventObjectPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); -const u32 gEventObjectPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); -const u32 gEventObjectPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); -const u32 gEventObjectPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); -const u32 gEventObjectPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); -const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); -const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); -const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); -const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); +const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); +const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp"); +const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp"); +const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp"); +const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp"); +const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); +const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); +const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); +const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); +const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); +const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); +const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); +const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); +const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); +const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); +const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); +const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp"); +const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp"); +const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp"); +const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); +const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); +const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); +const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); diff --git a/src/data/event_object/event_object_graphics_info.h b/src/data/event_object/event_object_graphics_info.h new file mode 100755 index 0000000000..9b500d0645 --- /dev/null +++ b/src/data/event_object/event_object_graphics_info.h @@ -0,0 +1,245 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_QuintyPlump, gObjectEventPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Twin, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Girl3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RichBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ExpertF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PokefanM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cook, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_PsychicM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maniac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HexManiac, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BlackBelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisherman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BerryTree, gObjectEventPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfBirch, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man5, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ReporterF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CuttableTree, gObjectEventPicTable_CuttableTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MartEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Teala, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_BreakableRock, gObjectEventPicTable_BreakableRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poochyena, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Artist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayMachBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cameraman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sidney, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Phoebe, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Glacia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Drake, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Roxanne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brawly, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wattson, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Flannery, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Norman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Winona, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Liza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tate, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wallace, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Steven, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wally, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DittoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WynautDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LotadDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikaCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_RoundCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_KissCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_SpinCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BallCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GrassCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_FireCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WaterCushion, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GameboyKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ContestJudge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayWatering, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MayDecorating, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Archie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Maxie, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Groudon3, gObjectEventPicTable_GroudonSide, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Regi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Skitty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_KyogreFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GroudonFront, gObjectEventRotScalAnimTable_KyogreGroudon}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Rayquaza2, gObjectEventPicTable_Rayquaza, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azumarill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wingull, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kecleon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Azurill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_BrendanMayNormal, gObjectEventPicTable_MayNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Juan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scott, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Statue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kirlia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Dusclops, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Red, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Leaf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Deoxys, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Anabel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Tucker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Greta, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spenser, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Noland, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lucy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brandon, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/event_object/event_object_graphics_info_pointers.h b/src/data/event_object/event_object_graphics_info_pointers.h new file mode 100755 index 0000000000..3c4ffd2bab --- /dev/null +++ b/src/data/event_object/event_object_graphics_info_pointers.h @@ -0,0 +1,499 @@ +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon2; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kyogre3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Groudon3; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2; + + +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = { + [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, + [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, + [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, + [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_BrendanFieldMove, + [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gObjectEventGraphicsInfo_QuintyPlump, + [EVENT_OBJ_GFX_NINJA_BOY] = &gObjectEventGraphicsInfo_NinjaBoy, + [EVENT_OBJ_GFX_TWIN] = &gObjectEventGraphicsInfo_Twin, + [EVENT_OBJ_GFX_BOY_1] = &gObjectEventGraphicsInfo_Boy1, + [EVENT_OBJ_GFX_GIRL_1] = &gObjectEventGraphicsInfo_Girl1, + [EVENT_OBJ_GFX_BOY_2] = &gObjectEventGraphicsInfo_Boy2, + [EVENT_OBJ_GFX_GIRL_2] = &gObjectEventGraphicsInfo_Girl2, + [EVENT_OBJ_GFX_LITTLE_BOY] = &gObjectEventGraphicsInfo_LittleBoy, + [EVENT_OBJ_GFX_LITTLE_GIRL] = &gObjectEventGraphicsInfo_LittleGirl, + [EVENT_OBJ_GFX_BOY_3] = &gObjectEventGraphicsInfo_Boy3, + [EVENT_OBJ_GFX_GIRL_3] = &gObjectEventGraphicsInfo_Girl3, + [EVENT_OBJ_GFX_RICH_BOY] = &gObjectEventGraphicsInfo_RichBoy, + [EVENT_OBJ_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1, + [EVENT_OBJ_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan, + [EVENT_OBJ_GFX_POKEFAN_F] = &gObjectEventGraphicsInfo_PokefanF, + [EVENT_OBJ_GFX_MAN_1] = &gObjectEventGraphicsInfo_Man1, + [EVENT_OBJ_GFX_WOMAN_2] = &gObjectEventGraphicsInfo_Woman2, + [EVENT_OBJ_GFX_EXPERT_M] = &gObjectEventGraphicsInfo_ExpertM, + [EVENT_OBJ_GFX_EXPERT_F] = &gObjectEventGraphicsInfo_ExpertF, + [EVENT_OBJ_GFX_MAN_2] = &gObjectEventGraphicsInfo_Man2, + [EVENT_OBJ_GFX_WOMAN_3] = &gObjectEventGraphicsInfo_Woman3, + [EVENT_OBJ_GFX_POKEFAN_M] = &gObjectEventGraphicsInfo_PokefanM, + [EVENT_OBJ_GFX_WOMAN_4] = &gObjectEventGraphicsInfo_Woman4, + [EVENT_OBJ_GFX_COOK] = &gObjectEventGraphicsInfo_Cook, + [EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gObjectEventGraphicsInfo_LinkReceptionist, + [EVENT_OBJ_GFX_OLD_MAN] = &gObjectEventGraphicsInfo_OldMan, + [EVENT_OBJ_GFX_OLD_WOMAN] = &gObjectEventGraphicsInfo_OldWoman, + [EVENT_OBJ_GFX_CAMPER] = &gObjectEventGraphicsInfo_Camper, + [EVENT_OBJ_GFX_PICNICKER] = &gObjectEventGraphicsInfo_Picnicker, + [EVENT_OBJ_GFX_MAN_3] = &gObjectEventGraphicsInfo_Man3, + [EVENT_OBJ_GFX_WOMAN_5] = &gObjectEventGraphicsInfo_Woman5, + [EVENT_OBJ_GFX_YOUNGSTER] = &gObjectEventGraphicsInfo_Youngster, + [EVENT_OBJ_GFX_BUG_CATCHER] = &gObjectEventGraphicsInfo_BugCatcher, + [EVENT_OBJ_GFX_PSYCHIC_M] = &gObjectEventGraphicsInfo_PsychicM, + [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gObjectEventGraphicsInfo_SchoolKidM, + [EVENT_OBJ_GFX_MANIAC] = &gObjectEventGraphicsInfo_Maniac, + [EVENT_OBJ_GFX_HEX_MANIAC] = &gObjectEventGraphicsInfo_HexManiac, + [EVENT_OBJ_GFX_RAYQUAZA_1] = &gObjectEventGraphicsInfo_Rayquaza1, + [EVENT_OBJ_GFX_SWIMMER_M] = &gObjectEventGraphicsInfo_SwimmerM, + [EVENT_OBJ_GFX_SWIMMER_F] = &gObjectEventGraphicsInfo_SwimmerF, + [EVENT_OBJ_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt, + [EVENT_OBJ_GFX_BEAUTY] = &gObjectEventGraphicsInfo_Beauty, + [EVENT_OBJ_GFX_SCIENTIST_1] = &gObjectEventGraphicsInfo_Scientist1, + [EVENT_OBJ_GFX_LASS] = &gObjectEventGraphicsInfo_Lass, + [EVENT_OBJ_GFX_GENTLEMAN] = &gObjectEventGraphicsInfo_Gentleman, + [EVENT_OBJ_GFX_SAILOR] = &gObjectEventGraphicsInfo_Sailor, + [EVENT_OBJ_GFX_FISHERMAN] = &gObjectEventGraphicsInfo_Fisherman, + [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_RunningTriathleteM, + [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_RunningTriathleteF, + [EVENT_OBJ_GFX_TUBER_F] = &gObjectEventGraphicsInfo_TuberF, + [EVENT_OBJ_GFX_TUBER_M] = &gObjectEventGraphicsInfo_TuberM, + [EVENT_OBJ_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker, + [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gObjectEventGraphicsInfo_CyclingTriathleteM, + [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gObjectEventGraphicsInfo_CyclingTriathleteF, + [EVENT_OBJ_GFX_NURSE] = &gObjectEventGraphicsInfo_Nurse, + [EVENT_OBJ_GFX_ITEM_BALL] = &gObjectEventGraphicsInfo_ItemBall, + [EVENT_OBJ_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree, + [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages, + [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gObjectEventGraphicsInfo_BerryTreeLateStages, + [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_BrendanAcroBike, + [EVENT_OBJ_GFX_PROF_BIRCH] = &gObjectEventGraphicsInfo_ProfBirch, + [EVENT_OBJ_GFX_MAN_4] = &gObjectEventGraphicsInfo_Man4, + [EVENT_OBJ_GFX_MAN_5] = &gObjectEventGraphicsInfo_Man5, + [EVENT_OBJ_GFX_REPORTER_M] = &gObjectEventGraphicsInfo_ReporterM, + [EVENT_OBJ_GFX_REPORTER_F] = &gObjectEventGraphicsInfo_ReporterF, + [EVENT_OBJ_GFX_BARD] = &gObjectEventGraphicsInfo_Bard, + [EVENT_OBJ_GFX_ANABEL] = &gObjectEventGraphicsInfo_Anabel, + [EVENT_OBJ_GFX_TUCKER] = &gObjectEventGraphicsInfo_Tucker, + [EVENT_OBJ_GFX_GRETA] = &gObjectEventGraphicsInfo_Greta, + [EVENT_OBJ_GFX_SPENSER] = &gObjectEventGraphicsInfo_Spenser, + [EVENT_OBJ_GFX_NOLAND] = &gObjectEventGraphicsInfo_Noland, + [EVENT_OBJ_GFX_LUCY] = &gObjectEventGraphicsInfo_Lucy, + [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gObjectEventGraphicsInfo_UnusedNatuDoll, + [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gObjectEventGraphicsInfo_UnusedMagnemiteDoll, + [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gObjectEventGraphicsInfo_UnusedSquirtleDoll, + [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gObjectEventGraphicsInfo_UnusedWooperDoll, + [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_UnusedPikachuDoll, + [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gObjectEventGraphicsInfo_UnusedPorygon2Doll, + [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gObjectEventGraphicsInfo_CuttableTree, + [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gObjectEventGraphicsInfo_MartEmployee, + [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gObjectEventGraphicsInfo_RooftopSaleWoman, + [EVENT_OBJ_GFX_TEALA] = &gObjectEventGraphicsInfo_Teala, + [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gObjectEventGraphicsInfo_BreakableRock, + [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gObjectEventGraphicsInfo_PushableBoulder, + [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gObjectEventGraphicsInfo_MrBrineysBoat, + [EVENT_OBJ_GFX_MAY_NORMAL] = &gObjectEventGraphicsInfo_MayNormal, + [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_MayMachBike, + [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_MayAcroBike, + [EVENT_OBJ_GFX_MAY_SURFING] = &gObjectEventGraphicsInfo_MaySurfing, + [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_MayFieldMove, + [EVENT_OBJ_GFX_TRUCK] = &gObjectEventGraphicsInfo_Truck, + [EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gObjectEventGraphicsInfo_VigorothCarryingBox, + [EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gObjectEventGraphicsInfo_VigorothFacingAway, + [EVENT_OBJ_GFX_BIRCHS_BAG] = &gObjectEventGraphicsInfo_BirchsBag, + [EVENT_OBJ_GFX_ZIGZAGOON_1] = &gObjectEventGraphicsInfo_EnemyZigzagoon, + [EVENT_OBJ_GFX_ARTIST] = &gObjectEventGraphicsInfo_Artist, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_RivalBrendanNormal, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanMachBike, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalBrendanAcroBike, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_RivalBrendanSurfing, + [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalBrendanFieldMove, + [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gObjectEventGraphicsInfo_RivalMayNormal, + [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gObjectEventGraphicsInfo_RivalMayMachBike, + [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gObjectEventGraphicsInfo_RivalMayAcroBike, + [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gObjectEventGraphicsInfo_RivalMaySurfing, + [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gObjectEventGraphicsInfo_RivalMayFieldMove, + [EVENT_OBJ_GFX_CAMERAMAN] = &gObjectEventGraphicsInfo_Cameraman, + [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gObjectEventGraphicsInfo_BrendanUnderwater, + [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gObjectEventGraphicsInfo_MayUnderwater, + [EVENT_OBJ_GFX_MOVING_BOX] = &gObjectEventGraphicsInfo_MovingBox, + [EVENT_OBJ_GFX_CABLE_CAR] = &gObjectEventGraphicsInfo_CableCar, + [EVENT_OBJ_GFX_SCIENTIST_2] = &gObjectEventGraphicsInfo_Scientist2, + [EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gObjectEventGraphicsInfo_DevonEmployee, + [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gObjectEventGraphicsInfo_AquaMemberM, + [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gObjectEventGraphicsInfo_AquaMemberF, + [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gObjectEventGraphicsInfo_MagmaMemberM, + [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gObjectEventGraphicsInfo_MagmaMemberF, + [EVENT_OBJ_GFX_SIDNEY] = &gObjectEventGraphicsInfo_Sidney, + [EVENT_OBJ_GFX_PHOEBE] = &gObjectEventGraphicsInfo_Phoebe, + [EVENT_OBJ_GFX_GLACIA] = &gObjectEventGraphicsInfo_Glacia, + [EVENT_OBJ_GFX_DRAKE] = &gObjectEventGraphicsInfo_Drake, + [EVENT_OBJ_GFX_ROXANNE] = &gObjectEventGraphicsInfo_Roxanne, + [EVENT_OBJ_GFX_BRAWLY] = &gObjectEventGraphicsInfo_Brawly, + [EVENT_OBJ_GFX_WATTSON] = &gObjectEventGraphicsInfo_Wattson, + [EVENT_OBJ_GFX_FLANNERY] = &gObjectEventGraphicsInfo_Flannery, + [EVENT_OBJ_GFX_NORMAN] = &gObjectEventGraphicsInfo_Norman, + [EVENT_OBJ_GFX_WINONA] = &gObjectEventGraphicsInfo_Winona, + [EVENT_OBJ_GFX_LIZA] = &gObjectEventGraphicsInfo_Liza, + [EVENT_OBJ_GFX_TATE] = &gObjectEventGraphicsInfo_Tate, + [EVENT_OBJ_GFX_WALLACE] = &gObjectEventGraphicsInfo_Wallace, + [EVENT_OBJ_GFX_STEVEN] = &gObjectEventGraphicsInfo_Steven, + [EVENT_OBJ_GFX_WALLY] = &gObjectEventGraphicsInfo_Wally, + [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gObjectEventGraphicsInfo_RubySapphireLittleBoy, + [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gObjectEventGraphicsInfo_BrendanFishing, + [EVENT_OBJ_GFX_MAY_FISHING] = &gObjectEventGraphicsInfo_MayFishing, + [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gObjectEventGraphicsInfo_HotSpringsOldWoman, + [EVENT_OBJ_GFX_SS_TIDAL] = &gObjectEventGraphicsInfo_SSTidal, + [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gObjectEventGraphicsInfo_SubmarineShadow, + [EVENT_OBJ_GFX_PICHU_DOLL] = &gObjectEventGraphicsInfo_PichuDoll, + [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gObjectEventGraphicsInfo_PikachuDoll, + [EVENT_OBJ_GFX_MARILL_DOLL] = &gObjectEventGraphicsInfo_MarillDoll, + [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gObjectEventGraphicsInfo_TogepiDoll, + [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gObjectEventGraphicsInfo_CyndaquilDoll, + [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gObjectEventGraphicsInfo_ChikoritaDoll, + [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gObjectEventGraphicsInfo_TotodileDoll, + [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gObjectEventGraphicsInfo_JigglypuffDoll, + [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gObjectEventGraphicsInfo_MeowthDoll, + [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gObjectEventGraphicsInfo_ClefairyDoll, + [EVENT_OBJ_GFX_DITTO_DOLL] = &gObjectEventGraphicsInfo_DittoDoll, + [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gObjectEventGraphicsInfo_SmoochumDoll, + [EVENT_OBJ_GFX_TREECKO_DOLL] = &gObjectEventGraphicsInfo_TreeckoDoll, + [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gObjectEventGraphicsInfo_TorchicDoll, + [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gObjectEventGraphicsInfo_MudkipDoll, + [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gObjectEventGraphicsInfo_DuskullDoll, + [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gObjectEventGraphicsInfo_WynautDoll, + [EVENT_OBJ_GFX_BALTOY_DOLL] = &gObjectEventGraphicsInfo_BaltoyDoll, + [EVENT_OBJ_GFX_KECLEON_DOLL] = &gObjectEventGraphicsInfo_KecleonDoll, + [EVENT_OBJ_GFX_AZURILL_DOLL] = &gObjectEventGraphicsInfo_AzurillDoll, + [EVENT_OBJ_GFX_SKITTY_DOLL] = &gObjectEventGraphicsInfo_SkittyDoll, + [EVENT_OBJ_GFX_SWABLU_DOLL] = &gObjectEventGraphicsInfo_SwabluDoll, + [EVENT_OBJ_GFX_GULPIN_DOLL] = &gObjectEventGraphicsInfo_GulpinDoll, + [EVENT_OBJ_GFX_LOTAD_DOLL] = &gObjectEventGraphicsInfo_LotadDoll, + [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gObjectEventGraphicsInfo_SeedotDoll, + [EVENT_OBJ_GFX_PIKA_CUSHION] = &gObjectEventGraphicsInfo_PikaCushion, + [EVENT_OBJ_GFX_ROUND_CUSHION] = &gObjectEventGraphicsInfo_RoundCushion, + [EVENT_OBJ_GFX_KISS_CUSHION] = &gObjectEventGraphicsInfo_KissCushion, + [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gObjectEventGraphicsInfo_ZigzagCushion, + [EVENT_OBJ_GFX_SPIN_CUSHION] = &gObjectEventGraphicsInfo_SpinCushion, + [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gObjectEventGraphicsInfo_DiamondCushion, + [EVENT_OBJ_GFX_BALL_CUSHION] = &gObjectEventGraphicsInfo_BallCushion, + [EVENT_OBJ_GFX_GRASS_CUSHION] = &gObjectEventGraphicsInfo_GrassCushion, + [EVENT_OBJ_GFX_FIRE_CUSHION] = &gObjectEventGraphicsInfo_FireCushion, + [EVENT_OBJ_GFX_WATER_CUSHION] = &gObjectEventGraphicsInfo_WaterCushion, + [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gObjectEventGraphicsInfo_BigSnorlaxDoll, + [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gObjectEventGraphicsInfo_BigRhydonDoll, + [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gObjectEventGraphicsInfo_BigLaprasDoll, + [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gObjectEventGraphicsInfo_BigVenusaurDoll, + [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gObjectEventGraphicsInfo_BigCharizardDoll, + [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gObjectEventGraphicsInfo_BigBlastoiseDoll, + [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gObjectEventGraphicsInfo_BigWailmerDoll, + [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gObjectEventGraphicsInfo_BigRegirockDoll, + [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gObjectEventGraphicsInfo_BigRegiceDoll, + [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gObjectEventGraphicsInfo_BigRegisteelDoll, + [EVENT_OBJ_GFX_LATIAS] = &gObjectEventGraphicsInfo_Latias, + [EVENT_OBJ_GFX_LATIOS] = &gObjectEventGraphicsInfo_Latios, + [EVENT_OBJ_GFX_GAMEBOY_KID] = &gObjectEventGraphicsInfo_GameboyKid, + [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gObjectEventGraphicsInfo_ContestJudge, + [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gObjectEventGraphicsInfo_BrendanWatering, + [EVENT_OBJ_GFX_MAY_WATERING] = &gObjectEventGraphicsInfo_MayWatering, + [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gObjectEventGraphicsInfo_BrendanDecorating, + [EVENT_OBJ_GFX_MAY_DECORATING] = &gObjectEventGraphicsInfo_MayDecorating, + [EVENT_OBJ_GFX_ARCHIE] = &gObjectEventGraphicsInfo_Archie, + [EVENT_OBJ_GFX_MAXIE] = &gObjectEventGraphicsInfo_Maxie, + [EVENT_OBJ_GFX_KYOGRE_1] = &gObjectEventGraphicsInfo_Kyogre1, + [EVENT_OBJ_GFX_GROUDON_1] = &gObjectEventGraphicsInfo_Groudon1, + [EVENT_OBJ_GFX_FOSSIL] = &gObjectEventGraphicsInfo_Fossil, + [EVENT_OBJ_GFX_REGIROCK] = &gObjectEventGraphicsInfo_Regirock, + [EVENT_OBJ_GFX_REGICE] = &gObjectEventGraphicsInfo_Regice, + [EVENT_OBJ_GFX_REGISTEEL] = &gObjectEventGraphicsInfo_Registeel, + [EVENT_OBJ_GFX_SKITTY] = &gObjectEventGraphicsInfo_Skitty, + [EVENT_OBJ_GFX_KECLEON_1] = &gObjectEventGraphicsInfo_Kecleon1, + [EVENT_OBJ_GFX_KYOGRE_2] = &gObjectEventGraphicsInfo_Kyogre2, + [EVENT_OBJ_GFX_GROUDON_2] = &gObjectEventGraphicsInfo_Groudon2, + [EVENT_OBJ_GFX_RAYQUAZA_2] = &gObjectEventGraphicsInfo_Rayquaza2, + [EVENT_OBJ_GFX_ZIGZAGOON_2] = &gObjectEventGraphicsInfo_Zigzagoon, + [EVENT_OBJ_GFX_PIKACHU] = &gObjectEventGraphicsInfo_Pikachu, + [EVENT_OBJ_GFX_AZUMARILL] = &gObjectEventGraphicsInfo_Azumarill, + [EVENT_OBJ_GFX_WINGULL] = &gObjectEventGraphicsInfo_Wingull, + [EVENT_OBJ_GFX_KECLEON_2] = &gObjectEventGraphicsInfo_Kecleon2, + [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gObjectEventGraphicsInfo_TuberMSwimming, + [EVENT_OBJ_GFX_AZURILL] = &gObjectEventGraphicsInfo_Azurill, + [EVENT_OBJ_GFX_MOM] = &gObjectEventGraphicsInfo_Mom, + [EVENT_OBJ_GFX_LINK_BRENDAN] = &gObjectEventGraphicsInfo_LinkBrendan, + [EVENT_OBJ_GFX_LINK_MAY] = &gObjectEventGraphicsInfo_LinkMay, + [EVENT_OBJ_GFX_JUAN] = &gObjectEventGraphicsInfo_Juan, + [EVENT_OBJ_GFX_SCOTT] = &gObjectEventGraphicsInfo_Scott, + [EVENT_OBJ_GFX_POOCHYENA] = &gObjectEventGraphicsInfo_Poochyena, + [EVENT_OBJ_GFX_KYOGRE_3] = &gObjectEventGraphicsInfo_Kyogre3, + [EVENT_OBJ_GFX_GROUDON_3] = &gObjectEventGraphicsInfo_Groudon3, + [EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gObjectEventGraphicsInfo_MysteryEventDeliveryman, + [EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gObjectEventGraphicsInfo_Statue, + [EVENT_OBJ_GFX_KIRLIA] = &gObjectEventGraphicsInfo_Kirlia, + [EVENT_OBJ_GFX_DUSCLOPS] = &gObjectEventGraphicsInfo_Dusclops, + [EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gObjectEventGraphicsInfo_UnionRoomAttendant, + [EVENT_OBJ_GFX_SUDOWOODO] = &gObjectEventGraphicsInfo_Sudowoodo, + [EVENT_OBJ_GFX_MEW] = &gObjectEventGraphicsInfo_Mew, + [EVENT_OBJ_GFX_RED] = &gObjectEventGraphicsInfo_Red, + [EVENT_OBJ_GFX_LEAF] = &gObjectEventGraphicsInfo_Leaf, + [EVENT_OBJ_GFX_DEOXYS] = &gObjectEventGraphicsInfo_Deoxys, + [EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gObjectEventGraphicsInfo_BirthIslandStone, + [EVENT_OBJ_GFX_BRANDON] = &gObjectEventGraphicsInfo_Brandon, + [EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gObjectEventGraphicsInfo_RubySapphireBrendan, + [EVENT_OBJ_GFX_LINK_RS_MAY] = &gObjectEventGraphicsInfo_RubySapphireMay, + [EVENT_OBJ_GFX_LUGIA] = &gObjectEventGraphicsInfo_Lugia, + [EVENT_OBJ_GFX_HOOH] = &gObjectEventGraphicsInfo_HoOh, +}; + +const struct ObjectEventGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { + [MAUVILLE_MAN_BARD] = &gObjectEventGraphicsInfo_Bard, + [MAUVILLE_MAN_HIPSTER] = &gObjectEventGraphicsInfo_Hipster, + [MAUVILLE_MAN_TRADER] = &gObjectEventGraphicsInfo_Trader, + [MAUVILLE_MAN_STORYTELLER] = &gObjectEventGraphicsInfo_Storyteller, + [MAUVILLE_MAN_GIDDY] = &gObjectEventGraphicsInfo_Giddy, + [MAUVILLE_MAN_UNUSED1] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan1, + [MAUVILLE_MAN_UNUSED2] = &gObjectEventGraphicsInfo_UnusedMauvilleOldMan2, +}; diff --git a/src/data/event_object/event_object_pic_tables.h b/src/data/event_object/event_object_pic_tables.h new file mode 100755 index 0000000000..9cfdca7c16 --- /dev/null +++ b/src/data/event_object/event_object_pic_tables.h @@ -0,0 +1,2174 @@ +const struct SpriteFrameImage gObjectEventPicTable_BrendanNormal[] = { + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 0), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 1), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 2), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 3), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 4), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 5), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 6), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 7), + overworld_frame(gObjectEventPic_BrendanRunning, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanMachBike[] = { + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanMachBike, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanAcroBike[] = { + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_BrendanAcroBike, 4, 4, 26), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanSurfing[] = { + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanSurfing, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanUnderwater[] = { + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanUnderwater, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFieldMove[] = { + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFieldMove, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_QuintyPlump[] = { + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 0), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 1), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 2), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 3), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 4), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 5), + overworld_frame(gObjectEventPic_QuintyPlump, 4, 4, 6), +}; + +const struct SpriteFrameImage gObjectEventPicTable_NinjaBoy[] = { + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_NinjaBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Twin[] = { + overworld_frame(gObjectEventPic_Twin, 2, 4, 0), + overworld_frame(gObjectEventPic_Twin, 2, 4, 1), + overworld_frame(gObjectEventPic_Twin, 2, 4, 2), + overworld_frame(gObjectEventPic_Twin, 2, 4, 3), + overworld_frame(gObjectEventPic_Twin, 2, 4, 4), + overworld_frame(gObjectEventPic_Twin, 2, 4, 5), + overworld_frame(gObjectEventPic_Twin, 2, 4, 6), + overworld_frame(gObjectEventPic_Twin, 2, 4, 7), + overworld_frame(gObjectEventPic_Twin, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy1[] = { + overworld_frame(gObjectEventPic_Boy1, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl1[] = { + overworld_frame(gObjectEventPic_Girl1, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy2[] = { + overworld_frame(gObjectEventPic_Boy2, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl2[] = { + overworld_frame(gObjectEventPic_Girl2, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleBoy[] = { + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LittleGirl[] = { + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 0), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 1), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 2), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 3), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 4), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 5), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 6), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 7), + overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Boy3[] = { + overworld_frame(gObjectEventPic_Boy3, 2, 4, 0), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 1), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 2), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 3), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 4), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 5), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 6), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 7), + overworld_frame(gObjectEventPic_Boy3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Girl3[] = { + overworld_frame(gObjectEventPic_Girl3, 2, 4, 0), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 1), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 2), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 3), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 4), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 5), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 6), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 7), + overworld_frame(gObjectEventPic_Girl3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RichBoy[] = { + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 0), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 1), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 2), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 3), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 4), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 5), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 6), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 7), + overworld_frame(gObjectEventPic_RichBoy, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman1[] = { + overworld_frame(gObjectEventPic_Woman1, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_FatMan[] = { + overworld_frame(gObjectEventPic_FatMan, 2, 4, 0), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 1), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 2), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 3), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 4), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 5), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 6), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 7), + overworld_frame(gObjectEventPic_FatMan, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PokefanF[] = { + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 0), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 1), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 2), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 3), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 4), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 5), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 6), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 7), + overworld_frame(gObjectEventPic_PokefanF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man1[] = { + overworld_frame(gObjectEventPic_Man1, 2, 4, 0), + overworld_frame(gObjectEventPic_Man1, 2, 4, 1), + overworld_frame(gObjectEventPic_Man1, 2, 4, 2), + overworld_frame(gObjectEventPic_Man1, 2, 4, 3), + overworld_frame(gObjectEventPic_Man1, 2, 4, 4), + overworld_frame(gObjectEventPic_Man1, 2, 4, 5), + overworld_frame(gObjectEventPic_Man1, 2, 4, 6), + overworld_frame(gObjectEventPic_Man1, 2, 4, 7), + overworld_frame(gObjectEventPic_Man1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman2[] = { + overworld_frame(gObjectEventPic_Woman2, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ExpertM[] = { + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 0), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 1), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 2), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 3), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 4), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 5), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 6), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 7), + overworld_frame(gObjectEventPic_ExpertM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ExpertF[] = { + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 0), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 1), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 2), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 3), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 4), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 5), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 6), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 7), + overworld_frame(gObjectEventPic_ExpertF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man2[] = { + overworld_frame(gObjectEventPic_Man2, 2, 4, 0), + overworld_frame(gObjectEventPic_Man2, 2, 4, 1), + overworld_frame(gObjectEventPic_Man2, 2, 4, 2), + overworld_frame(gObjectEventPic_Man2, 2, 4, 3), + overworld_frame(gObjectEventPic_Man2, 2, 4, 4), + overworld_frame(gObjectEventPic_Man2, 2, 4, 5), + overworld_frame(gObjectEventPic_Man2, 2, 4, 6), + overworld_frame(gObjectEventPic_Man2, 2, 4, 7), + overworld_frame(gObjectEventPic_Man2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman3[] = { + overworld_frame(gObjectEventPic_Woman3, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PokefanM[] = { + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 0), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 1), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 2), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 3), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 4), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 5), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 6), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 7), + overworld_frame(gObjectEventPic_PokefanM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman4[] = { + overworld_frame(gObjectEventPic_Woman4, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman4, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cook[] = { + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 0), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 1), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), + overworld_frame(gObjectEventPic_Cook, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LinkReceptionist[] = { + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 0), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 1), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 2), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 3), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 4), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 5), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 6), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 7), + overworld_frame(gObjectEventPic_LinkReceptionist, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldMan[] = { + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 0), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 1), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), + overworld_frame(gObjectEventPic_OldMan, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_OldWoman[] = { + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_OldWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Camper[] = { + overworld_frame(gObjectEventPic_Camper, 2, 4, 0), + overworld_frame(gObjectEventPic_Camper, 2, 4, 1), + overworld_frame(gObjectEventPic_Camper, 2, 4, 2), + overworld_frame(gObjectEventPic_Camper, 2, 4, 3), + overworld_frame(gObjectEventPic_Camper, 2, 4, 4), + overworld_frame(gObjectEventPic_Camper, 2, 4, 5), + overworld_frame(gObjectEventPic_Camper, 2, 4, 6), + overworld_frame(gObjectEventPic_Camper, 2, 4, 7), + overworld_frame(gObjectEventPic_Camper, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Picnicker[] = { + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 0), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 1), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 2), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 3), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 4), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 5), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 6), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 7), + overworld_frame(gObjectEventPic_Picnicker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man3[] = { + overworld_frame(gObjectEventPic_Man3, 2, 4, 0), + overworld_frame(gObjectEventPic_Man3, 2, 4, 1), + overworld_frame(gObjectEventPic_Man3, 2, 4, 2), + overworld_frame(gObjectEventPic_Man3, 2, 4, 3), + overworld_frame(gObjectEventPic_Man3, 2, 4, 4), + overworld_frame(gObjectEventPic_Man3, 2, 4, 5), + overworld_frame(gObjectEventPic_Man3, 2, 4, 6), + overworld_frame(gObjectEventPic_Man3, 2, 4, 7), + overworld_frame(gObjectEventPic_Man3, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Woman5[] = { + overworld_frame(gObjectEventPic_Woman5, 2, 4, 0), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 1), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 2), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 3), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 4), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 5), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 6), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 7), + overworld_frame(gObjectEventPic_Woman5, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Youngster[] = { + overworld_frame(gObjectEventPic_Youngster, 2, 4, 0), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 1), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 2), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 3), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 4), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 5), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 6), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 7), + overworld_frame(gObjectEventPic_Youngster, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BugCatcher[] = { + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 0), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 1), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 2), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 3), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 4), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 5), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 6), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 7), + overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PsychicM[] = { + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 0), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 1), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 2), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 3), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 4), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 5), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 6), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 7), + overworld_frame(gObjectEventPic_PsychicM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SchoolKidM[] = { + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 0), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 1), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 2), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 3), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 4), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 5), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 6), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 7), + overworld_frame(gObjectEventPic_SchoolKidM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maniac[] = { + overworld_frame(gObjectEventPic_Maniac, 2, 4, 0), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 1), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 2), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 3), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 4), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 5), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 6), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 7), + overworld_frame(gObjectEventPic_Maniac, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HexManiac[] = { + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 0), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 1), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 2), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 3), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 4), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 5), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 6), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 7), + overworld_frame(gObjectEventPic_HexManiac, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerM[] = { + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwimmerF[] = { + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 0), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 1), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 2), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 3), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 4), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 5), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 6), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 7), + overworld_frame(gObjectEventPic_SwimmerF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BlackBelt[] = { + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7), + overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Beauty[] = { + overworld_frame(gObjectEventPic_Beauty, 2, 4, 0), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 1), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 2), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 3), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 4), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 5), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 6), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 7), + overworld_frame(gObjectEventPic_Beauty, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist1[] = { + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lass[] = { + overworld_frame(gObjectEventPic_Lass, 2, 4, 0), + overworld_frame(gObjectEventPic_Lass, 2, 4, 1), + overworld_frame(gObjectEventPic_Lass, 2, 4, 2), + overworld_frame(gObjectEventPic_Lass, 2, 4, 3), + overworld_frame(gObjectEventPic_Lass, 2, 4, 4), + overworld_frame(gObjectEventPic_Lass, 2, 4, 5), + overworld_frame(gObjectEventPic_Lass, 2, 4, 6), + overworld_frame(gObjectEventPic_Lass, 2, 4, 7), + overworld_frame(gObjectEventPic_Lass, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Gentleman[] = { + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 0), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 1), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 2), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 3), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 4), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 5), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 6), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 7), + overworld_frame(gObjectEventPic_Gentleman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sailor[] = { + overworld_frame(gObjectEventPic_Sailor, 2, 4, 0), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 1), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 2), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 3), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 4), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 5), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 6), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 7), + overworld_frame(gObjectEventPic_Sailor, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fisherman[] = { + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 0), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 1), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 2), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 3), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 4), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 5), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 6), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 7), + overworld_frame(gObjectEventPic_Fisherman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteM[] = { + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RunningTriathleteF[] = { + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gObjectEventPic_RunningTriathleteF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberF[] = { + overworld_frame(gObjectEventPic_TuberF, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberF, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberM[] = { + overworld_frame(gObjectEventPic_TuberM, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberM, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Hiker[] = { + overworld_frame(gObjectEventPic_Hiker, 2, 4, 0), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 1), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 2), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 3), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 4), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 5), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 6), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 7), + overworld_frame(gObjectEventPic_Hiker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteM[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteM, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyclingTriathleteF[] = { + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gObjectEventPic_CyclingTriathleteF, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Nurse[] = { + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), + overworld_frame(gObjectEventPic_Nurse, 2, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ItemBall[] = { + obj_frame_tiles(gObjectEventPic_ItemBall), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ProfBirch[] = { + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 0), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 1), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 2), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 3), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 4), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 5), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 6), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 7), + overworld_frame(gObjectEventPic_ProfBirch, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man4[] = { + overworld_frame(gObjectEventPic_Man4, 2, 4, 0), + overworld_frame(gObjectEventPic_Man4, 2, 4, 1), + overworld_frame(gObjectEventPic_Man4, 2, 4, 2), + overworld_frame(gObjectEventPic_Man4, 2, 4, 3), + overworld_frame(gObjectEventPic_Man4, 2, 4, 4), + overworld_frame(gObjectEventPic_Man4, 2, 4, 5), + overworld_frame(gObjectEventPic_Man4, 2, 4, 6), + overworld_frame(gObjectEventPic_Man4, 2, 4, 7), + overworld_frame(gObjectEventPic_Man4, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Man5[] = { + overworld_frame(gObjectEventPic_Man5, 2, 4, 0), + overworld_frame(gObjectEventPic_Man5, 2, 4, 1), + overworld_frame(gObjectEventPic_Man5, 2, 4, 2), + overworld_frame(gObjectEventPic_Man5, 2, 4, 3), + overworld_frame(gObjectEventPic_Man5, 2, 4, 4), + overworld_frame(gObjectEventPic_Man5, 2, 4, 5), + overworld_frame(gObjectEventPic_Man5, 2, 4, 6), + overworld_frame(gObjectEventPic_Man5, 2, 4, 7), + overworld_frame(gObjectEventPic_Man5, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterM[] = { + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ReporterF[] = { + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 0), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 1), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 2), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 3), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 4), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 5), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 6), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 7), + overworld_frame(gObjectEventPic_ReporterF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan1[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan1, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MauvilleOldMan2[] = { + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gObjectEventPic_MauvilleOldMan2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedNatuDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedNatuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedMagnemiteDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedMagnemiteDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedSquirtleDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedSquirtleDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedWooperDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedWooperDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPikachuDoll[] = { + obj_frame_tiles(gObjectEventPic_UnusedPikachuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnusedPorygon2Doll[] = { + obj_frame_tiles(gObjectEventPic_UnusedPorygon2Doll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CuttableTree[] = { + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 0), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 1), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 2), + overworld_frame(gObjectEventPic_CuttableTree, 2, 2, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MartEmployee[] = { + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_MartEmployee, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RooftopSaleWoman[] = { + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_RooftopSaleWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Teala[] = { + overworld_frame(gObjectEventPic_Teala, 2, 4, 0), + overworld_frame(gObjectEventPic_Teala, 2, 4, 1), + overworld_frame(gObjectEventPic_Teala, 2, 4, 2), + overworld_frame(gObjectEventPic_Teala, 2, 4, 3), + overworld_frame(gObjectEventPic_Teala, 2, 4, 4), + overworld_frame(gObjectEventPic_Teala, 2, 4, 5), + overworld_frame(gObjectEventPic_Teala, 2, 4, 6), + overworld_frame(gObjectEventPic_Teala, 2, 4, 7), + overworld_frame(gObjectEventPic_Teala, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BreakableRock[] = { + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 0), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 1), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 2), + overworld_frame(gObjectEventPic_BreakableRock, 2, 2, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PushableBoulder[] = { + obj_frame_tiles(gObjectEventPic_PushableBoulder), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MrBrineysBoat[] = { + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gObjectEventPic_MrBrineysBoat, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Truck[] = { + obj_frame_tiles(gObjectEventPic_Truck), +}; + +const struct SpriteFrameImage gObjectEventPicTable_VigorothCarryingBox[] = { + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 0), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 1), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_VigorothFacingAway[] = { + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 3), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), + overworld_frame(gObjectEventPic_Vigoroth, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirchsBag[] = { + obj_frame_tiles(gObjectEventPic_BirchsBag), +}; + +const struct SpriteFrameImage gObjectEventPicTable_EnemyZigzagoon[] = { + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 0), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 1), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 2), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 3), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 4), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 5), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 6), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 7), + overworld_frame(gObjectEventPic_EnemyZigzagoon, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Poochyena[] = { + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 0), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 1), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 2), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 3), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 4), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 5), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 6), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 7), + overworld_frame(gObjectEventPic_Poochyena, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Artist[] = { + overworld_frame(gObjectEventPic_Artist, 2, 4, 0), + overworld_frame(gObjectEventPic_Artist, 2, 4, 1), + overworld_frame(gObjectEventPic_Artist, 2, 4, 2), + overworld_frame(gObjectEventPic_Artist, 2, 4, 3), + overworld_frame(gObjectEventPic_Artist, 2, 4, 4), + overworld_frame(gObjectEventPic_Artist, 2, 4, 5), + overworld_frame(gObjectEventPic_Artist, 2, 4, 6), + overworld_frame(gObjectEventPic_Artist, 2, 4, 7), + overworld_frame(gObjectEventPic_Artist, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayNormal[] = { + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_MayNormal, 2, 4, 8), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 0), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 1), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 2), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 3), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 4), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 5), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 6), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 7), + overworld_frame(gObjectEventPic_MayRunning, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayMachBike[] = { + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayMachBike, 4, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayAcroBike[] = { + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 0), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 1), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 2), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 3), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 4), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 5), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 6), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 7), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 8), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 9), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 10), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 11), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 12), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 13), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 14), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 15), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 16), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 17), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 18), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 19), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 20), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 21), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 22), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 23), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 24), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 25), + overworld_frame(gObjectEventPic_MayAcroBike, 4, 4, 26), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MaySurfing[] = { + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 0), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 2), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 4), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 1), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 3), + overworld_frame(gObjectEventPic_MaySurfing, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayUnderwater[] = { + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 0), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 1), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), + overworld_frame(gObjectEventPic_MayUnderwater, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFieldMove[] = { + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFieldMove, 4, 4, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Cameraman[] = { + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 0), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 1), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 2), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 3), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 4), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 5), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 6), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 7), + overworld_frame(gObjectEventPic_Cameraman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MovingBox[] = { + obj_frame_tiles(gObjectEventPic_MovingBox), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CableCar[] = { + obj_frame_tiles(gObjectEventPic_CableCar), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scientist2[] = { + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 0), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 1), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 2), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 3), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 4), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 5), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 6), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 7), + overworld_frame(gObjectEventPic_Scientist2, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DevonEmployee[] = { + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 0), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 1), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 2), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 3), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 4), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 5), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 6), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 7), + overworld_frame(gObjectEventPic_DevonEmployee, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberM[] = { + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AquaMemberF[] = { + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_AquaMemberF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberM[] = { + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberM, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MagmaMemberF[] = { + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gObjectEventPic_MagmaMemberF, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sidney[] = { + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 0), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 1), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), + overworld_frame(gObjectEventPic_Sidney, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Phoebe[] = { + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 0), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 1), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), + overworld_frame(gObjectEventPic_Phoebe, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Glacia[] = { + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 0), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 1), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), + overworld_frame(gObjectEventPic_Glacia, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Drake[] = { + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 0), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 1), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), + overworld_frame(gObjectEventPic_Drake, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Roxanne[] = { + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 0), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 1), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), + overworld_frame(gObjectEventPic_Roxanne, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brawly[] = { + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 0), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 1), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), + overworld_frame(gObjectEventPic_Brawly, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wattson[] = { + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 0), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 1), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), + overworld_frame(gObjectEventPic_Wattson, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Flannery[] = { + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 0), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 1), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), + overworld_frame(gObjectEventPic_Flannery, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Norman[] = { + overworld_frame(gObjectEventPic_Norman, 2, 4, 0), + overworld_frame(gObjectEventPic_Norman, 2, 4, 1), + overworld_frame(gObjectEventPic_Norman, 2, 4, 2), + overworld_frame(gObjectEventPic_Norman, 2, 4, 3), + overworld_frame(gObjectEventPic_Norman, 2, 4, 4), + overworld_frame(gObjectEventPic_Norman, 2, 4, 5), + overworld_frame(gObjectEventPic_Norman, 2, 4, 6), + overworld_frame(gObjectEventPic_Norman, 2, 4, 7), + overworld_frame(gObjectEventPic_Norman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Winona[] = { + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 0), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 1), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), + overworld_frame(gObjectEventPic_Winona, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Liza[] = { + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 0), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 1), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), + overworld_frame(gObjectEventPic_Liza, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tate[] = { + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 0), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 1), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), + overworld_frame(gObjectEventPic_Tate, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wallace[] = { + overworld_frame(gObjectEventPic_Wallace, 2, 4, 0), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 1), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 2), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 3), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 4), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 5), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 6), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 7), + overworld_frame(gObjectEventPic_Wallace, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Steven[] = { + overworld_frame(gObjectEventPic_Steven, 2, 4, 0), + overworld_frame(gObjectEventPic_Steven, 2, 4, 1), + overworld_frame(gObjectEventPic_Steven, 2, 4, 2), + overworld_frame(gObjectEventPic_Steven, 2, 4, 3), + overworld_frame(gObjectEventPic_Steven, 2, 4, 4), + overworld_frame(gObjectEventPic_Steven, 2, 4, 5), + overworld_frame(gObjectEventPic_Steven, 2, 4, 6), + overworld_frame(gObjectEventPic_Steven, 2, 4, 7), + overworld_frame(gObjectEventPic_Steven, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wally[] = { + overworld_frame(gObjectEventPic_Wally, 2, 4, 0), + overworld_frame(gObjectEventPic_Wally, 2, 4, 1), + overworld_frame(gObjectEventPic_Wally, 2, 4, 2), + overworld_frame(gObjectEventPic_Wally, 2, 4, 3), + overworld_frame(gObjectEventPic_Wally, 2, 4, 4), + overworld_frame(gObjectEventPic_Wally, 2, 4, 5), + overworld_frame(gObjectEventPic_Wally, 2, 4, 6), + overworld_frame(gObjectEventPic_Wally, 2, 4, 7), + overworld_frame(gObjectEventPic_Wally, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireLittleBoy[] = { + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 0), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 1), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 2), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 3), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 4), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 5), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 6), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 7), + overworld_frame(gObjectEventPic_RubySapphireLittleBoy, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanFishing[] = { + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_BrendanFishing, 4, 4, 11), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayFishing[] = { + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 0), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 1), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 2), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 3), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 4), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 5), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 6), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 7), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 8), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 9), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 10), + overworld_frame(gObjectEventPic_MayFishing, 4, 4, 11), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HotSpringsOldWoman[] = { + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gObjectEventPic_HotSpringsOldWoman, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SSTidal[] = { + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), + obj_frame_tiles(gObjectEventPic_SSTidal), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SubmarineShadow[] = { + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), + obj_frame_tiles(gObjectEventPic_SubmarineShadow), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PichuDoll[] = { + obj_frame_tiles(gObjectEventPic_PichuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikachuDoll[] = { + obj_frame_tiles(gObjectEventPic_PikachuDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MarillDoll[] = { + obj_frame_tiles(gObjectEventPic_MarillDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TogepiDoll[] = { + obj_frame_tiles(gObjectEventPic_TogepiDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_CyndaquilDoll[] = { + obj_frame_tiles(gObjectEventPic_CyndaquilDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ChikoritaDoll[] = { + obj_frame_tiles(gObjectEventPic_ChikoritaDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TotodileDoll[] = { + obj_frame_tiles(gObjectEventPic_TotodileDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_JigglypuffDoll[] = { + obj_frame_tiles(gObjectEventPic_JigglypuffDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MeowthDoll[] = { + obj_frame_tiles(gObjectEventPic_MeowthDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ClefairyDoll[] = { + obj_frame_tiles(gObjectEventPic_ClefairyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DittoDoll[] = { + obj_frame_tiles(gObjectEventPic_DittoDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SmoochumDoll[] = { + obj_frame_tiles(gObjectEventPic_SmoochumDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TreeckoDoll[] = { + obj_frame_tiles(gObjectEventPic_TreeckoDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TorchicDoll[] = { + obj_frame_tiles(gObjectEventPic_TorchicDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MudkipDoll[] = { + obj_frame_tiles(gObjectEventPic_MudkipDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DuskullDoll[] = { + obj_frame_tiles(gObjectEventPic_DuskullDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WynautDoll[] = { + obj_frame_tiles(gObjectEventPic_WynautDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BaltoyDoll[] = { + obj_frame_tiles(gObjectEventPic_BaltoyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KecleonDoll[] = { + obj_frame_tiles(gObjectEventPic_KecleonDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_AzurillDoll[] = { + obj_frame_tiles(gObjectEventPic_AzurillDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SkittyDoll[] = { + obj_frame_tiles(gObjectEventPic_SkittyDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SwabluDoll[] = { + obj_frame_tiles(gObjectEventPic_SwabluDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GulpinDoll[] = { + obj_frame_tiles(gObjectEventPic_GulpinDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LotadDoll[] = { + obj_frame_tiles(gObjectEventPic_LotadDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SeedotDoll[] = { + obj_frame_tiles(gObjectEventPic_SeedotDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_PikaCushion[] = { + obj_frame_tiles(gObjectEventPic_PikaCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RoundCushion[] = { + obj_frame_tiles(gObjectEventPic_RoundCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KissCushion[] = { + obj_frame_tiles(gObjectEventPic_KissCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ZigzagCushion[] = { + obj_frame_tiles(gObjectEventPic_ZigzagCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_SpinCushion[] = { + obj_frame_tiles(gObjectEventPic_SpinCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_DiamondCushion[] = { + obj_frame_tiles(gObjectEventPic_DiamondCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BallCushion[] = { + obj_frame_tiles(gObjectEventPic_BallCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GrassCushion[] = { + obj_frame_tiles(gObjectEventPic_GrassCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_FireCushion[] = { + obj_frame_tiles(gObjectEventPic_FireCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_WaterCushion[] = { + obj_frame_tiles(gObjectEventPic_WaterCushion), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigSnorlaxDoll[] = { + obj_frame_tiles(gObjectEventPic_BigSnorlaxDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRhydonDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRhydonDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigLaprasDoll[] = { + obj_frame_tiles(gObjectEventPic_BigLaprasDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigVenusaurDoll[] = { + obj_frame_tiles(gObjectEventPic_BigVenusaurDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigCharizardDoll[] = { + obj_frame_tiles(gObjectEventPic_BigCharizardDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigBlastoiseDoll[] = { + obj_frame_tiles(gObjectEventPic_BigBlastoiseDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigWailmerDoll[] = { + obj_frame_tiles(gObjectEventPic_BigWailmerDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegirockDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegirockDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegiceDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegiceDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BigRegisteelDoll[] = { + obj_frame_tiles(gObjectEventPic_BigRegisteelDoll), +}; + +const struct SpriteFrameImage gObjectEventPicTable_LatiasLatios[] = { + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 0), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 1), + overworld_frame(gObjectEventPic_LatiasLatios, 4, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GameboyKid[] = { + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 0), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 1), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), + overworld_frame(gObjectEventPic_GameboyKid, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_ContestJudge[] = { + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 0), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 1), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 2), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 3), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 4), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 5), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 6), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 7), + overworld_frame(gObjectEventPic_ContestJudge, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanWatering[] = { + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_BrendanWatering, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayWatering[] = { + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 0), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 2), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 4), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 1), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 3), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), + overworld_frame(gObjectEventPic_MayWatering, 4, 4, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BrendanDecorating[] = { + obj_frame_tiles(gObjectEventPic_BrendanDecorating), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MayDecorating[] = { + obj_frame_tiles(gObjectEventPic_MayDecorating), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Archie[] = { + overworld_frame(gObjectEventPic_Archie, 2, 4, 0), + overworld_frame(gObjectEventPic_Archie, 2, 4, 1), + overworld_frame(gObjectEventPic_Archie, 2, 4, 2), + overworld_frame(gObjectEventPic_Archie, 2, 4, 3), + overworld_frame(gObjectEventPic_Archie, 2, 4, 4), + overworld_frame(gObjectEventPic_Archie, 2, 4, 5), + overworld_frame(gObjectEventPic_Archie, 2, 4, 6), + overworld_frame(gObjectEventPic_Archie, 2, 4, 7), + overworld_frame(gObjectEventPic_Archie, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Maxie[] = { + overworld_frame(gObjectEventPic_Maxie, 2, 4, 0), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 1), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 2), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 3), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 4), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 5), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 6), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 7), + overworld_frame(gObjectEventPic_Maxie, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KyogreFront[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 0), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GroudonFront[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 0), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_KyogreSide[] = { + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 2), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), + overworld_frame(gObjectEventPic_Kyogre, 4, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_GroudonSide[] = { + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 2), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), + overworld_frame(gObjectEventPic_Groudon, 4, 4, 3), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Fossil[] = { + obj_frame_tiles(gObjectEventPic_Fossil), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Regi[] = { + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), + obj_frame_tiles(gObjectEventPic_Regi), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Skitty[] = { + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 0), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 1), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), + overworld_frame(gObjectEventPic_Skitty, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kecleon[] = { + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 0), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 1), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), + overworld_frame(gObjectEventPic_Kecleon, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Rayquaza[] = { + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 0), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 1), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 2), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 3), + overworld_frame(gObjectEventPic_Rayquaza, 8, 8, 4), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RayquazaStill[] = { + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), + obj_frame_tiles(gObjectEventPic_RayquazaStill), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Zigzagoon[] = { + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 0), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 1), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), + overworld_frame(gObjectEventPic_Zigzagoon, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Pikachu[] = { + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), + overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azumarill[] = { + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azumarill, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Wingull[] = { + overworld_frame(gObjectEventPic_Wingull, 2, 2, 0), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 2), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 4), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 1), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 3), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), + overworld_frame(gObjectEventPic_Wingull, 2, 2, 5), +}; + +const struct SpriteFrameImage gObjectEventPicTable_TuberMSwimming[] = { + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gObjectEventPic_TuberMSwimming, 2, 2, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Azurill[] = { + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 0), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 1), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), + overworld_frame(gObjectEventPic_Azurill, 2, 2, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mom[] = { + overworld_frame(gObjectEventPic_Mom, 2, 4, 0), + overworld_frame(gObjectEventPic_Mom, 2, 4, 1), + overworld_frame(gObjectEventPic_Mom, 2, 4, 2), + overworld_frame(gObjectEventPic_Mom, 2, 4, 3), + overworld_frame(gObjectEventPic_Mom, 2, 4, 4), + overworld_frame(gObjectEventPic_Mom, 2, 4, 5), + overworld_frame(gObjectEventPic_Mom, 2, 4, 6), + overworld_frame(gObjectEventPic_Mom, 2, 4, 7), + overworld_frame(gObjectEventPic_Mom, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Scott[] = { + overworld_frame(gObjectEventPic_Scott, 2, 4, 0), + overworld_frame(gObjectEventPic_Scott, 2, 4, 1), + overworld_frame(gObjectEventPic_Scott, 2, 4, 2), + overworld_frame(gObjectEventPic_Scott, 2, 4, 3), + overworld_frame(gObjectEventPic_Scott, 2, 4, 4), + overworld_frame(gObjectEventPic_Scott, 2, 4, 5), + overworld_frame(gObjectEventPic_Scott, 2, 4, 6), + overworld_frame(gObjectEventPic_Scott, 2, 4, 7), + overworld_frame(gObjectEventPic_Scott, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Juan[] = { + overworld_frame(gObjectEventPic_Juan, 2, 4, 0), + overworld_frame(gObjectEventPic_Juan, 2, 4, 1), + overworld_frame(gObjectEventPic_Juan, 2, 4, 2), + overworld_frame(gObjectEventPic_Juan, 2, 4, 3), + overworld_frame(gObjectEventPic_Juan, 2, 4, 4), + overworld_frame(gObjectEventPic_Juan, 2, 4, 5), + overworld_frame(gObjectEventPic_Juan, 2, 4, 6), + overworld_frame(gObjectEventPic_Juan, 2, 4, 7), + overworld_frame(gObjectEventPic_Juan, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_MysteryEventDeliveryman[] = { + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gObjectEventPic_MysteryEventDeliveryman, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Statue[] = { + obj_frame_tiles(gObjectEventPic_Statue), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Dusclops[] = { + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 0), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 1), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 2), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 3), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 4), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 5), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 6), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 7), + overworld_frame(gObjectEventPic_Dusclops, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Kirlia[] = { + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 0), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 1), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 2), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 3), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 4), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 5), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 6), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 7), + overworld_frame(gObjectEventPic_Kirlia, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_UnionRoomAttendant[] = { + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gObjectEventPic_UnionRoomAttendant, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Sudowoodo[] = { + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 1), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 0), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 1), + overworld_frame(gObjectEventPic_Sudowoodo, 2, 4, 2), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Mew[] = { + overworld_frame(gObjectEventPic_Mew, 2, 4, 0), + overworld_frame(gObjectEventPic_Mew, 2, 4, 1), + overworld_frame(gObjectEventPic_Mew, 2, 4, 2), + overworld_frame(gObjectEventPic_Mew, 2, 4, 3), + overworld_frame(gObjectEventPic_Mew, 2, 4, 4), + overworld_frame(gObjectEventPic_Mew, 2, 4, 5), + overworld_frame(gObjectEventPic_Mew, 2, 4, 6), + overworld_frame(gObjectEventPic_Mew, 2, 4, 7), + overworld_frame(gObjectEventPic_Mew, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Red[] = { + overworld_frame(gObjectEventPic_Red, 2, 4, 0), + overworld_frame(gObjectEventPic_Red, 2, 4, 1), + overworld_frame(gObjectEventPic_Red, 2, 4, 2), + overworld_frame(gObjectEventPic_Red, 2, 4, 3), + overworld_frame(gObjectEventPic_Red, 2, 4, 4), + overworld_frame(gObjectEventPic_Red, 2, 4, 5), + overworld_frame(gObjectEventPic_Red, 2, 4, 6), + overworld_frame(gObjectEventPic_Red, 2, 4, 7), + overworld_frame(gObjectEventPic_Red, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Leaf[] = { + overworld_frame(gObjectEventPic_Leaf, 2, 4, 0), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 1), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 2), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 3), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 4), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 5), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 6), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 7), + overworld_frame(gObjectEventPic_Leaf, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Deoxys[] = { + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 1), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 1), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), + overworld_frame(gObjectEventPic_Deoxys, 4, 4, 0), +}; + +const struct SpriteFrameImage gObjectEventPicTable_BirthIslandStone[] = { + obj_frame_tiles(gObjectEventPic_BirthIslandStone), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Anabel[] = { + overworld_frame(gObjectEventPic_Anabel, 2, 4, 0), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 1), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 2), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 3), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 4), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 5), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 6), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 7), + overworld_frame(gObjectEventPic_Anabel, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Tucker[] = { + overworld_frame(gObjectEventPic_Tucker, 2, 4, 0), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 1), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 2), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 3), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 4), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 5), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 6), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 7), + overworld_frame(gObjectEventPic_Tucker, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Spenser[] = { + overworld_frame(gObjectEventPic_Spenser, 2, 4, 0), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 1), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 2), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 3), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 4), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 5), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 6), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 7), + overworld_frame(gObjectEventPic_Spenser, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Greta[] = { + overworld_frame(gObjectEventPic_Greta, 2, 4, 0), + overworld_frame(gObjectEventPic_Greta, 2, 4, 1), + overworld_frame(gObjectEventPic_Greta, 2, 4, 2), + overworld_frame(gObjectEventPic_Greta, 2, 4, 3), + overworld_frame(gObjectEventPic_Greta, 2, 4, 4), + overworld_frame(gObjectEventPic_Greta, 2, 4, 5), + overworld_frame(gObjectEventPic_Greta, 2, 4, 6), + overworld_frame(gObjectEventPic_Greta, 2, 4, 7), + overworld_frame(gObjectEventPic_Greta, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Noland[] = { + overworld_frame(gObjectEventPic_Noland, 2, 4, 0), + overworld_frame(gObjectEventPic_Noland, 2, 4, 1), + overworld_frame(gObjectEventPic_Noland, 2, 4, 2), + overworld_frame(gObjectEventPic_Noland, 2, 4, 3), + overworld_frame(gObjectEventPic_Noland, 2, 4, 4), + overworld_frame(gObjectEventPic_Noland, 2, 4, 5), + overworld_frame(gObjectEventPic_Noland, 2, 4, 6), + overworld_frame(gObjectEventPic_Noland, 2, 4, 7), + overworld_frame(gObjectEventPic_Noland, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lucy[] = { + overworld_frame(gObjectEventPic_Lucy, 2, 4, 0), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 1), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 2), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 3), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 4), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 5), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 6), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 7), + overworld_frame(gObjectEventPic_Lucy, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Brandon[] = { + overworld_frame(gObjectEventPic_Brandon, 2, 4, 0), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 1), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 2), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 3), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 4), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 5), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 6), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 7), + overworld_frame(gObjectEventPic_Brandon, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_Lugia[] = { + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), + overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_HoOh[] = { + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), + overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireBrendan[] = { + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_RubySapphireBrendanNormal, 2, 4, 8), +}; + +const struct SpriteFrameImage gObjectEventPicTable_RubySapphireMay[] = { + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 0), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 1), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 2), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 3), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 4), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 5), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 6), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 7), + overworld_frame(gObjectEventPic_RubySapphireMayNormal, 2, 4, 8), +}; diff --git a/src/data/field_event_obj/event_object_subsprites.h b/src/data/event_object/event_object_subsprites.h similarity index 53% rename from src/data/field_event_obj/event_object_subsprites.h rename to src/data/event_object/event_object_subsprites.h index 5da2627319..3beccb4162 100755 --- a/src/data/field_event_obj/event_object_subsprites.h +++ b/src/data/event_object/event_object_subsprites.h @@ -1,102 +1,102 @@ -const struct Subsprite gEventObjectSpriteOamTable_16x16_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_0[] = { { -8, -8, 0, 1, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_1[] = { { -8, -8, 0, 1, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_2[] = { { -8, -8, 1, 0, 0, 2}, { -8, 0, 1, 0, 2, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_3[] = { { -8, -8, 0, 1, 0, 2}, { -8, -8, 0, 1, 0, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x16_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x16_4[] = { { -8, -8, 0, 1, 0, 1}, { -8, -8, 0, 1, 0, 3} }; -const struct SubspriteTable gEventObjectSpriteOamTables_16x16[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_16x16[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_16x16_0}, - {1, gEventObjectSpriteOamTable_16x16_1}, - {2, gEventObjectSpriteOamTable_16x16_2}, - {2, gEventObjectSpriteOamTable_16x16_3}, - {2, gEventObjectSpriteOamTable_16x16_4} + {1, gObjectEventSpriteOamTable_16x16_0}, + {1, gObjectEventSpriteOamTable_16x16_1}, + {2, gObjectEventSpriteOamTable_16x16_2}, + {2, gObjectEventSpriteOamTable_16x16_3}, + {2, gObjectEventSpriteOamTable_16x16_4} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_0[] = { { -8, -16, 2, 2, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_1[] = { { -8, -16, 2, 2, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_2[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 1, 0, 4, 2}, { -8, 8, 1, 0, 6, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_3[] = { { -8, -16, 0, 1, 0, 2}, { -8, 0, 0, 1, 4, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_16x32_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_16x32_4[] = { { -8, -16, 0, 1, 0, 1}, { -8, 0, 0, 1, 4, 3} }; -const struct SubspriteTable gEventObjectSpriteOamTables_16x32[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_16x32[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_16x32_0}, - {1, gEventObjectSpriteOamTable_16x32_1}, - {3, gEventObjectSpriteOamTable_16x32_2}, - {2, gEventObjectSpriteOamTable_16x32_3}, - {2, gEventObjectSpriteOamTable_16x32_4} + {1, gObjectEventSpriteOamTable_16x32_0}, + {1, gObjectEventSpriteOamTable_16x32_1}, + {3, gObjectEventSpriteOamTable_16x32_2}, + {2, gObjectEventSpriteOamTable_16x32_3}, + {2, gObjectEventSpriteOamTable_16x32_4} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_0[] = { {-16, -16, 0, 2, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_1[] = { {-16, -16, 0, 2, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_2[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 1, 8, 2}, {-16, 8, 1, 1, 12, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_3[] = { {-16, -16, 1, 2, 0, 2}, {-16, 0, 1, 2, 8, 3} }; -const struct Subsprite gEventObjectSpriteOamTable_32x32_4[] = { +const struct Subsprite gObjectEventSpriteOamTable_32x32_4[] = { {-16, -16, 1, 2, 0, 1}, {-16, 0, 1, 2, 8, 3} }; -const struct SubspriteTable gEventObjectSpriteOamTables_32x32[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_32x32_0}, - {1, gEventObjectSpriteOamTable_32x32_1}, - {3, gEventObjectSpriteOamTable_32x32_2}, - {2, gEventObjectSpriteOamTable_32x32_3}, - {2, gEventObjectSpriteOamTable_32x32_4} + {1, gObjectEventSpriteOamTable_32x32_0}, + {1, gObjectEventSpriteOamTable_32x32_1}, + {3, gObjectEventSpriteOamTable_32x32_2}, + {2, gObjectEventSpriteOamTable_32x32_3}, + {2, gObjectEventSpriteOamTable_32x32_4} }; -const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = { {-24, -24, 1, 1, 0, 2}, { 8, -24, 1, 0, 4, 2}, {-24, -16, 1, 1, 6, 2}, @@ -111,66 +111,66 @@ const struct Subsprite gEventObjectSpriteOamTable_Truck_0[] = { { 8, 16, 1, 0, 34, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_Truck[] = { - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0}, - {12, gEventObjectSpriteOamTable_Truck_0} +const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = { + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0}, + {12, gObjectEventSpriteOamTable_Truck_0} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = { {-32, -16, 1, 3, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = { {-32, -16, 1, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_Unused_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = { {-32, -16, 1, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_Unused[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_Unused_0}, - {1, gEventObjectSpriteOamTable_Unused_1}, - {1, gEventObjectSpriteOamTable_Unused_2}, - {1, gEventObjectSpriteOamTable_Unused_3}, - {1, gEventObjectSpriteOamTable_Unused_3} + {1, gObjectEventSpriteOamTable_Unused_0}, + {1, gObjectEventSpriteOamTable_Unused_1}, + {1, gObjectEventSpriteOamTable_Unused_2}, + {1, gObjectEventSpriteOamTable_Unused_3}, + {1, gObjectEventSpriteOamTable_Unused_3} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_1[] = { {-32, -32, 0, 3, 0, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_2[] = { {-32, -32, 0, 3, 0, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_64x64_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x64_3[] = { {-32, -32, 0, 3, 0, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_64x64[] = { +const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = { {0, NULL}, - {1, gEventObjectSpriteOamTable_64x64_0}, - {1, gEventObjectSpriteOamTable_64x64_1}, - {1, gEventObjectSpriteOamTable_64x64_2}, - {1, gEventObjectSpriteOamTable_64x64_3}, - {1, gEventObjectSpriteOamTable_64x64_3} + {1, gObjectEventSpriteOamTable_64x64_0}, + {1, gObjectEventSpriteOamTable_64x64_1}, + {1, gObjectEventSpriteOamTable_64x64_2}, + {1, gObjectEventSpriteOamTable_64x64_3}, + {1, gObjectEventSpriteOamTable_64x64_3} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -188,7 +188,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_0[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -206,7 +206,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_1[] = { { 16, 12, 1, 1, 56, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 1, 8, 2}, @@ -224,7 +224,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_2[] = { { 16, 12, 1, 1, 56, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 1, 8, 1}, @@ -242,16 +242,16 @@ const struct Subsprite gEventObjectSpriteOamTable_SSTidal_3[] = { { 16, 12, 1, 1, 56, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_SSTidal[] = { - {15, gEventObjectSpriteOamTable_SSTidal_0}, - {15, gEventObjectSpriteOamTable_SSTidal_0}, - {15, gEventObjectSpriteOamTable_SSTidal_1}, - {15, gEventObjectSpriteOamTable_SSTidal_2}, - {15, gEventObjectSpriteOamTable_SSTidal_3}, - {15, gEventObjectSpriteOamTable_SSTidal_3} +const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = { + {15, gObjectEventSpriteOamTable_SSTidal_0}, + {15, gObjectEventSpriteOamTable_SSTidal_0}, + {15, gObjectEventSpriteOamTable_SSTidal_1}, + {15, gObjectEventSpriteOamTable_SSTidal_2}, + {15, gObjectEventSpriteOamTable_SSTidal_3}, + {15, gObjectEventSpriteOamTable_SSTidal_3} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -270,7 +270,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_0[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -289,7 +289,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_1[] = { { 32, 4, 0, 0, 43, 1} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = { {-48, -20, 1, 1, 0, 2}, {-16, -20, 1, 1, 4, 2}, { 16, -20, 1, 0, 8, 2}, @@ -308,7 +308,7 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_2[] = { { 32, 4, 0, 0, 43, 2} }; -const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = { {-48, -20, 1, 1, 0, 1}, {-16, -20, 1, 1, 4, 1}, { 16, -20, 1, 0, 8, 1}, @@ -327,11 +327,11 @@ const struct Subsprite gEventObjectSpriteOamTable_SubmarineShadow_3[] = { { 32, 4, 0, 0, 43, 2} }; -const struct SubspriteTable gEventObjectSpriteOamTables_SubmarineShadow[] = { - {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_0}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_1}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_2}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_3}, - {16, gEventObjectSpriteOamTable_SubmarineShadow_3} +const struct SubspriteTable gObjectEventSpriteOamTables_SubmarineShadow[] = { + {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_1}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_2}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_3}, + {16, gObjectEventSpriteOamTable_SubmarineShadow_3} }; diff --git a/src/data/field_event_obj/field_effect_object_template_pointers.h b/src/data/event_object/field_effect_object_template_pointers.h similarity index 100% rename from src/data/field_event_obj/field_effect_object_template_pointers.h rename to src/data/event_object/field_effect_object_template_pointers.h diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/event_object/field_effect_objects.h similarity index 93% rename from src/data/field_event_obj/field_effect_objects.h rename to src/data/event_object/field_effect_objects.h index a3944de361..e47973dae9 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/event_object/field_effect_objects.h @@ -29,13 +29,13 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), @@ -60,7 +60,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = gFieldEffectObjectImageAnim_850CA84, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), @@ -88,7 +88,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = gFieldEffectObjectImageAnim_850CAE0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), @@ -113,7 +113,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = gFieldEffectObjectImageAnim_850CB48, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, UpdateAshFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0), @@ -153,7 +153,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = gSurfBlobAnim_FaceEast, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), @@ -202,7 +202,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = gFieldEffectObjectImageAnim_850CC40, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), @@ -223,7 +223,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = gFieldEffectObjectImageAnim_850CC8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0), @@ -246,7 +246,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = gFieldEffectObjectImageAnim_850CCD8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), @@ -286,7 +286,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = gFieldEffectObjectImageAnim_850CD30, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), @@ -326,7 +326,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] gFieldEffectObjectImageAnim_850CD8C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0), @@ -396,7 +396,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = gFieldEffectObjectImageAnim_850CE18, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0), @@ -419,7 +419,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = gFieldEffectObjectImageAnim_850CE7C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), @@ -452,7 +452,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = gFieldEffectObjectImageAnim_850CEC8, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0), @@ -473,7 +473,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] gFieldEffectObjectImageAnim_850CF24, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), @@ -499,7 +499,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = gFieldEffectObjectImageAnim_850CF70, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0), @@ -526,7 +526,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = gFieldEffectObjectImageAnim_850CFDC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), @@ -559,7 +559,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = gFieldEffectObjectImageAnim_850D05C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0), @@ -584,7 +584,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = gFieldEffectObjectImageAnim_850D0C0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), @@ -607,7 +607,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = gFieldEffectObjectImageAnim_850D118, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0), @@ -628,7 +628,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = gFieldEffectObjectImageAnim_850D160, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), @@ -653,7 +653,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown20[] = gFieldEffectObjectImageAnim_850D1AC, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown20 = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const union AffineAnimCmd gFieldEffectObjectRotScalAnim_850D1E4[] = { @@ -730,7 +730,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark gFieldEffectObjectImageAnim_850D2D4, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; +const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), @@ -766,7 +766,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = gFieldEffectObjectImageAnim_850D384, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), @@ -802,7 +802,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = gFieldEffectObjectImageAnim_850D404, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), @@ -814,7 +814,7 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { obj_frame_tiles(gFieldEffectObjectPic_Bird), @@ -831,7 +831,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = gFieldEffectObjectImageAnim_850D49C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), @@ -850,7 +850,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = gFieldEffectObjectImageAnim_850D4D0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), @@ -867,7 +867,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = gFieldEffectObjectImageAnim_850D500, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0), @@ -892,7 +892,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_JumpOutOfAsh[] = gFieldEffectObjectImageAnim_850D54C, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; +const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpOutOfAsh, gFieldEffectObjectPicTable_JumpOutOfAsh, gDummySpriteAffineAnimTable, sub_80B7CAC}; const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; @@ -919,7 +919,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] = gFieldEffectObjectImageAnim_850D5B0, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), @@ -950,7 +950,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = gFieldEffectObjectImageAnim_850D624, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gObjectEventBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0), @@ -970,7 +970,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown35[] = gFieldEffectObjectImageAnim_850D674, }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown35 = {0xFFFF, 0x100F, &gObjectEventBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect}; const struct SpritePalette gFieldEffectObjectPaletteInfo3 = {gFieldEffectObjectPalette3, 0x100F}; @@ -984,9 +984,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { }; const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), + overworld_frame(gObjectEventPic_Rayquaza, 4, 4, 0), }; -const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; +const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gObjectEventBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80}; -const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gEventObjectPalette2, 0x1011}; +const struct SpritePalette gFieldEffectObjectPaletteInfoUnused = {gObjectEventPalette2, 0x1011}; diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/event_object/movement_action_func_tables.h similarity index 50% rename from src/data/field_event_obj/movement_action_func_tables.h rename to src/data/event_object/movement_action_func_tables.h index 8e136b58ba..8cf7d1699f 100755 --- a/src/data/field_event_obj/movement_action_func_tables.h +++ b/src/data/event_object/movement_action_func_tables.h @@ -1,427 +1,427 @@ -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *); -u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_HideReflection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_ShowReflection_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkLeftAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkLeftAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkRightAffine_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_WalkRightAffine_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Figure8_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Figure8_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Levitate_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_StopLevitate_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyUp_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyUp_Step1(struct EventObject *, struct Sprite *); -u8 MovementAction_Fly_Finish(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyDown_Step0(struct EventObject *, struct Sprite *); -u8 MovementAction_FlyDown_Step1(struct EventObject *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PauseSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Down_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Up_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Left_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Jump2Right_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay1_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay2_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay4_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Delay16_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SlideRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WaitSpriteAnim(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FacePlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetInvisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetVisible_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_CutTree_Step2(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_SetFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearFixedPriority_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_InitAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ClearAffineAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_HideReflection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_ShowReflection_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkLeftAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_WalkRightAffine_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Figure8_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Figure8_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Levitate_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StopLevitate_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyUp_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyUp_Step1(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_Fly_Finish(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyDown_Step0(struct ObjectEvent *, struct Sprite *); +u8 MovementAction_FlyDown_Step1(struct ObjectEvent *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *); -u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_HideReflection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_ShowReflection[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_StopLevitate[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *); +u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *); -u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = { +u8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite *) = { [MOVEMENT_ACTION_FACE_DOWN] = gMovementActionFuncs_FaceDown, [MOVEMENT_ACTION_FACE_UP] = gMovementActionFuncs_FaceUp, [MOVEMENT_ACTION_FACE_LEFT] = gMovementActionFuncs_FaceLeft, @@ -582,22 +582,22 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) [MOVEMENT_ACTION_FLY_DOWN] = gMovementActionFuncs_FlyDown, }; -u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceDown_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceUp_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceRight_Step0, MovementAction_PauseSpriteAnim, }; @@ -610,97 +610,97 @@ u8 (*const gUnknown_0850DEE8[])(u8) = { GetMoveDirectionFastestAnimNum, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalUpLeft_Step0, MovementAction_WalkSlowDiagonalUpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalUpRight_Step0, MovementAction_WalkSlowDiagonalUpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalDownLeft_Step0, MovementAction_WalkSlowDiagonalDownLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDiagonalDownRight_Step0, MovementAction_WalkSlowDiagonalDownRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowDown_Step0, MovementAction_WalkSlowDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowUp_Step0, MovementAction_WalkSlowUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowLeft_Step0, MovementAction_WalkSlowLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkSlowRight_Step0, MovementAction_WalkSlowRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalUpLeft_Step0, MovementAction_WalkNormalDiagonalUpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalUpRight_Step0, MovementAction_WalkNormalDiagonalUpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalDownLeft_Step0, MovementAction_WalkNormalDiagonalDownLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDiagonalDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDiagonalDownRight_Step0, MovementAction_WalkNormalDiagonalDownRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalDown_Step0, MovementAction_WalkNormalDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalUp_Step0, MovementAction_WalkNormalUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalLeft_Step0, MovementAction_WalkNormalLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkNormalRight_Step0, MovementAction_WalkNormalRight_Step1, MovementAction_PauseSpriteAnim, @@ -709,805 +709,805 @@ u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct const s16 gUnknown_0850DFBC[] = {0, 1, 1}; const s16 gUnknown_0850DFC2[] = {0, 0, 1}; -u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Down[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Down_Step0, MovementAction_Jump2Down_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Up[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Up_Step0, MovementAction_Jump2Up_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Left[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Left_Step0, MovementAction_Jump2Left_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Jump2Right[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Jump2Right_Step0, MovementAction_Jump2Right_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay1[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay1_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay2[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay2_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay4[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay4_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay8_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Delay16[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Delay16_Step0, MovementAction_Delay_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastDown_Step0, MovementAction_WalkFastDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastUp_Step0, MovementAction_WalkFastUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastLeft_Step0, MovementAction_WalkFastLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastRight_Step0, MovementAction_WalkFastRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowDown_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowUp_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowLeft_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceSlowRight_Step0, MovementAction_WalkInPlaceSlow_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceNormalRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkInPlaceFastestRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentDown_Step0, MovementAction_RideWaterCurrentDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentUp_Step0, MovementAction_RideWaterCurrentUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentLeft_Step0, MovementAction_RideWaterCurrentLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RideWaterCurrentRight_Step0, MovementAction_RideWaterCurrentRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestDown_Step0, MovementAction_WalkFastestDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestUp_Step0, MovementAction_WalkFastestUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestLeft_Step0, MovementAction_WalkFastestLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkFastestRight_Step0, MovementAction_WalkFastestRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideDown_Step0, MovementAction_SlideDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideUp_Step0, MovementAction_SlideUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideLeft_Step0, MovementAction_SlideLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SlideRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SlideRight_Step0, MovementAction_SlideRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunDown_Step0, MovementAction_PlayerRunDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunUp_Step0, MovementAction_PlayerRunUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunLeft_Step0, MovementAction_PlayerRunLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_PlayerRunRight_Step0, MovementAction_PlayerRunRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StartAnimInDirection_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialDown_Step0, MovementAction_JumpSpecialDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialUp_Step0, MovementAction_JumpSpecialUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialLeft_Step0, MovementAction_JumpSpecialLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpSpecialRight_Step0, MovementAction_JumpSpecialRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FacePlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FacePlayer_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceAwayPlayer_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_LockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnlockFacingDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpDown_Step0, MovementAction_JumpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpUp_Step0, MovementAction_JumpUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpLeft_Step0, MovementAction_JumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpRight_Step0, MovementAction_JumpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDown_Step0, MovementAction_JumpInPlaceDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUp_Step0, MovementAction_JumpInPlaceUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeft_Step0, MovementAction_JumpInPlaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRight_Step0, MovementAction_JumpInPlaceRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceDownUp_Step0, MovementAction_JumpInPlaceDownUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceUpDown_Step0, MovementAction_JumpInPlaceUpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceLeftRight_Step0, MovementAction_JumpInPlaceLeftRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_JumpInPlaceRightLeft_Step0, MovementAction_JumpInPlaceRightLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FaceOriginalDirection_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_NurseJoyBowDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EnableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableJumpLandingGroundEffect_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DisableAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DisableAnimation_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RestoreAnimation_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetInvisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetInvisible_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetVisible[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetVisible_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteExclamationMark_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteQuestionMark_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_EmoteHeart[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_EmoteHeart_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RevealTrainer[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RevealTrainer_Step0, MovementAction_RevealTrainer_Step1, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_RockSmashBreak_Step0, MovementAction_RockSmashBreak_Step1, MovementAction_RockSmashBreak_Step2, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_CutTree[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_CutTree_Step0, MovementAction_CutTree_Step1, MovementAction_CutTree_Step2, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_SetFixedPriority_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearFixedPriority_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_InitAffineAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ClearAffineAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_HideReflection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_HideReflection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_HideReflection_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_ShowReflection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_ShowReflection[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_ShowReflection_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownStartAffine_Step0, MovementAction_WalkDownStartAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkDownAffine_Step0, MovementAction_WalkDownAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkLeftAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkLeftAffine_Step0, MovementAction_WalkLeftAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_WalkRightAffine[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_WalkRightAffine_Step0, MovementAction_WalkRightAffine_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceDown_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceUp_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceLeft_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieFaceRight_Step0, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieFaceRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionDown_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionUp_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionLeft_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroUnusedAcroActionRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_UnusedAcroActionRight_Step0, MovementAction_WaitSpriteAnim, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Figure8[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Figure8[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Figure8_Step0, MovementAction_Figure8_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceDown_Step0, MovementAction_AcroWheelieHopFaceDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceUp_Step0, MovementAction_AcroWheelieHopFaceUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceLeft_Step0, MovementAction_AcroWheelieHopFaceLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopFaceRight_Step0, MovementAction_AcroWheelieHopFaceRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopDown_Step0, MovementAction_AcroWheelieHopDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopUp_Step0, MovementAction_AcroWheelieHopUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopLeft_Step0, MovementAction_AcroWheelieHopLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieHopRight_Step0, MovementAction_AcroWheelieHopRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpDown_Step0, MovementAction_AcroWheelieJumpDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpUp_Step0, MovementAction_AcroWheelieJumpUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpLeft_Step0, MovementAction_AcroWheelieJumpLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieJumpRight_Step0, MovementAction_AcroWheelieJumpRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceDown_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceUp_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceLeft_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieInPlaceRight_Step0, MovementAction_WalkInPlace_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveDown_Step0, MovementAction_AcroPopWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveUp_Step0, MovementAction_AcroPopWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveLeft_Step0, MovementAction_AcroPopWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroPopWheelieMoveRight_Step0, MovementAction_AcroPopWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveDown_Step0, MovementAction_AcroWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveUp_Step0, MovementAction_AcroWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveLeft_Step0, MovementAction_AcroWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroWheelieMoveRight_Step0, MovementAction_AcroWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveDown_Step0, MovementAction_AcroEndWheelieMoveDown_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveUp_Step0, MovementAction_AcroEndWheelieMoveUp_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveLeft_Step0, MovementAction_AcroEndWheelieMoveLeft_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_AcroEndWheelieMoveRight_Step0, MovementAction_AcroEndWheelieMoveRight_Step1, MovementAction_PauseSpriteAnim, }; -u8 (*const gMovementActionFuncs_Levitate[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_Levitate[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_Levitate_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_StopLevitate[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StopLevitate[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StopLevitate_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_DestroyExtraTaskIfAtTop[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_DestroyExtraTaskIfAtTop_Step0, MovementAction_Finish, }; diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/event_object/movement_type_func_tables.h similarity index 80% rename from src/data/field_event_obj/movement_type_func_tables.h rename to src/data/event_object/movement_type_func_tables.h index 3c490011bf..7d149a6284 100755 --- a/src/data/field_event_obj/movement_type_func_tables.h +++ b/src/data/event_object/movement_type_func_tables.h @@ -1,4 +1,4 @@ -u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderAround_Step0, MovementType_WanderAround_Step1, MovementType_WanderAround_Step2, @@ -24,7 +24,7 @@ u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = { GetLimitedVectorDirection_SouthWestEast, }; -u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_LookAround[])(struct ObjectEvent *, struct Sprite *) = { MovementType_LookAround_Step0, MovementType_LookAround_Step1, MovementType_LookAround_Step2, @@ -32,7 +32,7 @@ u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite MovementType_LookAround_Step4, }; -u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderUpAndDown_Step0, MovementType_WanderUpAndDown_Step1, MovementType_WanderUpAndDown_Step2, @@ -44,7 +44,7 @@ u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sp const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WanderLeftAndRight_Step0, MovementType_WanderLeftAndRight_Step1, MovementType_WanderLeftAndRight_Step2, @@ -56,13 +56,13 @@ u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDirection[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDirection_Step0, MovementType_FaceDirection_Step1, MovementType_FaceDirection_Step2, }; -u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_BerryTreeGrowth_Step0, MovementType_BerryTreeGrowth_Step1, MovementType_BerryTreeGrowth_Step2, @@ -70,7 +70,7 @@ u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sp MovementType_BerryTreeGrowth_Step4, }; -u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndUp_Step0, MovementType_FaceDownAndUp_Step1, MovementType_FaceDownAndUp_Step2, @@ -78,7 +78,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Spri MovementType_FaceDownAndUp_Step4, }; -u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceLeftAndRight_Step0, MovementType_FaceLeftAndRight_Step1, MovementType_FaceLeftAndRight_Step2, @@ -86,7 +86,7 @@ u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct S MovementType_FaceLeftAndRight_Step4, }; -u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndLeft_Step0, MovementType_FaceUpAndLeft_Step1, MovementType_FaceUpAndLeft_Step2, @@ -96,7 +96,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Spri const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpAndRight_Step0, MovementType_FaceUpAndRight_Step1, MovementType_FaceUpAndRight_Step2, @@ -106,7 +106,7 @@ u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Spr const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndLeft_Step0, MovementType_FaceDownAndLeft_Step1, MovementType_FaceDownAndLeft_Step2, @@ -116,7 +116,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sp const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownAndRight_Step0, MovementType_FaceDownAndRight_Step1, MovementType_FaceDownAndRight_Step2, @@ -126,7 +126,7 @@ u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct S const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndLeft_Step0, MovementType_FaceDownUpAndLeft_Step1, MovementType_FaceDownUpAndLeft_Step2, @@ -136,7 +136,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownUpAndRight_Step0, MovementType_FaceDownUpAndRight_Step1, MovementType_FaceDownUpAndRight_Step2, @@ -146,7 +146,7 @@ u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceUpLeftAndRight_Step0, MovementType_FaceUpLeftAndRight_Step1, MovementType_FaceUpLeftAndRight_Step2, @@ -156,7 +156,7 @@ u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_FaceDownLeftAndRight_Step0, MovementType_FaceDownLeftAndRight_Step1, MovementType_FaceDownLeftAndRight_Step2, @@ -166,7 +166,7 @@ u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, stru const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateCounterclockwise_Step0, MovementType_RotateCounterclockwise_Step1, MovementType_RotateCounterclockwise_Step2, @@ -175,7 +175,7 @@ u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, st const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RotateClockwise_Step0, MovementType_RotateClockwise_Step1, MovementType_RotateClockwise_Step2, @@ -184,14 +184,14 @@ u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sp const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkBackAndForth_Step0, MovementType_WalkBackAndForth_Step1, MovementType_WalkBackAndForth_Step2, MovementType_WalkBackAndForth_Step3, }; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightLeftDown_Step1, MovementType_WalkSequence_Step2, @@ -199,7 +199,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftDownUp_Step1, MovementType_WalkSequence_Step2, @@ -207,7 +207,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpRightLeft_Step1, MovementType_WalkSequence_Step2, @@ -215,7 +215,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownUpRight_Step1, MovementType_WalkSequence_Step2, @@ -223,7 +223,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftRightDown_Step1, MovementType_WalkSequence_Step2, @@ -231,7 +231,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightDownUp_Step1, MovementType_WalkSequence_Step2, @@ -239,13 +239,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownUpLeftRight_Step1, MovementType_WalkSequence_Step2, }; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownUpLeft_Step1, MovementType_WalkSequence_Step2, @@ -253,7 +253,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpDownRight_Step1, MovementType_WalkSequence_Step2, @@ -261,7 +261,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownRightLeft_Step1, MovementType_WalkSequence_Step2, @@ -269,7 +269,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightLeftUpDown_Step1, MovementType_WalkSequence_Step2, @@ -277,7 +277,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightLeftUp_Step1, MovementType_WalkSequence_Step2, @@ -285,7 +285,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpDownLeft_Step1, MovementType_WalkSequence_Step2, @@ -293,7 +293,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpDownLeftRight_Step1, MovementType_WalkSequence_Step2, @@ -301,7 +301,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftRightUpDown_Step1, MovementType_WalkSequence_Step2, @@ -309,7 +309,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftRightUp_Step1, MovementType_WalkSequence_Step2, @@ -317,7 +317,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpLeftDownRight_Step1, MovementType_WalkSequence_Step2, @@ -325,7 +325,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownRightUpLeft_Step1, MovementType_WalkSequence_Step2, @@ -333,7 +333,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftDownRightUp_Step1, MovementType_WalkSequence_Step2, @@ -341,7 +341,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightUpLeftDown_Step1, MovementType_WalkSequence_Step2, @@ -349,7 +349,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceUpRightDownLeft_Step1, MovementType_WalkSequence_Step2, @@ -357,7 +357,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; -u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceDownLeftUpRight_Step1, MovementType_WalkSequence_Step2, @@ -365,7 +365,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST}; -u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceLeftUpRightDown_Step1, MovementType_WalkSequence_Step2, @@ -373,7 +373,7 @@ u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH}; -u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSequence_Step0, MovementType_WalkSequenceRightDownLeftUp_Step1, MovementType_WalkSequence_Step2, @@ -381,13 +381,13 @@ u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH}; -u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayer_Step1, MovementType_CopyPlayer_Step2, }; -bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = { +bool8 (*const gCopyPlayerMovementFuncs[])(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)) = { CopyablePlayerMovement_None, CopyablePlayerMovement_FaceDirection, CopyablePlayerMovement_GoSpeed0, @@ -401,37 +401,37 @@ bool8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, CopyablePlayerMovement_None, }; -u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct ObjectEvent *, struct Sprite *) = { MovementType_CopyPlayer_Step0, MovementType_CopyPlayerInGrass_Step1, MovementType_CopyPlayer_Step2, }; -u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Hidden[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Hidden_Step0, }; -u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_WalkSlowlyInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_WalkSlowlyInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_JogInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_JogInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_RunInPlace[])(struct ObjectEvent *, struct Sprite *) = { MovementType_RunInPlace_Step0, MovementType_MoveInPlace_Step1, }; -u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementTypeFuncs_Invisible[])(struct ObjectEvent *, struct Sprite *) = { MovementType_Invisible_Step0, MovementType_Invisible_Step1, MovementType_Invisible_Step2, diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h deleted file mode 100755 index 27d5b1f9a1..0000000000 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ /dev/null @@ -1,565 +0,0 @@ -const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; - -const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; - -const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; - -const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; - -const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), - overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), - overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5), -}; - -const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; - -const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES}; - -const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; - -const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, -}; - -const u8 *const gBerryTreePaletteSlotTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, -}; - -const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { - [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - // 3 unused berries. - [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, - [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, -}; diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h deleted file mode 100755 index 6203e0548f..0000000000 --- a/src/data/field_event_obj/event_object_anims.h +++ /dev/null @@ -1,1171 +0,0 @@ -const union AnimCmd gEventObjectImageAnim_StayStill[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceSouth[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceNorth[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceWest[] = -{ - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpFaceEast[] = -{ - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoSouth[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(3, 8, .hFlip = TRUE), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoNorth[] = -{ - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(4, 8, .hFlip = TRUE), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoWest[] = -{ - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoEast[] = -{ - ANIMCMD_FRAME(5, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(6, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastSouth[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastNorth[] = -{ - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(4, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastWest[] = -{ - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastEast[] = -{ - ANIMCMD_FRAME(5, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(6, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterSouth[] = -{ - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(3, 2, .hFlip = TRUE), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterNorth[] = -{ - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(4, 2, .hFlip = TRUE), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterWest[] = -{ - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFasterEast[] = -{ - ANIMCMD_FRAME(5, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(6, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestSouth[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(3, 1, .hFlip = TRUE), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestNorth[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(4, 1, .hFlip = TRUE), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestWest[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_QuintyPlumpGoFastestEast[] = -{ - ANIMCMD_FRAME(5, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(6, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceSouth[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceNorth[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceWest[] = -{ - ANIMCMD_FRAME(2, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FaceEast[] = -{ - ANIMCMD_FRAME(2, 16, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoSouth[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoNorth[] = -{ - ANIMCMD_FRAME(5, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(6, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoWest[] = -{ - ANIMCMD_FRAME(7, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(8, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoEast[] = -{ - ANIMCMD_FRAME(7, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_FRAME(8, 8, .hFlip = TRUE), - ANIMCMD_FRAME(2, 8, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastSouth[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastNorth[] = -{ - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastWest[] = -{ - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastEast[] = -{ - ANIMCMD_FRAME(7, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(8, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterSouth[] = -{ - ANIMCMD_FRAME(3, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(4, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterNorth[] = -{ - ANIMCMD_FRAME(5, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(6, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterWest[] = -{ - ANIMCMD_FRAME(7, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_FRAME(8, 2), - ANIMCMD_FRAME(2, 2), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFasterEast[] = -{ - ANIMCMD_FRAME(7, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_FRAME(8, 2, .hFlip = TRUE), - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestSouth[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(4, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestNorth[] = -{ - ANIMCMD_FRAME(5, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(6, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestWest[] = -{ - ANIMCMD_FRAME(7, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_FRAME(8, 1), - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GoFastestEast[] = -{ - ANIMCMD_FRAME(7, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_FRAME(8, 1, .hFlip = TRUE), - ANIMCMD_FRAME(2, 1, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunSouth[] = -{ - ANIMCMD_FRAME(12, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_FRAME(13, 5), - ANIMCMD_FRAME(9, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunNorth[] = -{ - ANIMCMD_FRAME(14, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_FRAME(15, 5), - ANIMCMD_FRAME(10, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunWest[] = -{ - ANIMCMD_FRAME(16, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_FRAME(17, 5), - ANIMCMD_FRAME(11, 3), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_RunEast[] = -{ - ANIMCMD_FRAME(16, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_FRAME(17, 5, .hFlip = TRUE), - ANIMCMD_FRAME(11, 3, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_FieldMove[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(4, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobSouth[] = -{ - ANIMCMD_FRAME(9, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobNorth[] = -{ - ANIMCMD_FRAME(10, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobWest[] = -{ - ANIMCMD_FRAME(11, 32), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_GetOnOffSurfBlobEast[] = -{ - ANIMCMD_FRAME(11, 32, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelSouth[] = -{ - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelNorth[] = -{ - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelWest[] = -{ - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyBackWheelEast[] = -{ - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelNorth[] = -{ - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(16, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelWest[] = -{ - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(20, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BunnyHoppyFrontWheelEast[] = -{ - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(20, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelSouth[] = -{ - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelNorth[] = -{ - ANIMCMD_FRAME(13, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelWest[] = -{ - ANIMCMD_FRAME(17, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieBackWheelEast[] = -{ - ANIMCMD_FRAME(17, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelNorth[] = -{ - ANIMCMD_FRAME(15, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelWest[] = -{ - ANIMCMD_FRAME(19, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_StandingWheelieFrontWheelEast[] = -{ - ANIMCMD_FRAME(19, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieSouth[] = -{ - ANIMCMD_FRAME(21, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(22, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieNorth[] = -{ - ANIMCMD_FRAME(23, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_FRAME(24, 4), - ANIMCMD_FRAME(14, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieWest[] = -{ - ANIMCMD_FRAME(25, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_FRAME(26, 4), - ANIMCMD_FRAME(18, 4), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_MovingWheelieEast[] = -{ - ANIMCMD_FRAME(25, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_FRAME(26, 4, .hFlip = TRUE), - ANIMCMD_FRAME(18, 4, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage0[] = -{ - ANIMCMD_FRAME(0, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(2, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage2[] = -{ - ANIMCMD_FRAME(3, 48), - ANIMCMD_FRAME(4, 48), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage3[] = -{ - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(5, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_FRAME(6, 32), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_BerryTreeStage4[] = -{ - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(7, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_FRAME(8, 48), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_NurseBow[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(9, 32), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_RockBreak[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(2, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TreeCut[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodSouth[] = -{ - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(9, 4), - ANIMCMD_FRAME(10, 4), - ANIMCMD_FRAME(11, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodNorth[] = -{ - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(5, 4), - ANIMCMD_FRAME(6, 4), - ANIMCMD_FRAME(7, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodWest[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(3, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_TakeOutRodEast[] = -{ - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodSouth[] = -{ - ANIMCMD_FRAME(11, 4), - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(9, 6), - ANIMCMD_FRAME(8, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodNorth[] = -{ - ANIMCMD_FRAME(7, 4), - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(5, 6), - ANIMCMD_FRAME(4, 6), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodWest[] = -{ - ANIMCMD_FRAME(3, 4), - ANIMCMD_FRAME(2, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_PutAwayRodEast[] = -{ - ANIMCMD_FRAME(3, 4, .hFlip = TRUE), - ANIMCMD_FRAME(2, 4, .hFlip = TRUE), - ANIMCMD_FRAME(1, 4, .hFlip = TRUE), - ANIMCMD_FRAME(0, 4, .hFlip = TRUE), - ANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonSouth[] = -{ - ANIMCMD_FRAME(10, 6), - ANIMCMD_FRAME(11, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(11, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonNorth[] = -{ - ANIMCMD_FRAME(6, 6), - ANIMCMD_FRAME(7, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(7, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonWest[] = -{ - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HookedPokemonEast[] = -{ - ANIMCMD_FRAME(2, 6, .hFlip = TRUE), - ANIMCMD_FRAME(3, 6, .hFlip = TRUE), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(3, 30, .hFlip = TRUE), - ANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8508FD8[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(7), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509008[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1), - AFFINEANIMCMD_LOOP(15), - AFFINEANIMCMD_JUMP(0), -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509040[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509050[] = -{ - AFFINEANIMCMD_FRAME(0x100, 0x100, 10, 0), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509060[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1), - AFFINEANIMCMD_LOOP(8), - AFFINEANIMCMD_END, -}; - -const union AffineAnimCmd gEventObjectRotScalAnim_8509078[] = -{ - AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1), - AFFINEANIMCMD_LOOP(8), - AFFINEANIMCMD_END, -}; - -const union AnimCmd gEventObjectImageAnim_HoOhFlapWings[] = -{ - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(4, 8), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_HoOhStayStill[] = -{ - ANIMCMD_FRAME(3, 16), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = { - gEventObjectImageAnim_StayStill, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = { - gEventObjectImageAnim_QuintyPlumpFaceSouth, - gEventObjectImageAnim_QuintyPlumpFaceNorth, - gEventObjectImageAnim_QuintyPlumpFaceWest, - gEventObjectImageAnim_QuintyPlumpFaceEast, - gEventObjectImageAnim_QuintyPlumpGoSouth, - gEventObjectImageAnim_QuintyPlumpGoNorth, - gEventObjectImageAnim_QuintyPlumpGoWest, - gEventObjectImageAnim_QuintyPlumpGoEast, - gEventObjectImageAnim_QuintyPlumpGoFastSouth, - gEventObjectImageAnim_QuintyPlumpGoFastNorth, - gEventObjectImageAnim_QuintyPlumpGoFastWest, - gEventObjectImageAnim_QuintyPlumpGoFastEast, - gEventObjectImageAnim_QuintyPlumpGoFasterSouth, - gEventObjectImageAnim_QuintyPlumpGoFasterNorth, - gEventObjectImageAnim_QuintyPlumpGoFasterWest, - gEventObjectImageAnim_QuintyPlumpGoFasterEast, - gEventObjectImageAnim_QuintyPlumpGoFastestSouth, - gEventObjectImageAnim_QuintyPlumpGoFastestNorth, - gEventObjectImageAnim_QuintyPlumpGoFastestWest, - gEventObjectImageAnim_QuintyPlumpGoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_HoOh[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_HoOhFlapWings, - gEventObjectImageAnim_HoOhStayStill, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Groudon3[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, -}; - -const union AnimCmd gEventObjectImageAnim_85091F0[] = -{ - ANIMCMD_FRAME(1, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_85091F8[] = -{ - ANIMCMD_FRAME(4, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509200[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509208[] = -{ - ANIMCMD_FRAME(2, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509210[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509218[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509220[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509228[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd gEventObjectImageAnim_8509230[] = -{ - ANIMCMD_FRAME(3, 1), - ANIMCMD_JUMP(0), -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Rayquaza2[] = { - gEventObjectImageAnim_8509218, - gEventObjectImageAnim_8509220, - gEventObjectImageAnim_8509228, - gEventObjectImageAnim_8509230, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_85091F0, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, - gEventObjectImageAnim_8509200, - gEventObjectImageAnim_85091F8, - gEventObjectImageAnim_8509208, - gEventObjectImageAnim_8509210, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_RunSouth, - gEventObjectImageAnim_RunNorth, - gEventObjectImageAnim_RunWest, - gEventObjectImageAnim_RunEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_BunnyHoppyBackWheelSouth, - gEventObjectImageAnim_BunnyHoppyBackWheelNorth, - gEventObjectImageAnim_BunnyHoppyBackWheelWest, - gEventObjectImageAnim_BunnyHoppyBackWheelEast, - gEventObjectImageAnim_BunnyHoppyFrontWheelSouth, - gEventObjectImageAnim_BunnyHoppyFrontWheelNorth, - gEventObjectImageAnim_BunnyHoppyFrontWheelWest, - gEventObjectImageAnim_BunnyHoppyFrontWheelEast, - gEventObjectImageAnim_StandingWheelieBackWheelSouth, - gEventObjectImageAnim_StandingWheelieBackWheelNorth, - gEventObjectImageAnim_StandingWheelieBackWheelWest, - gEventObjectImageAnim_StandingWheelieBackWheelEast, - gEventObjectImageAnim_StandingWheelieFrontWheelSouth, - gEventObjectImageAnim_StandingWheelieFrontWheelNorth, - gEventObjectImageAnim_StandingWheelieFrontWheelWest, - gEventObjectImageAnim_StandingWheelieFrontWheelEast, - gEventObjectImageAnim_MovingWheelieSouth, - gEventObjectImageAnim_MovingWheelieNorth, - gEventObjectImageAnim_MovingWheelieWest, - gEventObjectImageAnim_MovingWheelieEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_GetOnOffSurfBlobSouth, - gEventObjectImageAnim_GetOnOffSurfBlobNorth, - gEventObjectImageAnim_GetOnOffSurfBlobWest, - gEventObjectImageAnim_GetOnOffSurfBlobEast, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = { - gEventObjectImageAnim_FaceSouth, - gEventObjectImageAnim_FaceNorth, - gEventObjectImageAnim_FaceWest, - gEventObjectImageAnim_FaceEast, - gEventObjectImageAnim_GoSouth, - gEventObjectImageAnim_GoNorth, - gEventObjectImageAnim_GoWest, - gEventObjectImageAnim_GoEast, - gEventObjectImageAnim_GoFastSouth, - gEventObjectImageAnim_GoFastNorth, - gEventObjectImageAnim_GoFastWest, - gEventObjectImageAnim_GoFastEast, - gEventObjectImageAnim_GoFasterSouth, - gEventObjectImageAnim_GoFasterNorth, - gEventObjectImageAnim_GoFasterWest, - gEventObjectImageAnim_GoFasterEast, - gEventObjectImageAnim_GoFastestSouth, - gEventObjectImageAnim_GoFastestNorth, - gEventObjectImageAnim_GoFastestWest, - gEventObjectImageAnim_GoFastestEast, - gEventObjectImageAnim_NurseBow, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = { - gEventObjectImageAnim_FieldMove, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = { - gEventObjectImageAnim_BerryTreeStage0, - gEventObjectImageAnim_BerryTreeStage1, - gEventObjectImageAnim_BerryTreeStage2, - gEventObjectImageAnim_BerryTreeStage3, - gEventObjectImageAnim_BerryTreeStage4, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = { - gEventObjectImageAnim_StayStill, - gEventObjectImageAnim_RockBreak, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = { - gEventObjectImageAnim_StayStill, - gEventObjectImageAnim_TreeCut, -}; - -const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = { - gEventObjectImageAnim_TakeOutRodSouth, - gEventObjectImageAnim_TakeOutRodNorth, - gEventObjectImageAnim_TakeOutRodWest, - gEventObjectImageAnim_TakeOutRodEast, - gEventObjectImageAnim_PutAwayRodSouth, - gEventObjectImageAnim_PutAwayRodNorth, - gEventObjectImageAnim_PutAwayRodWest, - gEventObjectImageAnim_PutAwayRodEast, - gEventObjectImageAnim_HookedPokemonSouth, - gEventObjectImageAnim_HookedPokemonNorth, - gEventObjectImageAnim_HookedPokemonWest, - gEventObjectImageAnim_HookedPokemonEast, -}; - -const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = { - gEventObjectRotScalAnim_8508FD8, - gEventObjectRotScalAnim_8509008, - gEventObjectRotScalAnim_8509050, - gEventObjectRotScalAnim_8509040, - gEventObjectRotScalAnim_8509078, - gEventObjectRotScalAnim_8509060, -}; - -const struct UnkStruct_085094AC gUnknown_085094AC[] = { - { - .anims = gEventObjectImageAnimTable_QuintyPlump, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Standard, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_BrendanMayNormal, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_AcroBike, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Surfing, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Nurse, - .animPos = {1, 3, 0, 2}, - }, - { - .anims = gEventObjectImageAnimTable_Fishing, - .animPos = {1, 3, 0, 2}, - }, - { - NULL, - {0, 0, 0, 0}, - }, -}; diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h deleted file mode 100755 index 1f89cc98d4..0000000000 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ /dev/null @@ -1,245 +0,0 @@ -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Twin, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RayquazaStill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xFFFF, EVENT_OBJ_PAL_TAG_14, EVENT_OBJ_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway = {0xFFFF, EVENT_OBJ_PAL_TAG_15, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_16, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xFFFF, EVENT_OBJ_PAL_TAG_27, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xFFFF, EVENT_OBJ_PAL_TAG_11, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xFFFF, EVENT_OBJ_PAL_TAG_21, EVENT_OBJ_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xFFFF, EVENT_OBJ_PAL_TAG_26, EVENT_OBJ_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_8x8, gEventObjectSpriteOamTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GameboyKid, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreSide, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Groudon3, gEventObjectPicTable_GroudonSide, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xFFFF, EVENT_OBJ_PAL_TAG_22, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_KyogreFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_24, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GroudonFront, gEventObjectRotScalAnimTable_KyogreGroudon}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Rayquaza2, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_10, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Juan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scott, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Statue, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kirlia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Dusclops, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Red, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf = {0xFFFF, EVENT_OBJ_PAL_TAG_28, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Leaf, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sudowoodo, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys = {0xFFFF, EVENT_OBJ_PAL_TAG_29, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Deoxys, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone = {0xFFFF, EVENT_OBJ_PAL_TAG_30, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Anabel, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tucker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Greta, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Spenser, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Noland, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lucy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brandon, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan = {0xFFFF, EVENT_OBJ_PAL_TAG_33, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay = {0xFFFF, EVENT_OBJ_PAL_TAG_34, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RubySapphireMay, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia = {0xFFFF, EVENT_OBJ_PAL_TAG_32, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh = {0xFFFF, EVENT_OBJ_PAL_TAG_31, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_HoOh, gEventObjectPicTable_HoOh, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h deleted file mode 100755 index 661539d579..0000000000 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ /dev/null @@ -1,499 +0,0 @@ -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Anabel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tucker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Greta; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Spenser; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Noland; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lucy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothCarryingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_VigorothFacingAway; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_EnemyZigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireLittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Juan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scott; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MysteryEventDeliveryman; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Statue; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kirlia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Dusclops; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnionRoomAttendant; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sudowoodo; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mew; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Red; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Leaf; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Deoxys; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirthIslandStone; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brandon; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireBrendan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RubySapphireMay; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lugia; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HoOh; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2; - - -const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = { - [EVENT_OBJ_GFX_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_BrendanNormal, - [EVENT_OBJ_GFX_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_BrendanMachBike, - [EVENT_OBJ_GFX_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_BrendanSurfing, - [EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_BrendanFieldMove, - [EVENT_OBJ_GFX_QUINTY_PLUMP] = &gEventObjectGraphicsInfo_QuintyPlump, - [EVENT_OBJ_GFX_NINJA_BOY] = &gEventObjectGraphicsInfo_NinjaBoy, - [EVENT_OBJ_GFX_TWIN] = &gEventObjectGraphicsInfo_Twin, - [EVENT_OBJ_GFX_BOY_1] = &gEventObjectGraphicsInfo_Boy1, - [EVENT_OBJ_GFX_GIRL_1] = &gEventObjectGraphicsInfo_Girl1, - [EVENT_OBJ_GFX_BOY_2] = &gEventObjectGraphicsInfo_Boy2, - [EVENT_OBJ_GFX_GIRL_2] = &gEventObjectGraphicsInfo_Girl2, - [EVENT_OBJ_GFX_LITTLE_BOY] = &gEventObjectGraphicsInfo_LittleBoy, - [EVENT_OBJ_GFX_LITTLE_GIRL] = &gEventObjectGraphicsInfo_LittleGirl, - [EVENT_OBJ_GFX_BOY_3] = &gEventObjectGraphicsInfo_Boy3, - [EVENT_OBJ_GFX_GIRL_3] = &gEventObjectGraphicsInfo_Girl3, - [EVENT_OBJ_GFX_RICH_BOY] = &gEventObjectGraphicsInfo_RichBoy, - [EVENT_OBJ_GFX_WOMAN_1] = &gEventObjectGraphicsInfo_Woman1, - [EVENT_OBJ_GFX_FAT_MAN] = &gEventObjectGraphicsInfo_FatMan, - [EVENT_OBJ_GFX_POKEFAN_F] = &gEventObjectGraphicsInfo_PokefanF, - [EVENT_OBJ_GFX_MAN_1] = &gEventObjectGraphicsInfo_Man1, - [EVENT_OBJ_GFX_WOMAN_2] = &gEventObjectGraphicsInfo_Woman2, - [EVENT_OBJ_GFX_EXPERT_M] = &gEventObjectGraphicsInfo_ExpertM, - [EVENT_OBJ_GFX_EXPERT_F] = &gEventObjectGraphicsInfo_ExpertF, - [EVENT_OBJ_GFX_MAN_2] = &gEventObjectGraphicsInfo_Man2, - [EVENT_OBJ_GFX_WOMAN_3] = &gEventObjectGraphicsInfo_Woman3, - [EVENT_OBJ_GFX_POKEFAN_M] = &gEventObjectGraphicsInfo_PokefanM, - [EVENT_OBJ_GFX_WOMAN_4] = &gEventObjectGraphicsInfo_Woman4, - [EVENT_OBJ_GFX_COOK] = &gEventObjectGraphicsInfo_Cook, - [EVENT_OBJ_GFX_LINK_RECEPTIONIST] = &gEventObjectGraphicsInfo_LinkReceptionist, - [EVENT_OBJ_GFX_OLD_MAN] = &gEventObjectGraphicsInfo_OldMan, - [EVENT_OBJ_GFX_OLD_WOMAN] = &gEventObjectGraphicsInfo_OldWoman, - [EVENT_OBJ_GFX_CAMPER] = &gEventObjectGraphicsInfo_Camper, - [EVENT_OBJ_GFX_PICNICKER] = &gEventObjectGraphicsInfo_Picnicker, - [EVENT_OBJ_GFX_MAN_3] = &gEventObjectGraphicsInfo_Man3, - [EVENT_OBJ_GFX_WOMAN_5] = &gEventObjectGraphicsInfo_Woman5, - [EVENT_OBJ_GFX_YOUNGSTER] = &gEventObjectGraphicsInfo_Youngster, - [EVENT_OBJ_GFX_BUG_CATCHER] = &gEventObjectGraphicsInfo_BugCatcher, - [EVENT_OBJ_GFX_PSYCHIC_M] = &gEventObjectGraphicsInfo_PsychicM, - [EVENT_OBJ_GFX_SCHOOL_KID_M] = &gEventObjectGraphicsInfo_SchoolKidM, - [EVENT_OBJ_GFX_MANIAC] = &gEventObjectGraphicsInfo_Maniac, - [EVENT_OBJ_GFX_HEX_MANIAC] = &gEventObjectGraphicsInfo_HexManiac, - [EVENT_OBJ_GFX_RAYQUAZA_1] = &gEventObjectGraphicsInfo_Rayquaza1, - [EVENT_OBJ_GFX_SWIMMER_M] = &gEventObjectGraphicsInfo_SwimmerM, - [EVENT_OBJ_GFX_SWIMMER_F] = &gEventObjectGraphicsInfo_SwimmerF, - [EVENT_OBJ_GFX_BLACK_BELT] = &gEventObjectGraphicsInfo_BlackBelt, - [EVENT_OBJ_GFX_BEAUTY] = &gEventObjectGraphicsInfo_Beauty, - [EVENT_OBJ_GFX_SCIENTIST_1] = &gEventObjectGraphicsInfo_Scientist1, - [EVENT_OBJ_GFX_LASS] = &gEventObjectGraphicsInfo_Lass, - [EVENT_OBJ_GFX_GENTLEMAN] = &gEventObjectGraphicsInfo_Gentleman, - [EVENT_OBJ_GFX_SAILOR] = &gEventObjectGraphicsInfo_Sailor, - [EVENT_OBJ_GFX_FISHERMAN] = &gEventObjectGraphicsInfo_Fisherman, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_RunningTriathleteM, - [EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_RunningTriathleteF, - [EVENT_OBJ_GFX_TUBER_F] = &gEventObjectGraphicsInfo_TuberF, - [EVENT_OBJ_GFX_TUBER_M] = &gEventObjectGraphicsInfo_TuberM, - [EVENT_OBJ_GFX_HIKER] = &gEventObjectGraphicsInfo_Hiker, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M] = &gEventObjectGraphicsInfo_CyclingTriathleteM, - [EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F] = &gEventObjectGraphicsInfo_CyclingTriathleteF, - [EVENT_OBJ_GFX_NURSE] = &gEventObjectGraphicsInfo_Nurse, - [EVENT_OBJ_GFX_ITEM_BALL] = &gEventObjectGraphicsInfo_ItemBall, - [EVENT_OBJ_GFX_BERRY_TREE] = &gEventObjectGraphicsInfo_BerryTree, - [EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES] = &gEventObjectGraphicsInfo_BerryTreeEarlyStages, - [EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES] = &gEventObjectGraphicsInfo_BerryTreeLateStages, - [EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_BrendanAcroBike, - [EVENT_OBJ_GFX_PROF_BIRCH] = &gEventObjectGraphicsInfo_ProfBirch, - [EVENT_OBJ_GFX_MAN_4] = &gEventObjectGraphicsInfo_Man4, - [EVENT_OBJ_GFX_MAN_5] = &gEventObjectGraphicsInfo_Man5, - [EVENT_OBJ_GFX_REPORTER_M] = &gEventObjectGraphicsInfo_ReporterM, - [EVENT_OBJ_GFX_REPORTER_F] = &gEventObjectGraphicsInfo_ReporterF, - [EVENT_OBJ_GFX_BARD] = &gEventObjectGraphicsInfo_Bard, - [EVENT_OBJ_GFX_ANABEL] = &gEventObjectGraphicsInfo_Anabel, - [EVENT_OBJ_GFX_TUCKER] = &gEventObjectGraphicsInfo_Tucker, - [EVENT_OBJ_GFX_GRETA] = &gEventObjectGraphicsInfo_Greta, - [EVENT_OBJ_GFX_SPENSER] = &gEventObjectGraphicsInfo_Spenser, - [EVENT_OBJ_GFX_NOLAND] = &gEventObjectGraphicsInfo_Noland, - [EVENT_OBJ_GFX_LUCY] = &gEventObjectGraphicsInfo_Lucy, - [EVENT_OBJ_GFX_UNUSED_NATU_DOLL] = &gEventObjectGraphicsInfo_UnusedNatuDoll, - [EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL] = &gEventObjectGraphicsInfo_UnusedMagnemiteDoll, - [EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL] = &gEventObjectGraphicsInfo_UnusedSquirtleDoll, - [EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL] = &gEventObjectGraphicsInfo_UnusedWooperDoll, - [EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_UnusedPikachuDoll, - [EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL] = &gEventObjectGraphicsInfo_UnusedPorygon2Doll, - [EVENT_OBJ_GFX_CUTTABLE_TREE] = &gEventObjectGraphicsInfo_CuttableTree, - [EVENT_OBJ_GFX_MART_EMPLOYEE] = &gEventObjectGraphicsInfo_MartEmployee, - [EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN] = &gEventObjectGraphicsInfo_RooftopSaleWoman, - [EVENT_OBJ_GFX_TEALA] = &gEventObjectGraphicsInfo_Teala, - [EVENT_OBJ_GFX_BREAKABLE_ROCK] = &gEventObjectGraphicsInfo_BreakableRock, - [EVENT_OBJ_GFX_PUSHABLE_BOULDER] = &gEventObjectGraphicsInfo_PushableBoulder, - [EVENT_OBJ_GFX_MR_BRINEYS_BOAT] = &gEventObjectGraphicsInfo_MrBrineysBoat, - [EVENT_OBJ_GFX_MAY_NORMAL] = &gEventObjectGraphicsInfo_MayNormal, - [EVENT_OBJ_GFX_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_MayMachBike, - [EVENT_OBJ_GFX_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_MayAcroBike, - [EVENT_OBJ_GFX_MAY_SURFING] = &gEventObjectGraphicsInfo_MaySurfing, - [EVENT_OBJ_GFX_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_MayFieldMove, - [EVENT_OBJ_GFX_TRUCK] = &gEventObjectGraphicsInfo_Truck, - [EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX] = &gEventObjectGraphicsInfo_VigorothCarryingBox, - [EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY] = &gEventObjectGraphicsInfo_VigorothFacingAway, - [EVENT_OBJ_GFX_BIRCHS_BAG] = &gEventObjectGraphicsInfo_BirchsBag, - [EVENT_OBJ_GFX_ZIGZAGOON_1] = &gEventObjectGraphicsInfo_EnemyZigzagoon, - [EVENT_OBJ_GFX_ARTIST] = &gEventObjectGraphicsInfo_Artist, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL] = &gEventObjectGraphicsInfo_RivalBrendanNormal, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanMachBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalBrendanAcroBike, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING] = &gEventObjectGraphicsInfo_RivalBrendanSurfing, - [EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalBrendanFieldMove, - [EVENT_OBJ_GFX_RIVAL_MAY_NORMAL] = &gEventObjectGraphicsInfo_RivalMayNormal, - [EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE] = &gEventObjectGraphicsInfo_RivalMayMachBike, - [EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE] = &gEventObjectGraphicsInfo_RivalMayAcroBike, - [EVENT_OBJ_GFX_RIVAL_MAY_SURFING] = &gEventObjectGraphicsInfo_RivalMaySurfing, - [EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE] = &gEventObjectGraphicsInfo_RivalMayFieldMove, - [EVENT_OBJ_GFX_CAMERAMAN] = &gEventObjectGraphicsInfo_Cameraman, - [EVENT_OBJ_GFX_BRENDAN_UNDERWATER] = &gEventObjectGraphicsInfo_BrendanUnderwater, - [EVENT_OBJ_GFX_MAY_UNDERWATER] = &gEventObjectGraphicsInfo_MayUnderwater, - [EVENT_OBJ_GFX_MOVING_BOX] = &gEventObjectGraphicsInfo_MovingBox, - [EVENT_OBJ_GFX_CABLE_CAR] = &gEventObjectGraphicsInfo_CableCar, - [EVENT_OBJ_GFX_SCIENTIST_2] = &gEventObjectGraphicsInfo_Scientist2, - [EVENT_OBJ_GFX_DEVON_EMPLOYEE] = &gEventObjectGraphicsInfo_DevonEmployee, - [EVENT_OBJ_GFX_AQUA_MEMBER_M] = &gEventObjectGraphicsInfo_AquaMemberM, - [EVENT_OBJ_GFX_AQUA_MEMBER_F] = &gEventObjectGraphicsInfo_AquaMemberF, - [EVENT_OBJ_GFX_MAGMA_MEMBER_M] = &gEventObjectGraphicsInfo_MagmaMemberM, - [EVENT_OBJ_GFX_MAGMA_MEMBER_F] = &gEventObjectGraphicsInfo_MagmaMemberF, - [EVENT_OBJ_GFX_SIDNEY] = &gEventObjectGraphicsInfo_Sidney, - [EVENT_OBJ_GFX_PHOEBE] = &gEventObjectGraphicsInfo_Phoebe, - [EVENT_OBJ_GFX_GLACIA] = &gEventObjectGraphicsInfo_Glacia, - [EVENT_OBJ_GFX_DRAKE] = &gEventObjectGraphicsInfo_Drake, - [EVENT_OBJ_GFX_ROXANNE] = &gEventObjectGraphicsInfo_Roxanne, - [EVENT_OBJ_GFX_BRAWLY] = &gEventObjectGraphicsInfo_Brawly, - [EVENT_OBJ_GFX_WATTSON] = &gEventObjectGraphicsInfo_Wattson, - [EVENT_OBJ_GFX_FLANNERY] = &gEventObjectGraphicsInfo_Flannery, - [EVENT_OBJ_GFX_NORMAN] = &gEventObjectGraphicsInfo_Norman, - [EVENT_OBJ_GFX_WINONA] = &gEventObjectGraphicsInfo_Winona, - [EVENT_OBJ_GFX_LIZA] = &gEventObjectGraphicsInfo_Liza, - [EVENT_OBJ_GFX_TATE] = &gEventObjectGraphicsInfo_Tate, - [EVENT_OBJ_GFX_WALLACE] = &gEventObjectGraphicsInfo_Wallace, - [EVENT_OBJ_GFX_STEVEN] = &gEventObjectGraphicsInfo_Steven, - [EVENT_OBJ_GFX_WALLY] = &gEventObjectGraphicsInfo_Wally, - [EVENT_OBJ_GFX_LITTLE_BOY_3] = &gEventObjectGraphicsInfo_RubySapphireLittleBoy, - [EVENT_OBJ_GFX_BRENDAN_FISHING] = &gEventObjectGraphicsInfo_BrendanFishing, - [EVENT_OBJ_GFX_MAY_FISHING] = &gEventObjectGraphicsInfo_MayFishing, - [EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN] = &gEventObjectGraphicsInfo_HotSpringsOldWoman, - [EVENT_OBJ_GFX_SS_TIDAL] = &gEventObjectGraphicsInfo_SSTidal, - [EVENT_OBJ_GFX_SUBMARINE_SHADOW] = &gEventObjectGraphicsInfo_SubmarineShadow, - [EVENT_OBJ_GFX_PICHU_DOLL] = &gEventObjectGraphicsInfo_PichuDoll, - [EVENT_OBJ_GFX_PIKACHU_DOLL] = &gEventObjectGraphicsInfo_PikachuDoll, - [EVENT_OBJ_GFX_MARILL_DOLL] = &gEventObjectGraphicsInfo_MarillDoll, - [EVENT_OBJ_GFX_TOGEPI_DOLL] = &gEventObjectGraphicsInfo_TogepiDoll, - [EVENT_OBJ_GFX_CYNDAQUIL_DOLL] = &gEventObjectGraphicsInfo_CyndaquilDoll, - [EVENT_OBJ_GFX_CHIKORITA_DOLL] = &gEventObjectGraphicsInfo_ChikoritaDoll, - [EVENT_OBJ_GFX_TOTODILE_DOLL] = &gEventObjectGraphicsInfo_TotodileDoll, - [EVENT_OBJ_GFX_JIGGLYPUFF_DOLL] = &gEventObjectGraphicsInfo_JigglypuffDoll, - [EVENT_OBJ_GFX_MEOWTH_DOLL] = &gEventObjectGraphicsInfo_MeowthDoll, - [EVENT_OBJ_GFX_CLEFAIRY_DOLL] = &gEventObjectGraphicsInfo_ClefairyDoll, - [EVENT_OBJ_GFX_DITTO_DOLL] = &gEventObjectGraphicsInfo_DittoDoll, - [EVENT_OBJ_GFX_SMOOCHUM_DOLL] = &gEventObjectGraphicsInfo_SmoochumDoll, - [EVENT_OBJ_GFX_TREECKO_DOLL] = &gEventObjectGraphicsInfo_TreeckoDoll, - [EVENT_OBJ_GFX_TORCHIC_DOLL] = &gEventObjectGraphicsInfo_TorchicDoll, - [EVENT_OBJ_GFX_MUDKIP_DOLL] = &gEventObjectGraphicsInfo_MudkipDoll, - [EVENT_OBJ_GFX_DUSKULL_DOLL] = &gEventObjectGraphicsInfo_DuskullDoll, - [EVENT_OBJ_GFX_WYNAUT_DOLL] = &gEventObjectGraphicsInfo_WynautDoll, - [EVENT_OBJ_GFX_BALTOY_DOLL] = &gEventObjectGraphicsInfo_BaltoyDoll, - [EVENT_OBJ_GFX_KECLEON_DOLL] = &gEventObjectGraphicsInfo_KecleonDoll, - [EVENT_OBJ_GFX_AZURILL_DOLL] = &gEventObjectGraphicsInfo_AzurillDoll, - [EVENT_OBJ_GFX_SKITTY_DOLL] = &gEventObjectGraphicsInfo_SkittyDoll, - [EVENT_OBJ_GFX_SWABLU_DOLL] = &gEventObjectGraphicsInfo_SwabluDoll, - [EVENT_OBJ_GFX_GULPIN_DOLL] = &gEventObjectGraphicsInfo_GulpinDoll, - [EVENT_OBJ_GFX_LOTAD_DOLL] = &gEventObjectGraphicsInfo_LotadDoll, - [EVENT_OBJ_GFX_SEEDOT_DOLL] = &gEventObjectGraphicsInfo_SeedotDoll, - [EVENT_OBJ_GFX_PIKA_CUSHION] = &gEventObjectGraphicsInfo_PikaCushion, - [EVENT_OBJ_GFX_ROUND_CUSHION] = &gEventObjectGraphicsInfo_RoundCushion, - [EVENT_OBJ_GFX_KISS_CUSHION] = &gEventObjectGraphicsInfo_KissCushion, - [EVENT_OBJ_GFX_ZIGZAG_CUSHION] = &gEventObjectGraphicsInfo_ZigzagCushion, - [EVENT_OBJ_GFX_SPIN_CUSHION] = &gEventObjectGraphicsInfo_SpinCushion, - [EVENT_OBJ_GFX_DIAMOND_CUSHION] = &gEventObjectGraphicsInfo_DiamondCushion, - [EVENT_OBJ_GFX_BALL_CUSHION] = &gEventObjectGraphicsInfo_BallCushion, - [EVENT_OBJ_GFX_GRASS_CUSHION] = &gEventObjectGraphicsInfo_GrassCushion, - [EVENT_OBJ_GFX_FIRE_CUSHION] = &gEventObjectGraphicsInfo_FireCushion, - [EVENT_OBJ_GFX_WATER_CUSHION] = &gEventObjectGraphicsInfo_WaterCushion, - [EVENT_OBJ_GFX_BIG_SNORLAX_DOLL] = &gEventObjectGraphicsInfo_BigSnorlaxDoll, - [EVENT_OBJ_GFX_BIG_RHYDON_DOLL] = &gEventObjectGraphicsInfo_BigRhydonDoll, - [EVENT_OBJ_GFX_BIG_LAPRAS_DOLL] = &gEventObjectGraphicsInfo_BigLaprasDoll, - [EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL] = &gEventObjectGraphicsInfo_BigVenusaurDoll, - [EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL] = &gEventObjectGraphicsInfo_BigCharizardDoll, - [EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL] = &gEventObjectGraphicsInfo_BigBlastoiseDoll, - [EVENT_OBJ_GFX_BIG_WAILMER_DOLL] = &gEventObjectGraphicsInfo_BigWailmerDoll, - [EVENT_OBJ_GFX_BIG_REGIROCK_DOLL] = &gEventObjectGraphicsInfo_BigRegirockDoll, - [EVENT_OBJ_GFX_BIG_REGICE_DOLL] = &gEventObjectGraphicsInfo_BigRegiceDoll, - [EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL] = &gEventObjectGraphicsInfo_BigRegisteelDoll, - [EVENT_OBJ_GFX_LATIAS] = &gEventObjectGraphicsInfo_Latias, - [EVENT_OBJ_GFX_LATIOS] = &gEventObjectGraphicsInfo_Latios, - [EVENT_OBJ_GFX_GAMEBOY_KID] = &gEventObjectGraphicsInfo_GameboyKid, - [EVENT_OBJ_GFX_CONTEST_JUDGE] = &gEventObjectGraphicsInfo_ContestJudge, - [EVENT_OBJ_GFX_BRENDAN_WATERING] = &gEventObjectGraphicsInfo_BrendanWatering, - [EVENT_OBJ_GFX_MAY_WATERING] = &gEventObjectGraphicsInfo_MayWatering, - [EVENT_OBJ_GFX_BRENDAN_DECORATING] = &gEventObjectGraphicsInfo_BrendanDecorating, - [EVENT_OBJ_GFX_MAY_DECORATING] = &gEventObjectGraphicsInfo_MayDecorating, - [EVENT_OBJ_GFX_ARCHIE] = &gEventObjectGraphicsInfo_Archie, - [EVENT_OBJ_GFX_MAXIE] = &gEventObjectGraphicsInfo_Maxie, - [EVENT_OBJ_GFX_KYOGRE_1] = &gEventObjectGraphicsInfo_Kyogre1, - [EVENT_OBJ_GFX_GROUDON_1] = &gEventObjectGraphicsInfo_Groudon1, - [EVENT_OBJ_GFX_FOSSIL] = &gEventObjectGraphicsInfo_Fossil, - [EVENT_OBJ_GFX_REGIROCK] = &gEventObjectGraphicsInfo_Regirock, - [EVENT_OBJ_GFX_REGICE] = &gEventObjectGraphicsInfo_Regice, - [EVENT_OBJ_GFX_REGISTEEL] = &gEventObjectGraphicsInfo_Registeel, - [EVENT_OBJ_GFX_SKITTY] = &gEventObjectGraphicsInfo_Skitty, - [EVENT_OBJ_GFX_KECLEON_1] = &gEventObjectGraphicsInfo_Kecleon1, - [EVENT_OBJ_GFX_KYOGRE_2] = &gEventObjectGraphicsInfo_Kyogre2, - [EVENT_OBJ_GFX_GROUDON_2] = &gEventObjectGraphicsInfo_Groudon2, - [EVENT_OBJ_GFX_RAYQUAZA_2] = &gEventObjectGraphicsInfo_Rayquaza2, - [EVENT_OBJ_GFX_ZIGZAGOON_2] = &gEventObjectGraphicsInfo_Zigzagoon, - [EVENT_OBJ_GFX_PIKACHU] = &gEventObjectGraphicsInfo_Pikachu, - [EVENT_OBJ_GFX_AZUMARILL] = &gEventObjectGraphicsInfo_Azumarill, - [EVENT_OBJ_GFX_WINGULL] = &gEventObjectGraphicsInfo_Wingull, - [EVENT_OBJ_GFX_KECLEON_2] = &gEventObjectGraphicsInfo_Kecleon2, - [EVENT_OBJ_GFX_TUBER_M_SWIMMING] = &gEventObjectGraphicsInfo_TuberMSwimming, - [EVENT_OBJ_GFX_AZURILL] = &gEventObjectGraphicsInfo_Azurill, - [EVENT_OBJ_GFX_MOM] = &gEventObjectGraphicsInfo_Mom, - [EVENT_OBJ_GFX_LINK_BRENDAN] = &gEventObjectGraphicsInfo_LinkBrendan, - [EVENT_OBJ_GFX_LINK_MAY] = &gEventObjectGraphicsInfo_LinkMay, - [EVENT_OBJ_GFX_JUAN] = &gEventObjectGraphicsInfo_Juan, - [EVENT_OBJ_GFX_SCOTT] = &gEventObjectGraphicsInfo_Scott, - [EVENT_OBJ_GFX_POOCHYENA] = &gEventObjectGraphicsInfo_Poochyena, - [EVENT_OBJ_GFX_KYOGRE_3] = &gEventObjectGraphicsInfo_Kyogre3, - [EVENT_OBJ_GFX_GROUDON_3] = &gEventObjectGraphicsInfo_Groudon3, - [EVENT_OBJ_GFX_MYSTERY_GIFT_MAN] = &gEventObjectGraphicsInfo_MysteryEventDeliveryman, - [EVENT_OBJ_GFX_TRICK_HOUSE_STATUE] = &gEventObjectGraphicsInfo_Statue, - [EVENT_OBJ_GFX_KIRLIA] = &gEventObjectGraphicsInfo_Kirlia, - [EVENT_OBJ_GFX_DUSCLOPS] = &gEventObjectGraphicsInfo_Dusclops, - [EVENT_OBJ_GFX_UNION_ROOM_NURSE] = &gEventObjectGraphicsInfo_UnionRoomAttendant, - [EVENT_OBJ_GFX_SUDOWOODO] = &gEventObjectGraphicsInfo_Sudowoodo, - [EVENT_OBJ_GFX_MEW] = &gEventObjectGraphicsInfo_Mew, - [EVENT_OBJ_GFX_RED] = &gEventObjectGraphicsInfo_Red, - [EVENT_OBJ_GFX_LEAF] = &gEventObjectGraphicsInfo_Leaf, - [EVENT_OBJ_GFX_DEOXYS] = &gEventObjectGraphicsInfo_Deoxys, - [EVENT_OBJ_GFX_DEOXYS_TRIANGLE] = &gEventObjectGraphicsInfo_BirthIslandStone, - [EVENT_OBJ_GFX_BRANDON] = &gEventObjectGraphicsInfo_Brandon, - [EVENT_OBJ_GFX_LINK_RS_BRENDAN] = &gEventObjectGraphicsInfo_RubySapphireBrendan, - [EVENT_OBJ_GFX_LINK_RS_MAY] = &gEventObjectGraphicsInfo_RubySapphireMay, - [EVENT_OBJ_GFX_LUGIA] = &gEventObjectGraphicsInfo_Lugia, - [EVENT_OBJ_GFX_HOOH] = &gEventObjectGraphicsInfo_HoOh, -}; - -const struct EventObjectGraphicsInfo *const gMauvilleOldManGraphicsInfoPointers[] = { - [MAUVILLE_MAN_BARD] = &gEventObjectGraphicsInfo_Bard, - [MAUVILLE_MAN_HIPSTER] = &gEventObjectGraphicsInfo_Hipster, - [MAUVILLE_MAN_TRADER] = &gEventObjectGraphicsInfo_Trader, - [MAUVILLE_MAN_STORYTELLER] = &gEventObjectGraphicsInfo_Storyteller, - [MAUVILLE_MAN_GIDDY] = &gEventObjectGraphicsInfo_Giddy, - [MAUVILLE_MAN_UNUSED1] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1, - [MAUVILLE_MAN_UNUSED2] = &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2, -}; diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h deleted file mode 100755 index 5c8be195d3..0000000000 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ /dev/null @@ -1,2174 +0,0 @@ -const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 0), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 1), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 2), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 3), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 4), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 5), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 6), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 7), - overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), - overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6), -}; - -const struct SpriteFrameImage gEventObjectPicTable_NinjaBoy[] = { - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Twin[] = { - overworld_frame(gEventObjectPic_Twin, 2, 4, 0), - overworld_frame(gEventObjectPic_Twin, 2, 4, 1), - overworld_frame(gEventObjectPic_Twin, 2, 4, 2), - overworld_frame(gEventObjectPic_Twin, 2, 4, 3), - overworld_frame(gEventObjectPic_Twin, 2, 4, 4), - overworld_frame(gEventObjectPic_Twin, 2, 4, 5), - overworld_frame(gEventObjectPic_Twin, 2, 4, 6), - overworld_frame(gEventObjectPic_Twin, 2, 4, 7), - overworld_frame(gEventObjectPic_Twin, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = { - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl[] = { - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), - overworld_frame(gEventObjectPic_Girl3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RichBoy[] = { - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 0), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 1), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 2), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 3), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 4), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 5), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 6), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 7), - overworld_frame(gEventObjectPic_RichBoy, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), - overworld_frame(gEventObjectPic_FatMan, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PokefanF[] = { - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 0), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 1), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 2), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 3), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 4), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 5), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 6), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 7), - overworld_frame(gEventObjectPic_PokefanF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - overworld_frame(gEventObjectPic_Man1, 2, 4, 0), - overworld_frame(gEventObjectPic_Man1, 2, 4, 1), - overworld_frame(gEventObjectPic_Man1, 2, 4, 2), - overworld_frame(gEventObjectPic_Man1, 2, 4, 3), - overworld_frame(gEventObjectPic_Man1, 2, 4, 4), - overworld_frame(gEventObjectPic_Man1, 2, 4, 5), - overworld_frame(gEventObjectPic_Man1, 2, 4, 6), - overworld_frame(gEventObjectPic_Man1, 2, 4, 7), - overworld_frame(gEventObjectPic_Man1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ExpertM[] = { - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 0), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 1), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 2), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 3), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 4), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 5), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 6), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 7), - overworld_frame(gEventObjectPic_ExpertM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ExpertF[] = { - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 0), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 1), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 2), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 3), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 4), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 5), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 6), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 7), - overworld_frame(gEventObjectPic_ExpertF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - overworld_frame(gEventObjectPic_Man2, 2, 4, 0), - overworld_frame(gEventObjectPic_Man2, 2, 4, 1), - overworld_frame(gEventObjectPic_Man2, 2, 4, 2), - overworld_frame(gEventObjectPic_Man2, 2, 4, 3), - overworld_frame(gEventObjectPic_Man2, 2, 4, 4), - overworld_frame(gEventObjectPic_Man2, 2, 4, 5), - overworld_frame(gEventObjectPic_Man2, 2, 4, 6), - overworld_frame(gEventObjectPic_Man2, 2, 4, 7), - overworld_frame(gEventObjectPic_Man2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PokefanM[] = { - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 0), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 1), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 2), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 3), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 4), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 5), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 6), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 7), - overworld_frame(gEventObjectPic_PokefanM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman4, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 0), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 1), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), - overworld_frame(gEventObjectPic_Cook, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LinkReceptionist[] = { - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 0), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 1), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 2), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 3), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 4), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 5), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 6), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 7), - overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldMan[] = { - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_OldWoman[] = { - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - overworld_frame(gEventObjectPic_Camper, 2, 4, 0), - overworld_frame(gEventObjectPic_Camper, 2, 4, 1), - overworld_frame(gEventObjectPic_Camper, 2, 4, 2), - overworld_frame(gEventObjectPic_Camper, 2, 4, 3), - overworld_frame(gEventObjectPic_Camper, 2, 4, 4), - overworld_frame(gEventObjectPic_Camper, 2, 4, 5), - overworld_frame(gEventObjectPic_Camper, 2, 4, 6), - overworld_frame(gEventObjectPic_Camper, 2, 4, 7), - overworld_frame(gEventObjectPic_Camper, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), - overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - overworld_frame(gEventObjectPic_Man3, 2, 4, 0), - overworld_frame(gEventObjectPic_Man3, 2, 4, 1), - overworld_frame(gEventObjectPic_Man3, 2, 4, 2), - overworld_frame(gEventObjectPic_Man3, 2, 4, 3), - overworld_frame(gEventObjectPic_Man3, 2, 4, 4), - overworld_frame(gEventObjectPic_Man3, 2, 4, 5), - overworld_frame(gEventObjectPic_Man3, 2, 4, 6), - overworld_frame(gEventObjectPic_Man3, 2, 4, 7), - overworld_frame(gEventObjectPic_Man3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), - overworld_frame(gEventObjectPic_Youngster, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), - overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), - overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), - overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), - overworld_frame(gEventObjectPic_Maniac, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), - overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), - overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), - overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), - overworld_frame(gEventObjectPic_Beauty, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - overworld_frame(gEventObjectPic_Lass, 2, 4, 0), - overworld_frame(gEventObjectPic_Lass, 2, 4, 1), - overworld_frame(gEventObjectPic_Lass, 2, 4, 2), - overworld_frame(gEventObjectPic_Lass, 2, 4, 3), - overworld_frame(gEventObjectPic_Lass, 2, 4, 4), - overworld_frame(gEventObjectPic_Lass, 2, 4, 5), - overworld_frame(gEventObjectPic_Lass, 2, 4, 6), - overworld_frame(gEventObjectPic_Lass, 2, 4, 7), - overworld_frame(gEventObjectPic_Lass, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), - overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), - overworld_frame(gEventObjectPic_Sailor, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), - overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), - overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberF, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberM, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), - overworld_frame(gEventObjectPic_Hiker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), - overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), - overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { - obj_frame_tiles(gEventObjectPic_ItemBall), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), - overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - overworld_frame(gEventObjectPic_Man4, 2, 4, 0), - overworld_frame(gEventObjectPic_Man4, 2, 4, 1), - overworld_frame(gEventObjectPic_Man4, 2, 4, 2), - overworld_frame(gEventObjectPic_Man4, 2, 4, 3), - overworld_frame(gEventObjectPic_Man4, 2, 4, 4), - overworld_frame(gEventObjectPic_Man4, 2, 4, 5), - overworld_frame(gEventObjectPic_Man4, 2, 4, 6), - overworld_frame(gEventObjectPic_Man4, 2, 4, 7), - overworld_frame(gEventObjectPic_Man4, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - overworld_frame(gEventObjectPic_Man5, 2, 4, 0), - overworld_frame(gEventObjectPic_Man5, 2, 4, 1), - overworld_frame(gEventObjectPic_Man5, 2, 4, 2), - overworld_frame(gEventObjectPic_Man5, 2, 4, 3), - overworld_frame(gEventObjectPic_Man5, 2, 4, 4), - overworld_frame(gEventObjectPic_Man5, 2, 4, 5), - overworld_frame(gEventObjectPic_Man5, 2, 4, 6), - overworld_frame(gEventObjectPic_Man5, 2, 4, 7), - overworld_frame(gEventObjectPic_Man5, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), - overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), - overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedNatuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedWooperDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { - obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), - overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - overworld_frame(gEventObjectPic_Teala, 2, 4, 0), - overworld_frame(gEventObjectPic_Teala, 2, 4, 1), - overworld_frame(gEventObjectPic_Teala, 2, 4, 2), - overworld_frame(gEventObjectPic_Teala, 2, 4, 3), - overworld_frame(gEventObjectPic_Teala, 2, 4, 4), - overworld_frame(gEventObjectPic_Teala, 2, 4, 5), - overworld_frame(gEventObjectPic_Teala, 2, 4, 6), - overworld_frame(gEventObjectPic_Teala, 2, 4, 7), - overworld_frame(gEventObjectPic_Teala, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), - overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { - obj_frame_tiles(gEventObjectPic_PushableBoulder), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), - overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { - obj_frame_tiles(gEventObjectPic_Truck), -}; - -const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = { - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = { - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), - overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { - obj_frame_tiles(gEventObjectPic_BirchsBag), -}; - -const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = { - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 0), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 1), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 2), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 3), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 4), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 5), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 6), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 7), - overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), - overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - overworld_frame(gEventObjectPic_Artist, 2, 4, 0), - overworld_frame(gEventObjectPic_Artist, 2, 4, 1), - overworld_frame(gEventObjectPic_Artist, 2, 4, 2), - overworld_frame(gEventObjectPic_Artist, 2, 4, 3), - overworld_frame(gEventObjectPic_Artist, 2, 4, 4), - overworld_frame(gEventObjectPic_Artist, 2, 4, 5), - overworld_frame(gEventObjectPic_Artist, 2, 4, 6), - overworld_frame(gEventObjectPic_Artist, 2, 4, 7), - overworld_frame(gEventObjectPic_Artist, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 0), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 1), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 2), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 3), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 4), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 5), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 6), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 7), - overworld_frame(gEventObjectPic_MayRunning, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), - overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), - overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), - overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), - overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { - obj_frame_tiles(gEventObjectPic_MovingBox), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { - obj_frame_tiles(gEventObjectPic_CableCar), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), - overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DevonEmployee[] = { - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 0), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 1), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 2), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 3), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 4), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 5), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 6), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 7), - overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), - overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), - overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), - overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), - overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 0), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 1), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), - overworld_frame(gEventObjectPic_Drake, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), - overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), - overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), - overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), - overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - overworld_frame(gEventObjectPic_Norman, 2, 4, 0), - overworld_frame(gEventObjectPic_Norman, 2, 4, 1), - overworld_frame(gEventObjectPic_Norman, 2, 4, 2), - overworld_frame(gEventObjectPic_Norman, 2, 4, 3), - overworld_frame(gEventObjectPic_Norman, 2, 4, 4), - overworld_frame(gEventObjectPic_Norman, 2, 4, 5), - overworld_frame(gEventObjectPic_Norman, 2, 4, 6), - overworld_frame(gEventObjectPic_Norman, 2, 4, 7), - overworld_frame(gEventObjectPic_Norman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 0), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 1), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), - overworld_frame(gEventObjectPic_Winona, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 0), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 1), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), - overworld_frame(gEventObjectPic_Liza, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 0), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 1), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), - overworld_frame(gEventObjectPic_Tate, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), - overworld_frame(gEventObjectPic_Wallace, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - overworld_frame(gEventObjectPic_Steven, 2, 4, 0), - overworld_frame(gEventObjectPic_Steven, 2, 4, 1), - overworld_frame(gEventObjectPic_Steven, 2, 4, 2), - overworld_frame(gEventObjectPic_Steven, 2, 4, 3), - overworld_frame(gEventObjectPic_Steven, 2, 4, 4), - overworld_frame(gEventObjectPic_Steven, 2, 4, 5), - overworld_frame(gEventObjectPic_Steven, 2, 4, 6), - overworld_frame(gEventObjectPic_Steven, 2, 4, 7), - overworld_frame(gEventObjectPic_Steven, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - overworld_frame(gEventObjectPic_Wally, 2, 4, 0), - overworld_frame(gEventObjectPic_Wally, 2, 4, 1), - overworld_frame(gEventObjectPic_Wally, 2, 4, 2), - overworld_frame(gEventObjectPic_Wally, 2, 4, 3), - overworld_frame(gEventObjectPic_Wally, 2, 4, 4), - overworld_frame(gEventObjectPic_Wally, 2, 4, 5), - overworld_frame(gEventObjectPic_Wally, 2, 4, 6), - overworld_frame(gEventObjectPic_Wally, 2, 4, 7), - overworld_frame(gEventObjectPic_Wally, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = { - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 0), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 1), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 2), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 3), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 4), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 5), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 6), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 7), - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), - overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), - obj_frame_tiles(gEventObjectPic_SSTidal), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = { - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), - obj_frame_tiles(gEventObjectPic_SubmarineShadow), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = { - obj_frame_tiles(gEventObjectPic_PichuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = { - obj_frame_tiles(gEventObjectPic_PikachuDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = { - obj_frame_tiles(gEventObjectPic_MarillDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = { - obj_frame_tiles(gEventObjectPic_TogepiDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = { - obj_frame_tiles(gEventObjectPic_CyndaquilDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = { - obj_frame_tiles(gEventObjectPic_ChikoritaDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = { - obj_frame_tiles(gEventObjectPic_TotodileDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = { - obj_frame_tiles(gEventObjectPic_JigglypuffDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = { - obj_frame_tiles(gEventObjectPic_MeowthDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = { - obj_frame_tiles(gEventObjectPic_ClefairyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = { - obj_frame_tiles(gEventObjectPic_DittoDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = { - obj_frame_tiles(gEventObjectPic_SmoochumDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = { - obj_frame_tiles(gEventObjectPic_TreeckoDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = { - obj_frame_tiles(gEventObjectPic_TorchicDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = { - obj_frame_tiles(gEventObjectPic_MudkipDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = { - obj_frame_tiles(gEventObjectPic_DuskullDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = { - obj_frame_tiles(gEventObjectPic_WynautDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = { - obj_frame_tiles(gEventObjectPic_BaltoyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = { - obj_frame_tiles(gEventObjectPic_KecleonDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = { - obj_frame_tiles(gEventObjectPic_AzurillDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = { - obj_frame_tiles(gEventObjectPic_SkittyDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = { - obj_frame_tiles(gEventObjectPic_SwabluDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = { - obj_frame_tiles(gEventObjectPic_GulpinDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = { - obj_frame_tiles(gEventObjectPic_LotadDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = { - obj_frame_tiles(gEventObjectPic_SeedotDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = { - obj_frame_tiles(gEventObjectPic_PikaCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = { - obj_frame_tiles(gEventObjectPic_RoundCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = { - obj_frame_tiles(gEventObjectPic_KissCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = { - obj_frame_tiles(gEventObjectPic_ZigzagCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = { - obj_frame_tiles(gEventObjectPic_SpinCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = { - obj_frame_tiles(gEventObjectPic_DiamondCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = { - obj_frame_tiles(gEventObjectPic_BallCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = { - obj_frame_tiles(gEventObjectPic_GrassCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = { - obj_frame_tiles(gEventObjectPic_FireCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = { - obj_frame_tiles(gEventObjectPic_WaterCushion), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = { - obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRhydonDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = { - obj_frame_tiles(gEventObjectPic_BigLaprasDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = { - obj_frame_tiles(gEventObjectPic_BigVenusaurDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = { - obj_frame_tiles(gEventObjectPic_BigCharizardDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = { - obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = { - obj_frame_tiles(gEventObjectPic_BigWailmerDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegirockDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegiceDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { - obj_frame_tiles(gEventObjectPic_BigRegisteelDoll), -}; - -const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), - overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GameboyKid[] = { - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), - overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), - overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), - overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { - obj_frame_tiles(gEventObjectPic_BrendanDecorating), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { - obj_frame_tiles(gEventObjectPic_MayDecorating), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - overworld_frame(gEventObjectPic_Archie, 2, 4, 0), - overworld_frame(gEventObjectPic_Archie, 2, 4, 1), - overworld_frame(gEventObjectPic_Archie, 2, 4, 2), - overworld_frame(gEventObjectPic_Archie, 2, 4, 3), - overworld_frame(gEventObjectPic_Archie, 2, 4, 4), - overworld_frame(gEventObjectPic_Archie, 2, 4, 5), - overworld_frame(gEventObjectPic_Archie, 2, 4, 6), - overworld_frame(gEventObjectPic_Archie, 2, 4, 7), - overworld_frame(gEventObjectPic_Archie, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), - overworld_frame(gEventObjectPic_Maxie, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = { - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), - overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = { - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), - overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { - obj_frame_tiles(gEventObjectPic_Fossil), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), - obj_frame_tiles(gEventObjectPic_Regi), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), - overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), - overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 0), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 1), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 2), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 3), - overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 4), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), - obj_frame_tiles(gEventObjectPic_RayquazaStill), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), - overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), - overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), - overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), -}; - -const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), - overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), - overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - overworld_frame(gEventObjectPic_Mom, 2, 4, 0), - overworld_frame(gEventObjectPic_Mom, 2, 4, 1), - overworld_frame(gEventObjectPic_Mom, 2, 4, 2), - overworld_frame(gEventObjectPic_Mom, 2, 4, 3), - overworld_frame(gEventObjectPic_Mom, 2, 4, 4), - overworld_frame(gEventObjectPic_Mom, 2, 4, 5), - overworld_frame(gEventObjectPic_Mom, 2, 4, 6), - overworld_frame(gEventObjectPic_Mom, 2, 4, 7), - overworld_frame(gEventObjectPic_Mom, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Scott[] = { - overworld_frame(gEventObjectPic_Scott, 2, 4, 0), - overworld_frame(gEventObjectPic_Scott, 2, 4, 1), - overworld_frame(gEventObjectPic_Scott, 2, 4, 2), - overworld_frame(gEventObjectPic_Scott, 2, 4, 3), - overworld_frame(gEventObjectPic_Scott, 2, 4, 4), - overworld_frame(gEventObjectPic_Scott, 2, 4, 5), - overworld_frame(gEventObjectPic_Scott, 2, 4, 6), - overworld_frame(gEventObjectPic_Scott, 2, 4, 7), - overworld_frame(gEventObjectPic_Scott, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Juan[] = { - overworld_frame(gEventObjectPic_Juan, 2, 4, 0), - overworld_frame(gEventObjectPic_Juan, 2, 4, 1), - overworld_frame(gEventObjectPic_Juan, 2, 4, 2), - overworld_frame(gEventObjectPic_Juan, 2, 4, 3), - overworld_frame(gEventObjectPic_Juan, 2, 4, 4), - overworld_frame(gEventObjectPic_Juan, 2, 4, 5), - overworld_frame(gEventObjectPic_Juan, 2, 4, 6), - overworld_frame(gEventObjectPic_Juan, 2, 4, 7), - overworld_frame(gEventObjectPic_Juan, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = { - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { - obj_frame_tiles(gEventObjectPic_Statue), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = { - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 0), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 1), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 2), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 3), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 4), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 5), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 6), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 7), - overworld_frame(gEventObjectPic_Dusclops, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = { - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 0), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 1), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 2), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 3), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 4), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 5), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 6), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 7), - overworld_frame(gEventObjectPic_Kirlia, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = { - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), - overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = { - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), - overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 2), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Mew[] = { - overworld_frame(gEventObjectPic_Mew, 2, 4, 0), - overworld_frame(gEventObjectPic_Mew, 2, 4, 1), - overworld_frame(gEventObjectPic_Mew, 2, 4, 2), - overworld_frame(gEventObjectPic_Mew, 2, 4, 3), - overworld_frame(gEventObjectPic_Mew, 2, 4, 4), - overworld_frame(gEventObjectPic_Mew, 2, 4, 5), - overworld_frame(gEventObjectPic_Mew, 2, 4, 6), - overworld_frame(gEventObjectPic_Mew, 2, 4, 7), - overworld_frame(gEventObjectPic_Mew, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Red[] = { - overworld_frame(gEventObjectPic_Red, 2, 4, 0), - overworld_frame(gEventObjectPic_Red, 2, 4, 1), - overworld_frame(gEventObjectPic_Red, 2, 4, 2), - overworld_frame(gEventObjectPic_Red, 2, 4, 3), - overworld_frame(gEventObjectPic_Red, 2, 4, 4), - overworld_frame(gEventObjectPic_Red, 2, 4, 5), - overworld_frame(gEventObjectPic_Red, 2, 4, 6), - overworld_frame(gEventObjectPic_Red, 2, 4, 7), - overworld_frame(gEventObjectPic_Red, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = { - overworld_frame(gEventObjectPic_Leaf, 2, 4, 0), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 1), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 2), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 3), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 4), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 5), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 6), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 7), - overworld_frame(gEventObjectPic_Leaf, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = { - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), - overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), -}; - -const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { - obj_frame_tiles(gEventObjectPic_BirthIslandStone), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = { - overworld_frame(gEventObjectPic_Anabel, 2, 4, 0), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 1), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 2), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 3), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 4), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 5), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 6), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 7), - overworld_frame(gEventObjectPic_Anabel, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = { - overworld_frame(gEventObjectPic_Tucker, 2, 4, 0), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 1), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 2), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 3), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 4), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 5), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 6), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 7), - overworld_frame(gEventObjectPic_Tucker, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = { - overworld_frame(gEventObjectPic_Spenser, 2, 4, 0), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 1), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 2), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 3), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 4), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 5), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 6), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 7), - overworld_frame(gEventObjectPic_Spenser, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Greta[] = { - overworld_frame(gEventObjectPic_Greta, 2, 4, 0), - overworld_frame(gEventObjectPic_Greta, 2, 4, 1), - overworld_frame(gEventObjectPic_Greta, 2, 4, 2), - overworld_frame(gEventObjectPic_Greta, 2, 4, 3), - overworld_frame(gEventObjectPic_Greta, 2, 4, 4), - overworld_frame(gEventObjectPic_Greta, 2, 4, 5), - overworld_frame(gEventObjectPic_Greta, 2, 4, 6), - overworld_frame(gEventObjectPic_Greta, 2, 4, 7), - overworld_frame(gEventObjectPic_Greta, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Noland[] = { - overworld_frame(gEventObjectPic_Noland, 2, 4, 0), - overworld_frame(gEventObjectPic_Noland, 2, 4, 1), - overworld_frame(gEventObjectPic_Noland, 2, 4, 2), - overworld_frame(gEventObjectPic_Noland, 2, 4, 3), - overworld_frame(gEventObjectPic_Noland, 2, 4, 4), - overworld_frame(gEventObjectPic_Noland, 2, 4, 5), - overworld_frame(gEventObjectPic_Noland, 2, 4, 6), - overworld_frame(gEventObjectPic_Noland, 2, 4, 7), - overworld_frame(gEventObjectPic_Noland, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = { - overworld_frame(gEventObjectPic_Lucy, 2, 4, 0), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 1), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 2), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 3), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 4), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 5), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 6), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 7), - overworld_frame(gEventObjectPic_Lucy, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = { - overworld_frame(gEventObjectPic_Brandon, 2, 4, 0), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 1), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 2), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 3), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 4), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 5), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 6), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 7), - overworld_frame(gEventObjectPic_Brandon, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = { - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), - overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = { - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), - overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = { - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 0), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 1), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 2), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 3), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 4), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 5), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 6), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7), - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8), -}; diff --git a/src/data/trade.h b/src/data/trade.h index 9e96a54dd9..13310185ea 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -5,7 +5,7 @@ static const u32 sUnusedStructSizes[] = sizeof(struct SaveBlock1), sizeof(struct MapHeader), // 0x00000530, in RS - sizeof(struct MailStruct), //or EventObject / EventObjectGraphicsInfo + sizeof(struct MailStruct), //or ObjectEvent / ObjectEventGraphicsInfo sizeof(struct Pokemon), //or TrainerCard 0x00000528 // 0x000004D8, in RS }; diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 19aa40b005..b27de4513a 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -12214,4 +12214,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/decoration.c b/src/decoration.c index 2a47dd5539..731691a057 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1246,22 +1246,22 @@ void SetDecoration(void) if (FlagGet(FLAG_DECORATION_1 + i) == TRUE) { FlagClear(FLAG_DECORATION_1 + i); - for (j = 0; j < gMapHeader.events->eventObjectCount; j++) + for (j = 0; j < gMapHeader.events->objectEventCount; j++) { - if (gMapHeader.events->eventObjects[j].flagId == FLAG_DECORATION_1 + i) + if (gMapHeader.events->objectEvents[j].flagId == FLAG_DECORATION_1 + i) break; } VarSet( - VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[j].graphicsId - EVENT_OBJ_GFX_VAR_0), + VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[j].graphicsId - EVENT_OBJ_GFX_VAR_0), sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0]); - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[j].localId; gSpecialVar_0x8006 = sCurDecorMapX; gSpecialVar_0x8007 = sCurDecorMapY; - TrySpawnEventObject(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_0x8005, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); break; } } @@ -1365,9 +1365,9 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphic x -= 8; if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, x, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, x, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -1504,7 +1504,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) return FALSE; } @@ -1525,7 +1525,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) return FALSE; } } @@ -1542,7 +1542,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) if (!sub_81284AC(taskId, curX, curY, behaviorBy)) return FALSE; - behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0); + behaviorAt = GetObjectEventIdByXYZ(curX, curY, 0); if (behaviorAt != 0 && behaviorAt != 16) return FALSE; } @@ -1579,7 +1579,7 @@ bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) return FALSE; } - if (GetEventObjectIdByXYZ(curX, curY, 0) != 16) + if (GetObjectEventIdByXYZ(curX, curY, 0) != 16) return FALSE; } break; @@ -1999,7 +1999,7 @@ u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphicsDataBuf sub_8129048(data); data->decoration = &gDecorations[decor]; if (data->decoration->permission == DECORPERM_SPRITE) - return AddPseudoEventObject(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + return AddPseudoObjectEvent(data->decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); FreeSpritePaletteByTag(PLACE_DECORATION_SELECTOR_TAG); sub_81291E8(data); @@ -2047,7 +2047,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode) return gDecorIconTable[decor][mode]; } -u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) +u8 AddDecorationIconObjectFromObjectEvent(u16 tilesTag, u16 paletteTag, u8 decor) { u8 spriteId; struct SpriteSheet sheet; @@ -2078,7 +2078,7 @@ u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor } else { - spriteId = AddPseudoEventObject(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); + spriteId = AddPseudoObjectEvent(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0], SpriteCallbackDummy, 0, 0, 1); } return spriteId; } @@ -2098,7 +2098,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1 } else if (gDecorIconTable[decor][0] == NULL) { - spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor); + spriteId = AddDecorationIconObjectFromObjectEvent(tilesTag, paletteTag, decor); if (spriteId == MAX_SPRITES) return MAX_SPRITES; @@ -2142,11 +2142,11 @@ void sub_8129708(void) { gSpecialVar_0x8005 = sDecorRearrangementDataBuffer[gSpecialVar_0x8004].flagId; sub_81296EC(sDecorRearrangementDataBuffer[gSpecialVar_0x8004].idx); - for (i = 0; i < gMapHeader.events->eventObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8005) { - gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8006 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -2157,11 +2157,11 @@ void sub_81297AC(void) { u8 i; - for (i = 0; i < gMapHeader.events->eventObjectCount; i++) + for (i = 0; i < gMapHeader.events->objectEventCount; i++) { - if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[i].flagId == gSpecialVar_0x8004) { - gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId; + gSpecialVar_0x8005 = gMapHeader.events->objectEvents[i].localId; break; } } @@ -2250,9 +2250,9 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) sub_812A39C(); gFieldCamera.spriteId = CreateSprite(&gUnknown_085A7404, 120, 80, 0); if (gSaveBlock2Ptr->playerGender == MALE) - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_BRENDAN_DECORATING, SpriteCallbackDummy, 136, 72, 0); else - sDecor_CameraSpriteObjectIdx2 = AddPseudoEventObject(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); + sDecor_CameraSpriteObjectIdx2 = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAY_DECORATING, SpriteCallbackDummy, 136, 72, 0); gSprites[sDecor_CameraSpriteObjectIdx2].oam.priority = 1; DestroySprite(&gSprites[sDecor_CameraSpriteObjectIdx1]); @@ -2453,9 +2453,9 @@ void sub_8129F20(void) yOff = gDecorationContext.pos[sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].idx] & 0x0F; for (i = 0; i < 0x40; i++) { - if (gSaveBlock1Ptr->eventObjectTemplates[i].x == xOff && gSaveBlock1Ptr->eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->eventObjectTemplates[i].flagId)) + if (gSaveBlock1Ptr->objectEventTemplates[i].x == xOff && gSaveBlock1Ptr->objectEventTemplates[i].y == yOff && !FlagGet(gSaveBlock1Ptr->objectEventTemplates[i].flagId)) { - sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->eventObjectTemplates[i].flagId; + sDecorRearrangementDataBuffer[sCurDecorSelectedInRearrangement].flagId = gSaveBlock1Ptr->objectEventTemplates[i].flagId; break; } } diff --git a/src/easy_chat.c b/src/easy_chat.c index ce5fe3c7ad..59628ddace 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4733,14 +4733,14 @@ static void sub_811E828(void) if (GetEasyChatScreenFrameId() != 4) return; - spriteId = AddPseudoEventObject(graphicsId, SpriteCallbackDummy, 76, 40, 0); + spriteId = AddPseudoObjectEvent(graphicsId, SpriteCallbackDummy, 76, 40, 0); if (spriteId != MAX_SPRITES) { gSprites[spriteId].oam.priority = 0; StartSpriteAnim(&gSprites[spriteId], 2); } - spriteId = AddPseudoEventObject( + spriteId = AddPseudoObjectEvent( gSaveBlock2Ptr->playerGender == MALE ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, SpriteCallbackDummy, 52, diff --git a/src/event_data.c b/src/event_data.c index 50628f984d..00ae1d890f 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -187,7 +187,7 @@ bool8 VarSet(u16 id, u16 value) return TRUE; } -u8 VarGetEventObjectGraphicsId(u8 id) +u8 VarGetObjectEventGraphicsId(u8 id) { return VarGet(VAR_OBJ_GFX_ID_0 + id); } diff --git a/src/event_obj_lock.c b/src/event_obj_lock.c index c64a2ab226..4b0ee9f701 100644 --- a/src/event_obj_lock.c +++ b/src/event_obj_lock.c @@ -39,9 +39,9 @@ bool8 sub_80983C4(void) } -void ScriptFreezeEventObjects(void) +void ScriptFreezeObjectEvents(void) { - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_80983A4, 80); } @@ -54,9 +54,9 @@ static void sub_8098400(u8 taskId) sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive) + if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -76,61 +76,61 @@ bool8 sub_809847C(void) } } -void LockSelectedEventObject(void) +void LockSelectedObjectEvent(void) { u8 taskId; - FreezeEventObjectsExceptOne(gSelectedEventObject); + FreezeObjectEventsExceptOne(gSelectedObjectEvent); taskId = CreateTask(sub_8098400, 80); - if (!gEventObjects[gSelectedEventObject].singleMovementActive) + if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive) { - FreezeEventObject(&gEventObjects[gSelectedEventObject]); + FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]); gTasks[taskId].data[1] = 1; } } -void ScriptUnfreezeEventObjects(void) +void ScriptUnfreezeObjectEvents(void) { - u8 playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + u8 playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); } void sub_8098524(void) { u8 playerObjectId; - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); } void Script_FacePlayer(void) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing); + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], gSpecialVar_Facing); } void Script_ClearHeldMovement(void) { - EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]); } static void sub_80985BC(u8 taskId) { struct Task *task = &gTasks[taskId]; - u8 eventObjectId = task->data[2]; + u8 objectEventId = task->data[2]; if (!task->data[0] && walkrun_is_standing_still() == TRUE) { sub_808B864(); task->data[0] = 1; } - if (!task->data[1] && !gEventObjects[eventObjectId].singleMovementActive) + if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive) { - FreezeEventObject(&gEventObjects[eventObjectId]); + FreezeObjectEvent(&gObjectEvents[objectEventId]); task->data[1] = 1; } if (task->data[0] && task->data[1]) @@ -140,34 +140,34 @@ static void sub_80985BC(u8 taskId) void sub_8098630(void) { u8 trainerObjectId1, trainerObjectId2, taskId; - trainerObjectId1 = GetChosenApproachingTrainerEventObjectId(0); + trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0); if(gNoOfApproachingTrainers == 2) { - trainerObjectId2 = GetChosenApproachingTrainerEventObjectId(1); + trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1); sub_8098074(trainerObjectId1, trainerObjectId2); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gEventObjects[trainerObjectId1].singleMovementActive) + if(!gObjectEvents[trainerObjectId1].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId1]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); gTasks[taskId].data[1] = 1; } taskId = CreateTask(sub_80985BC, 81); gTasks[taskId].data[2] = trainerObjectId2; - if(!gEventObjects[trainerObjectId2].singleMovementActive) + if(!gObjectEvents[trainerObjectId2].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId2]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId2]); gTasks[taskId].data[1] = 1; } } else { - FreezeEventObjectsExceptOne(trainerObjectId1); + FreezeObjectEventsExceptOne(trainerObjectId1); taskId = CreateTask(sub_80985BC, 80); gTasks[taskId].data[2] = trainerObjectId1; - if(!gEventObjects[trainerObjectId1].singleMovementActive) + if(!gObjectEvents[trainerObjectId1].singleMovementActive) { - FreezeEventObject(&gEventObjects[trainerObjectId1]); + FreezeObjectEvent(&gObjectEvents[trainerObjectId1]); gTasks[taskId].data[1] = 1; } } diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c746f08b1c..1a6cc6c0d9 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -31,104 +31,104 @@ // this file was known as evobjmv.c in Game Freak's original source #define movement_type_def(setup, table) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ - return table[sprite->data[1]](eventObject, sprite);\ + return table[sprite->data[1]](objectEvent, sprite);\ } #define movement_type_empty_callback(setup) \ -static u8 setup##_callback(struct EventObject *, struct Sprite *);\ +static u8 setup##_callback(struct ObjectEvent *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\ + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, setup##_callback);\ }\ -static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\ +static u8 setup##_callback(struct ObjectEvent *objectEvent, struct Sprite *sprite)\ {\ return 0;\ } EWRAM_DATA u8 sCurrentReflectionType = 0; EWRAM_DATA u16 sCurrentSpecialObjectPaletteTag = 0; -EWRAM_DATA struct LockedAnimEventObjects *gLockedAnimEventObjects = {0}; +EWRAM_DATA struct LockedAnimObjectEvents *gLockedAnimObjectEvents = {0}; static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16); -static bool8 EventObjectExecSingleMovementAction(struct EventObject *, struct Sprite *); +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *, struct Sprite *); static void SetMovementDelay(struct Sprite *, s16); static bool8 WaitForMovementDelay(struct Sprite *); -static u8 GetCollisionInDirection(struct EventObject *, u8); +static u8 GetCollisionInDirection(struct ObjectEvent *, u8); static u32 state_to_direction(u8, u32, u32); -static void TryEnableEventObjectAnim(struct EventObject *, struct Sprite *); -static void EventObjectExecHeldMovementAction(struct EventObject *, struct Sprite *); -static void UpdateEventObjectSpriteAnimPause(struct EventObject *, struct Sprite *); -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *, s16, s16); -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *, s16, s16, u8); -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *, s16, s16); -static void sub_8096530(struct EventObject *, struct Sprite *); -static void UpdateEventObjSpriteVisibility(struct EventObject *, struct Sprite *); -static void EventObjectUpdateMetatileBehaviors(struct EventObject*); -static void GetGroundEffectFlags_Reflection(struct EventObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject*, u32*); -static void GetGroundEffectFlags_SandHeap(struct EventObject*, u32*); -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject*, u32*); -static void GetGroundEffectFlags_ShortGrass(struct EventObject*, u32*); -static void GetGroundEffectFlags_HotSprings(struct EventObject*, u32*); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject*, u32*); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject*, u32*); -static void GetGroundEffectFlags_Tracks(struct EventObject*, u32*); -static void GetGroundEffectFlags_Puddle(struct EventObject*, u32*); -static void GetGroundEffectFlags_Ripple(struct EventObject*, u32*); -static void GetGroundEffectFlags_Seaweed(struct EventObject*, u32*); -static void GetGroundEffectFlags_JumpLanding(struct EventObject*, u32*); -static u8 EventObjectCheckForReflectiveSurface(struct EventObject*); +static void TryEnableObjectEventAnim(struct ObjectEvent *, struct Sprite *); +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *, struct Sprite *); +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *, struct Sprite *); +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *, s16, s16); +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *, s16, s16, u8); +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16); +static void sub_8096530(struct ObjectEvent *, struct Sprite *); +static void UpdateEventObjSpriteVisibility(struct ObjectEvent *, struct Sprite *); +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32*); +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); -static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*); -static void DoTracksGroundEffect_None(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8); -static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8); -static void DoRippleFieldEffect(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*); -static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*); +static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); +static void DoTracksGroundEffect_None(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8); +static void DoRippleFieldEffect(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*); +static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*); static void sub_8097D68(struct Sprite*); static void ApplyLevitateMovement(u8); -static bool8 MovementType_Disguise_Callback(struct EventObject *, struct Sprite *); -static bool8 MovementType_Hidden_Callback(struct EventObject *, struct Sprite *); +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *, struct Sprite *); +static bool8 MovementType_Hidden_Callback(struct ObjectEvent *, struct Sprite *); static void CreateReflectionEffectSprites(void); -static u8 GetEventObjectIdByLocalId(u8); -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8); -static bool8 GetAvailableEventObjectId(u16, u8, u8, u8 *); -static void SetEventObjectDynamicGraphicsId(struct EventObject *); -static void RemoveEventObjectInternal(struct EventObject *); -static u16 GetEventObjectFlagIdByEventObjectId(u8); -static void UpdateEventObjectVisibility(struct EventObject *, struct Sprite *); -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); -static void GetEventObjectMovingCameraOffset(s16 *, s16 *); -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8); -static void LoadEventObjectPalette(u16); -static void RemoveEventObjectIfOutsideView(struct EventObject *); +static u8 GetObjectEventIdByLocalId(u8); +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); +static bool8 GetAvailableObjectEventId(u16, u8, u8, u8 *); +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *); +static void RemoveObjectEventInternal(struct ObjectEvent *); +static u16 GetObjectEventFlagIdByObjectEventId(u8); +static void UpdateObjectEventVisibility(struct ObjectEvent *, struct Sprite *); +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *, struct SpriteTemplate *, const struct SubspriteTable **); +static void GetObjectEventMovingCameraOffset(s16 *, s16 *); +static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8, u8, u8); +static void LoadObjectEventPalette(u16); +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *); static void sub_808E1B8(u8, s16, s16); -static void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8); -static void sub_808E38C(struct EventObject *); +static void SetPlayerAvatarObjectEventIdAndObjectId(u8, u8); +static void sub_808E38C(struct ObjectEvent *); static u8 sub_808E8F4(const struct SpritePalette *); -static u8 FindEventObjectPaletteIndexByTag(u16); +static u8 FindObjectEventPaletteIndexByTag(u16); static void sub_808EAB0(u16, u8); -static bool8 EventObjectDoesZCoordMatch(struct EventObject *, u8); +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *, u8); static void ObjectCB_CameraObject(struct Sprite *); static void CameraObject_0(struct Sprite *); static void CameraObject_1(struct Sprite *); static void CameraObject_2(struct Sprite *); -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count); -static void ClearEventObjectMovement(struct EventObject *, struct Sprite *); -static void EventObjectSetSingleMovement(struct EventObject *, struct Sprite *, u8); +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count); +static void ClearObjectEventMovement(struct ObjectEvent *, struct Sprite *); +static void ObjectEventSetSingleMovement(struct ObjectEvent *, struct Sprite *, u8); static void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *); +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0}; @@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = { CameraObject_2, }; -#include "data/field_event_obj/event_object_graphics.h" +#include "data/event_object/event_object_graphics.h" // movement type callbacks static void (*const sMovementTypeCallbacks[])(struct Sprite *) = @@ -433,50 +433,50 @@ const u8 gInitialMovementTypeFacingDirections[] = { #define EVENT_OBJ_PAL_TAG_34 0x1123 #define EVENT_OBJ_PAL_TAG_NONE 0x11FF -#include "data/field_event_obj/event_object_graphics_info_pointers.h" -#include "data/field_event_obj/field_effect_object_template_pointers.h" -#include "data/field_event_obj/event_object_pic_tables.h" -#include "data/field_event_obj/event_object_anims.h" -#include "data/field_event_obj/base_oam.h" -#include "data/field_event_obj/event_object_subsprites.h" -#include "data/field_event_obj/event_object_graphics_info.h" +#include "data/event_object/event_object_graphics_info_pointers.h" +#include "data/event_object/field_effect_object_template_pointers.h" +#include "data/event_object/event_object_pic_tables.h" +#include "data/event_object/event_object_anims.h" +#include "data/event_object/base_oam.h" +#include "data/event_object/event_object_subsprites.h" +#include "data/event_object/event_object_graphics_info.h" -const struct SpritePalette sEventObjectSpritePalettes[] = { - {gEventObjectPalette0, EVENT_OBJ_PAL_TAG_0}, - {gEventObjectPalette1, EVENT_OBJ_PAL_TAG_1}, - {gEventObjectPalette2, EVENT_OBJ_PAL_TAG_2}, - {gEventObjectPalette3, EVENT_OBJ_PAL_TAG_3}, - {gEventObjectPalette4, EVENT_OBJ_PAL_TAG_4}, - {gEventObjectPalette5, EVENT_OBJ_PAL_TAG_5}, - {gEventObjectPalette6, EVENT_OBJ_PAL_TAG_6}, - {gEventObjectPalette7, EVENT_OBJ_PAL_TAG_7}, - {gEventObjectPalette8, EVENT_OBJ_PAL_TAG_8}, - {gEventObjectPalette9, EVENT_OBJ_PAL_TAG_9}, - {gEventObjectPalette10, EVENT_OBJ_PAL_TAG_10}, - {gEventObjectPalette11, EVENT_OBJ_PAL_TAG_11}, - {gEventObjectPalette12, EVENT_OBJ_PAL_TAG_12}, - {gEventObjectPalette13, EVENT_OBJ_PAL_TAG_13}, - {gEventObjectPalette14, EVENT_OBJ_PAL_TAG_14}, - {gEventObjectPalette15, EVENT_OBJ_PAL_TAG_15}, - {gEventObjectPalette16, EVENT_OBJ_PAL_TAG_16}, - {gEventObjectPalette17, EVENT_OBJ_PAL_TAG_17}, - {gEventObjectPalette18, EVENT_OBJ_PAL_TAG_18}, - {gEventObjectPalette19, EVENT_OBJ_PAL_TAG_19}, - {gEventObjectPalette20, EVENT_OBJ_PAL_TAG_20}, - {gEventObjectPalette21, EVENT_OBJ_PAL_TAG_21}, - {gEventObjectPalette22, EVENT_OBJ_PAL_TAG_22}, - {gEventObjectPalette23, EVENT_OBJ_PAL_TAG_23}, - {gEventObjectPalette24, EVENT_OBJ_PAL_TAG_24}, - {gEventObjectPalette25, EVENT_OBJ_PAL_TAG_25}, - {gEventObjectPalette26, EVENT_OBJ_PAL_TAG_26}, - {gEventObjectPalette27, EVENT_OBJ_PAL_TAG_27}, - {gEventObjectPalette28, EVENT_OBJ_PAL_TAG_28}, - {gEventObjectPalette29, EVENT_OBJ_PAL_TAG_29}, - {gEventObjectPalette30, EVENT_OBJ_PAL_TAG_30}, - {gEventObjectPalette31, EVENT_OBJ_PAL_TAG_31}, - {gEventObjectPalette32, EVENT_OBJ_PAL_TAG_32}, - {gEventObjectPalette33, EVENT_OBJ_PAL_TAG_33}, - {gEventObjectPalette34, EVENT_OBJ_PAL_TAG_34}, +const struct SpritePalette sObjectEventSpritePalettes[] = { + {gObjectEventPalette0, EVENT_OBJ_PAL_TAG_0}, + {gObjectEventPalette1, EVENT_OBJ_PAL_TAG_1}, + {gObjectEventPalette2, EVENT_OBJ_PAL_TAG_2}, + {gObjectEventPalette3, EVENT_OBJ_PAL_TAG_3}, + {gObjectEventPalette4, EVENT_OBJ_PAL_TAG_4}, + {gObjectEventPalette5, EVENT_OBJ_PAL_TAG_5}, + {gObjectEventPalette6, EVENT_OBJ_PAL_TAG_6}, + {gObjectEventPalette7, EVENT_OBJ_PAL_TAG_7}, + {gObjectEventPalette8, EVENT_OBJ_PAL_TAG_8}, + {gObjectEventPalette9, EVENT_OBJ_PAL_TAG_9}, + {gObjectEventPalette10, EVENT_OBJ_PAL_TAG_10}, + {gObjectEventPalette11, EVENT_OBJ_PAL_TAG_11}, + {gObjectEventPalette12, EVENT_OBJ_PAL_TAG_12}, + {gObjectEventPalette13, EVENT_OBJ_PAL_TAG_13}, + {gObjectEventPalette14, EVENT_OBJ_PAL_TAG_14}, + {gObjectEventPalette15, EVENT_OBJ_PAL_TAG_15}, + {gObjectEventPalette16, EVENT_OBJ_PAL_TAG_16}, + {gObjectEventPalette17, EVENT_OBJ_PAL_TAG_17}, + {gObjectEventPalette18, EVENT_OBJ_PAL_TAG_18}, + {gObjectEventPalette19, EVENT_OBJ_PAL_TAG_19}, + {gObjectEventPalette20, EVENT_OBJ_PAL_TAG_20}, + {gObjectEventPalette21, EVENT_OBJ_PAL_TAG_21}, + {gObjectEventPalette22, EVENT_OBJ_PAL_TAG_22}, + {gObjectEventPalette23, EVENT_OBJ_PAL_TAG_23}, + {gObjectEventPalette24, EVENT_OBJ_PAL_TAG_24}, + {gObjectEventPalette25, EVENT_OBJ_PAL_TAG_25}, + {gObjectEventPalette26, EVENT_OBJ_PAL_TAG_26}, + {gObjectEventPalette27, EVENT_OBJ_PAL_TAG_27}, + {gObjectEventPalette28, EVENT_OBJ_PAL_TAG_28}, + {gObjectEventPalette29, EVENT_OBJ_PAL_TAG_29}, + {gObjectEventPalette30, EVENT_OBJ_PAL_TAG_30}, + {gObjectEventPalette31, EVENT_OBJ_PAL_TAG_31}, + {gObjectEventPalette32, EVENT_OBJ_PAL_TAG_32}, + {gObjectEventPalette33, EVENT_OBJ_PAL_TAG_33}, + {gObjectEventPalette34, EVENT_OBJ_PAL_TAG_34}, {NULL, 0x0000}, }; @@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = { gObjectPaletteTags3, }; -#include "data/field_event_obj/berry_tree_graphics_tables.h" -#include "data/field_event_obj/field_effect_objects.h" +#include "data/event_object/berry_tree_graphics_tables.h" +#include "data/event_object/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/event_object/movement_type_func_tables.h" const u8 gFaceDirectionAnimNums[] = { [DIR_NONE] = 0, @@ -1089,31 +1089,31 @@ const u8 gUnknown_0850DC3F[][4] = { {3, 4, 2, 1} }; -#include "data/field_event_obj/movement_action_func_tables.h" +#include "data/event_object/movement_action_func_tables.h" // Code -static void ClearEventObject(struct EventObject *eventObject) +static void ClearObjectEvent(struct ObjectEvent *objectEvent) { - *eventObject = (struct EventObject){}; - eventObject->localId = 0xFF; - eventObject->mapNum = 0xFF; - eventObject->mapGroup = 0xFF; - eventObject->movementActionId = 0xFF; + *objectEvent = (struct ObjectEvent){}; + objectEvent->localId = 0xFF; + objectEvent->mapNum = 0xFF; + objectEvent->mapGroup = 0xFF; + objectEvent->movementActionId = 0xFF; } -static void ClearAllEventObjects(void) +static void ClearAllObjectEvents(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - ClearEventObject(&gEventObjects[i]); + ClearObjectEvent(&gObjectEvents[i]); } -void ResetEventObjects(void) +void ResetObjectEvents(void) { - ClearLinkPlayerEventObjects(); - ClearAllEventObjects(); + ClearLinkPlayerObjectEvents(); + ClearAllObjectEvents(); ClearPlayerAvatarInfo(); CreateReflectionEffectSprites(); } @@ -1133,66 +1133,66 @@ static void CreateReflectionEffectSprites(void) gSprites[spriteId].invisible = TRUE; } -u8 GetFirstInactiveEventObjectId(void) +u8 GetFirstInactiveObjectEventId(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) break; } return i; } -u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) +u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId) { if (localId < EVENT_OBJ_ID_PLAYER) { - return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); + return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId); } - return GetEventObjectIdByLocalId(localId); + return GetObjectEventIdByLocalId(localId); } -bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *eventObjectId) +bool8 TryGetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId, u8 *objectEventId) { - *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroupId); - if (*eventObjectId == EVENT_OBJECTS_COUNT) + *objectEventId = GetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroupId); + if (*objectEventId == EVENT_OBJECTS_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++) { - if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) + if (gObjectEvents[i].active && gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) break; } return i; } -static u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) +static u8 GetObjectEventIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroupId) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroupId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroupId) return i; } return EVENT_OBJECTS_COUNT; } -static u8 GetEventObjectIdByLocalId(u8 localId) +static u8 GetObjectEventIdByLocalId(u8 localId) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active && gEventObjects[i].localId == localId) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId) return i; } @@ -1201,62 +1201,62 @@ static u8 GetEventObjectIdByLocalId(u8 localId) // This function has the same nonmatching quirk as in Ruby/Sapphire. #ifdef NONMATCHING -static u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup) +static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapNum, u8 mapGroup) { - struct EventObject *eventObject; - u8 eventObjectId; + struct ObjectEvent *objectEvent; + u8 objectEventId; s16 x; s16 y; // mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7) - if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId)) + if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) { return EVENT_OBJECTS_COUNT; } - eventObject = &gEventObjects[eventObjectId]; - ClearEventObject(eventObject); + objectEvent = &gObjectEvents[objectEventId]; + ClearObjectEvent(objectEvent); x = template->x + 7; y = template->y + 7; - eventObject->active = TRUE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->graphicsId = template->graphicsId; - eventObject->movementType = template->movementType; - eventObject->localId = template->localId; - eventObject->mapNum = mapNum; - eventObject->mapGroup = mapGroup; - eventObject->initialCoords.x = x; - eventObject->initialCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentElevation = template->elevation; - eventObject->previousElevation = template->elevation; + objectEvent->active = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->graphicsId = template->graphicsId; + objectEvent->movementType = template->movementType; + objectEvent->localId = template->localId; + objectEvent->mapNum = mapNum; + objectEvent->mapGroup = mapGroup; + objectEvent->initialCoords.x = x; + objectEvent->initialCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentElevation = template->elevation; + objectEvent->previousElevation = template->elevation; // For some reason, 0x0F is placed in r9, to be used later - eventObject->range.as_nybbles.x = template->movementRangeX; - eventObject->range.as_nybbles.y = template->movementRangeY; - eventObject->trainerType = template->trainerType; - eventObject->trainerRange_berryTreeId = template->trainerRange_berryTreeId; - eventObject->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; - SetEventObjectDirection(eventObject, eventObject->previousMovementDirection); - SetEventObjectDynamicGraphicsId(eventObject); + objectEvent->range.as_nybbles.x = template->movementRangeX; + objectEvent->range.as_nybbles.y = template->movementRangeY; + objectEvent->trainerType = template->trainerType; + objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId; + objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; + SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); + SetObjectEventDynamicGraphicsId(objectEvent); - if (gRangedMovementTypes[eventObject->movementType]) + if (gRangedMovementTypes[objectEvent->movementType]) { - if ((eventObject->range.as_nybbles.x) == 0) + if ((objectEvent->range.as_nybbles.x) == 0) { // r9 is invoked here - eventObject->range.as_nybbles.x++; + objectEvent->range.as_nybbles.x++; } - if ((eventObject->range.as_nybbles.y) == 0) + if ((objectEvent->range.as_nybbles.y) == 0) { - eventObject->range.as_nybbles.y++; + objectEvent->range.as_nybbles.y++; } } - return eventObjectId; + return objectEventId; } #else -static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapId, u8 mapGroupId) +static NAKED u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapId, u8 mapGroupId) { asm_unified("\tpush {r4-r7,lr}\n" "\tmov r7, r9\n" @@ -1272,7 +1272,7 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tadds r1, r6, 0\n" "\tadds r2, r7, 0\n" "\tmov r3, sp\n" - "\tbl GetAvailableEventObjectId\n" + "\tbl GetAvailableObjectEventId\n" "\tlsls r0, 24\n" "\tcmp r0, 0\n" "\tbeq _0808D66E\n" @@ -1284,10 +1284,10 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tlsls r0, r1, 3\n" "\tadds r0, r1\n" "\tlsls r0, 2\n" - "\tldr r1, =gEventObjects\n" + "\tldr r1, =gObjectEvents\n" "\tadds r4, r0, r1\n" "\tadds r0, r4, 0\n" - "\tbl ClearEventObject\n" + "\tbl ClearObjectEvent\n" "\tldrh r3, [r5, 0x4]\n" "\tadds r3, 0x7\n" "\tlsls r3, 16\n" @@ -1361,9 +1361,9 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem "\tstrb r1, [r0]\n" "\tldrb r1, [r0]\n" "\tadds r0, r4, 0\n" - "\tbl SetEventObjectDirection\n" + "\tbl SetObjectEventDirection\n" "\tadds r0, r4, 0\n" - "\tbl SetEventObjectDynamicGraphicsId\n" + "\tbl SetObjectEventDynamicGraphicsId\n" "\tldr r1, =gRangedMovementTypes\n" "\tldrb r0, [r4, 0x6]\n" "\tadds r0, r1\n" @@ -1412,42 +1412,42 @@ static NAKED u8 InitEventObjectStateFromTemplate(struct EventObjectTemplate *tem } #endif -u8 Unref_TryInitLocalEventObject(u8 localId) +u8 Unref_TryInitLocalObjectEvent(u8 localId) { u8 i; - u8 eventObjectCount; - struct EventObjectTemplate *template; + u8 objectEventCount; + struct ObjectEventTemplate *template; if (gMapHeader.events != NULL) { if (InBattlePyramid()) { - eventObjectCount = GetNumBattlePyramidEventObjects(); + objectEventCount = GetNumBattlePyramidObjectEvents(); } else if (InTrainerHill()) { - eventObjectCount = 2; + objectEventCount = 2; } else { - eventObjectCount = gMapHeader.events->eventObjectCount; + objectEventCount = gMapHeader.events->objectEventCount; } - for (i = 0; i < eventObjectCount; i++) + for (i = 0; i < objectEventCount; i++) { - template = &gSaveBlock1Ptr->eventObjectTemplates[i]; + template = &gSaveBlock1Ptr->objectEventTemplates[i]; if (template->localId == localId && !FlagGet(template->flagId)) { - return InitEventObjectStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + return InitObjectEventStateFromTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } } } return EVENT_OBJECTS_COUNT; } -static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId) +static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId) // Looks for an empty slot. // Returns FALSE and the location of the available slot -// in *eventObjectId. +// in *objectEventId. // If no slots are available, or if the object is already // loaded, returns TRUE. { @@ -1455,73 +1455,73 @@ static bool8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 * for (i = 0; i < EVENT_OBJECTS_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) return TRUE; - *eventObjectId = i; + *objectEventId = i; do { - if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup) + if (gObjectEvents[i].active && gObjectEvents[i].localId == localId && gObjectEvents[i].mapNum == mapNum && gObjectEvents[i].mapGroup == mapGroup) return TRUE; i++; } while (i < EVENT_OBJECTS_COUNT); return FALSE; } -static void RemoveEventObject(struct EventObject *eventObject) +static void RemoveObjectEvent(struct ObjectEvent *objectEvent) { - eventObject->active = FALSE; - RemoveEventObjectInternal(eventObject); + objectEvent->active = FALSE; + RemoveObjectEventInternal(objectEvent); } -void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +void RemoveObjectEventByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId)); - RemoveEventObject(&gEventObjects[eventObjectId]); + FlagSet(GetObjectEventFlagIdByObjectEventId(objectEventId)); + RemoveObjectEvent(&gObjectEvents[objectEventId]); } } -static void RemoveEventObjectInternal(struct EventObject *eventObject) +static void RemoveObjectEventInternal(struct ObjectEvent *objectEvent) { struct SpriteFrameImage image; - image.size = GetEventObjectGraphicsInfo(eventObject->graphicsId)->size; - gSprites[eventObject->spriteId].images = ℑ - DestroySprite(&gSprites[eventObject->spriteId]); + image.size = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->size; + gSprites[objectEvent->spriteId].images = ℑ + DestroySprite(&gSprites[objectEvent->spriteId]); } -void RemoveAllEventObjectsExceptPlayer(void) +void RemoveAllObjectEventsExceptPlayer(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (i != gPlayerAvatar.eventObjectId) - RemoveEventObject(&gEventObjects[i]); + if (i != gPlayerAvatar.objectEventId) + RemoveObjectEvent(&gObjectEvents[i]); } } -static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { u8 spriteId; u8 paletteSlot; - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - struct EventObject *eventObject; - const struct EventObjectGraphicsInfo *graphicsInfo; + struct ObjectEvent *objectEvent; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = InitEventObjectStateFromTemplate(eventObjectTemplate, mapNum, mapGroup); - if (eventObjectId == EVENT_OBJECTS_COUNT) + objectEventId = InitObjectEventStateFromTemplate(objectEventTemplate, mapNum, mapGroup); + if (objectEventId == EVENT_OBJECTS_COUNT) return EVENT_OBJECTS_COUNT; - eventObject = &gEventObjects[eventObjectId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent = &gObjectEvents[objectEventId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1537,104 +1537,104 @@ static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjectTempl sub_808EAB0(graphicsInfo->paletteTag1, paletteSlot); } - if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE) - eventObject->invisible = TRUE; + if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) + objectEvent->invisible = TRUE; *(u16 *)&spriteTemplate->paletteTag = 0xFFFF; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { - gEventObjects[eventObjectId].active = FALSE; + gObjectEvents[objectEventId].active = FALSE; return EVENT_OBJECTS_COUNT; } sprite = &gSprites[spriteId]; - sub_8092FF0(eventObject->currentCoords.x + cameraX, eventObject->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(objectEvent->currentCoords.x + cameraX, objectEvent->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - eventObject->inanimate = graphicsInfo->inanimate; - if (!eventObject->inanimate) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + objectEvent->inanimate = graphicsInfo->inanimate; + if (!objectEvent->inanimate) + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); - UpdateEventObjectVisibility(eventObject, sprite); - return eventObjectId; + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); + UpdateObjectEventVisibility(objectEvent, sprite); + return objectEventId; } -static u8 TrySpawnEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) +static u8 TrySpawnObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, u8 mapNum, u8 mapGroup, s16 cameraX, s16 cameraY) { - u8 eventObjectId; + u8 objectEventId; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; const struct SubspriteTable *subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObjectTemplate->graphicsId); - MakeObjectTemplateFromEventObjectTemplate(eventObjectTemplate, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(objectEventTemplate->graphicsId); + MakeObjectTemplateFromObjectEventTemplate(objectEventTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = graphicsInfo->size; spriteTemplate.images = &spriteFrameImage; - eventObjectId = TrySetupEventObjectSprite(eventObjectTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); - if (eventObjectId == EVENT_OBJECTS_COUNT) + objectEventId = TrySetupObjectEventSprite(objectEventTemplate, &spriteTemplate, mapNum, mapGroup, cameraX, cameraY); + if (objectEventId == EVENT_OBJECTS_COUNT) return EVENT_OBJECTS_COUNT; - gSprites[gEventObjects[eventObjectId].spriteId].images = graphicsInfo->images; + gSprites[gObjectEvents[objectEventId].spriteId].images = graphicsInfo->images; if (subspriteTables) - SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables); + SetSubspriteTables(&gSprites[gObjectEvents[objectEventId].spriteId], subspriteTables); - return eventObjectId; + return objectEventId; } -u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjectTemplate) +u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *objectEventTemplate) { s16 cameraX; s16 cameraY; - GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return TrySpawnEventObjectTemplate(eventObjectTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + GetObjectEventMovingCameraOffset(&cameraX, &cameraY); + return TrySpawnObjectEventTemplate(objectEventTemplate, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } -u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) +u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z) { - struct EventObjectTemplate eventObjectTemplate; + struct ObjectEventTemplate objectEventTemplate; x -= 7; y -= 7; - eventObjectTemplate.localId = localId; - eventObjectTemplate.graphicsId = graphicsId; - eventObjectTemplate.unk2 = 0; - eventObjectTemplate.x = x; - eventObjectTemplate.y = y; - eventObjectTemplate.elevation = z; - eventObjectTemplate.movementType = movementBehavior; - eventObjectTemplate.movementRangeX = 0; - eventObjectTemplate.movementRangeY = 0; - eventObjectTemplate.trainerType = 0; - eventObjectTemplate.trainerRange_berryTreeId = 0; - return SpawnSpecialEventObject(&eventObjectTemplate); + objectEventTemplate.localId = localId; + objectEventTemplate.graphicsId = graphicsId; + objectEventTemplate.unk2 = 0; + objectEventTemplate.x = x; + objectEventTemplate.y = y; + objectEventTemplate.elevation = z; + objectEventTemplate.movementType = movementBehavior; + objectEventTemplate.movementRangeX = 0; + objectEventTemplate.movementRangeY = 0; + objectEventTemplate.trainerType = 0; + objectEventTemplate.trainerRange_berryTreeId = 0; + return SpawnSpecialObjectEvent(&objectEventTemplate); } -u8 TrySpawnEventObject(u8 localId, u8 mapNum, u8 mapGroup) +u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; s16 cameraX, cameraY; - eventObjectTemplate = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - if (!eventObjectTemplate) + objectEventTemplate = GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup); + if (!objectEventTemplate) return EVENT_OBJECTS_COUNT; - GetEventObjectMovingCameraOffset(&cameraX, &cameraY); - return TrySpawnEventObjectTemplate(eventObjectTemplate, mapNum, mapGroup, cameraX, cameraY); + GetObjectEventMovingCameraOffset(&cameraX, &cameraY); + return TrySpawnObjectEventTemplate(objectEventTemplate, mapNum, mapGroup, cameraX, cameraY); } -static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); spriteTemplate->tileTag = graphicsInfo->tileTag; spriteTemplate->paletteTag = graphicsInfo->paletteTag1; @@ -1646,17 +1646,17 @@ static void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void ( *subspriteTables = graphicsInfo->subspriteTables; } -static void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, sMovementTypeCallbacks[callbackIndex], spriteTemplate, subspriteTables); } -static void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjectTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) +static void MakeObjectTemplateFromObjectEventTemplate(struct ObjectEventTemplate *objectEventTemplate, struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables) { - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjectTemplate->graphicsId, eventObjectTemplate->movementType, spriteTemplate, subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEventTemplate->graphicsId, objectEventTemplate->movementType, spriteTemplate, subspriteTables); } -u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) +u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority) { struct SpriteTemplate *spriteTemplate; const struct SubspriteTable *subspriteTables; @@ -1664,10 +1664,10 @@ u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x u8 spriteId; spriteTemplate = malloc(sizeof(struct SpriteTemplate)); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables); if (spriteTemplate->paletteTag != 0xFFFF) { - LoadEventObjectPalette(spriteTemplate->paletteTag); + LoadObjectEventPalette(spriteTemplate->paletteTag); } spriteId = CreateSprite(spriteTemplate, x, y, subpriority); free(spriteTemplate); @@ -1687,10 +1687,10 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) struct Sprite *sprite; struct SpriteTemplate spriteTemplate; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, UpdateObjectEventSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; x += 7; y += 7; @@ -1730,7 +1730,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) return spriteId; } -void TrySpawnEventObjects(s16 cameraX, s16 cameraY) +void TrySpawnObjectEvents(s16 cameraX, s16 cameraY) { u8 i; u8 objectCount; @@ -1744,7 +1744,7 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) if (InBattlePyramid()) { - objectCount = GetNumBattlePyramidEventObjects(); + objectCount = GetNumBattlePyramidObjectEvents(); } else if (InTrainerHill()) { @@ -1752,58 +1752,58 @@ void TrySpawnEventObjects(s16 cameraX, s16 cameraY) } else { - objectCount = gMapHeader.events->eventObjectCount; + objectCount = gMapHeader.events->objectEventCount; } for (i = 0; i < objectCount; i++) { - struct EventObjectTemplate *template = &gSaveBlock1Ptr->eventObjectTemplates[i]; + struct ObjectEventTemplate *template = &gSaveBlock1Ptr->objectEventTemplates[i]; s16 npcX = template->x + 7; s16 npcY = template->y + 7; if (top <= npcY && bottom >= npcY && left <= npcX && right >= npcX && !FlagGet(template->flagId)) - TrySpawnEventObjectTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); + TrySpawnObjectEventTemplate(template, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, cameraX, cameraY); } } } -void RemoveEventObjectsOutsideView(void) +void RemoveObjectEventsOutsideView(void) { u8 i, j; bool8 isActiveLinkPlayer; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerEventObjects); j++) + for (j = 0, isActiveLinkPlayer = FALSE; j < ARRAY_COUNT(gLinkPlayerObjectEvents); j++) { - if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId) + if (gLinkPlayerObjectEvents[j].active && i == gLinkPlayerObjectEvents[j].objEventId) isActiveLinkPlayer = TRUE; } if (!isActiveLinkPlayer) { - struct EventObject *eventObject = &gEventObjects[i]; + struct ObjectEvent *objectEvent = &gObjectEvents[i]; - if (eventObject->active && !eventObject->isPlayer) - RemoveEventObjectIfOutsideView(eventObject); + if (objectEvent->active && !objectEvent->isPlayer) + RemoveObjectEventIfOutsideView(objectEvent); } } } -static void RemoveEventObjectIfOutsideView(struct EventObject *eventObject) +static void RemoveObjectEventIfOutsideView(struct ObjectEvent *objectEvent) { s16 left = gSaveBlock1Ptr->pos.x - 2; s16 right = gSaveBlock1Ptr->pos.x + 17; s16 top = gSaveBlock1Ptr->pos.y; s16 bottom = gSaveBlock1Ptr->pos.y + 16; - if (eventObject->currentCoords.x >= left && eventObject->currentCoords.x <= right - && eventObject->currentCoords.y >= top && eventObject->currentCoords.y <= bottom) + if (objectEvent->currentCoords.x >= left && objectEvent->currentCoords.x <= right + && objectEvent->currentCoords.y >= top && objectEvent->currentCoords.y <= bottom) return; - if (eventObject->initialCoords.x >= left && eventObject->initialCoords.x <= right - && eventObject->initialCoords.y >= top && eventObject->initialCoords.y <= bottom) + if (objectEvent->initialCoords.x >= left && objectEvent->initialCoords.x <= right + && objectEvent->initialCoords.y >= top && objectEvent->initialCoords.y <= bottom) return; - RemoveEventObject(eventObject); + RemoveObjectEvent(objectEvent); } void sub_808E16C(s16 x, s16 y) @@ -1813,7 +1813,7 @@ void sub_808E16C(s16 x, s16 y) ClearPlayerAvatarInfo(); for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { sub_808E1B8(i, x, y); } @@ -1821,32 +1821,32 @@ void sub_808E16C(s16 x, s16 y) CreateReflectionEffectSprites(); } -static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) +static void sub_808E1B8(u8 objectEventId, s16 x, s16 y) { u8 spriteId; u8 paletteSlot; struct Sprite *sprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct SpriteTemplate spriteTemplate; struct SpriteFrameImage spriteFrameImage; const struct SubspriteTable *subspriteTables; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; #define i spriteId - for (i = 0; i < ARRAY_COUNT(gLinkPlayerEventObjects); i++) + for (i = 0; i < ARRAY_COUNT(gLinkPlayerObjectEvents); i++) { - if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId) + if (gLinkPlayerObjectEvents[i].active && objectEventId == gLinkPlayerObjectEvents[i].objEventId) { return; } } #undef i - eventObject = &gEventObjects[eventObjectId]; + objectEvent = &gObjectEvents[objectEventId]; subspriteTables = NULL; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); spriteFrameImage.size = graphicsInfo->size; - MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &spriteTemplate, &subspriteTables); + MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEvent->graphicsId, objectEvent->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; *(u16 *)&spriteTemplate.paletteTag = 0xFFFF; paletteSlot = graphicsInfo->paletteSlot; @@ -1868,16 +1868,16 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; - sub_8092FF0(x + eventObject->currentCoords.x, y + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sub_8092FF0(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; sprite->images = graphicsInfo->images; - if (eventObject->movementType == MOVEMENT_TYPE_PLAYER) + if (objectEvent->movementType == MOVEMENT_TYPE_PLAYER) { - SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId); - eventObject->warpArrowSpriteId = CreateWarpArrowSprite(); + SetPlayerAvatarObjectEventIdAndObjectId(objectEventId, spriteId); + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); } if (subspriteTables != NULL) { @@ -1885,46 +1885,46 @@ static void sub_808E1B8(u8 eventObjectId, s16 x, s16 y) } sprite->oam.paletteNum = paletteSlot; sprite->coordOffsetEnabled = TRUE; - sprite->data[0] = eventObjectId; - eventObject->spriteId = spriteId; - if (!eventObject->inanimate && eventObject->movementType != MOVEMENT_TYPE_PLAYER) + sprite->data[0] = objectEventId; + objectEvent->spriteId = spriteId; + if (!objectEvent->inanimate && objectEvent->movementType != MOVEMENT_TYPE_PLAYER) { - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objectEvent->facingDirection)); } - sub_808E38C(eventObject); - SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1); + sub_808E38C(objectEvent); + SetObjectSubpriorityByZCoord(objectEvent->previousElevation, sprite, 1); } } -static void sub_808E38C(struct EventObject *eventObject) +static void sub_808E38C(struct ObjectEvent *objectEvent) { - eventObject->singleMovementActive = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->hasShadow = FALSE; - eventObject->hasReflection = FALSE; - eventObject->inShortGrass = FALSE; - eventObject->inShallowFlowingWater = FALSE; - eventObject->inSandPile = FALSE; - eventObject->inHotSprings = FALSE; - EventObjectClearHeldMovement(eventObject); + objectEvent->singleMovementActive = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->hasShadow = FALSE; + objectEvent->hasReflection = FALSE; + objectEvent->inShortGrass = FALSE; + objectEvent->inShallowFlowingWater = FALSE; + objectEvent->inSandPile = FALSE; + objectEvent->inHotSprings = FALSE; + ObjectEventClearHeldMovement(objectEvent); } -static void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId) +static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteId) { - gPlayerAvatar.eventObjectId = eventObjectId; + gPlayerAvatar.objectEventId = objectEventId; gPlayerAvatar.spriteId = spriteId; - gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId); - SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20); + gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gObjectEvents[objectEventId].graphicsId); + SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, 0x20); } -void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) +void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *sprite; u8 paletteSlot; - graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); - sprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); + sprite = &gSprites[objectEvent->spriteId]; paletteSlot = graphicsInfo->paletteSlot; if (paletteSlot == 0) { @@ -1945,85 +1945,85 @@ void EventObjectSetGraphicsId(struct EventObject *eventObject, u8 graphicsId) sprite->anims = graphicsInfo->anims; sprite->subspriteTables = graphicsInfo->subspriteTables; sprite->oam.paletteNum = paletteSlot; - eventObject->inanimate = graphicsInfo->inanimate; - eventObject->graphicsId = graphicsId; - SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + objectEvent->inanimate = graphicsInfo->inanimate; + objectEvent->graphicsId = graphicsId; + SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - if (eventObject->trackedByCamera) + if (objectEvent->trackedByCamera) { CameraObjectReset1(); } } -void EventObjectSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) +void ObjectEventSetGraphicsIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectSetGraphicsId(&gEventObjects[eventObjectId], graphicsId); + ObjectEventSetGraphicsId(&gObjectEvents[objectEventId], graphicsId); } } -void EventObjectTurn(struct EventObject *eventObject, u8 direction) +void ObjectEventTurn(struct ObjectEvent *objectEvent, u8 direction) { - SetEventObjectDirection(eventObject, direction); - if (!eventObject->inanimate) + SetObjectEventDirection(objectEvent, direction); + if (!objectEvent->inanimate) { - StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection)); - SeekSpriteAnim(&gSprites[eventObject->spriteId], 0); + StartSpriteAnim(&gSprites[objectEvent->spriteId], GetFaceDirectionAnimNum(objectEvent->facingDirection)); + SeekSpriteAnim(&gSprites[objectEvent->spriteId], 0); } } -void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) +void ObjectEventTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - EventObjectTurn(&gEventObjects[eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[objectEventId], direction); } } void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction) { - EventObjectTurn(&gEventObjects[playerAvatar->eventObjectId], direction); + ObjectEventTurn(&gObjectEvents[playerAvatar->objectEventId], direction); } -static void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite) +static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; u8 berryId; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage != 0) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; - berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; + berryId = GetBerryTypeByBerryTreeId(objectEvent->trainerRange_berryTreeId) - 1; berryStage--; if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX)) berryId = 0; - EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]); + ObjectEventSetGraphicsId(objectEvent, gBerryTreeObjectEventGraphicsIdTablePointers[berryId][berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; StartSpriteAnim(sprite, berryStage); } } -const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) +const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId) { u8 bard; if (graphicsId >= SPRITE_VAR) { - graphicsId = VarGetEventObjectGraphicsId(graphicsId - SPRITE_VAR); + graphicsId = VarGetObjectEventGraphicsId(graphicsId - SPRITE_VAR); } if (graphicsId == EVENT_OBJ_GFX_BARD) { @@ -2034,83 +2034,83 @@ const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId) { graphicsId = EVENT_OBJ_GFX_NINJA_BOY; } - return gEventObjectGraphicsInfoPointers[graphicsId]; + return gObjectEventGraphicsInfoPointers[graphicsId]; } -static void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject) +static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent) { - if (eventObject->graphicsId >= SPRITE_VAR) + if (objectEvent->graphicsId >= SPRITE_VAR) { - eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId - SPRITE_VAR); + objectEvent->graphicsId = VarGetObjectEventGraphicsId(objectEvent->graphicsId - SPRITE_VAR); } } void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gEventObjects[eventObjectId].invisible = state; + gObjectEvents[objectEventId].invisible = state; } } -void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup) +void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup) { - *(u8*)(localId) = eventObject->localId; - *(u8*)(mapNum) = eventObject->mapNum; - *(u8*)(mapGroup) = eventObject->mapGroup; + *(u8*)(localId) = objectEvent->localId; + *(u8*)(mapNum) = objectEvent->mapNum; + *(u8*)(mapGroup) = objectEvent->mapGroup; } void sub_808E75C(s16 x, s16 y) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - eventObjectId = GetEventObjectIdByXY(x, y); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByXY(x, y); + if (objectEventId != EVENT_OBJECTS_COUNT) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->fixedPriority = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->fixedPriority = TRUE; sprite->subpriority = subpriority; } } void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - eventObject = &gEventObjects[eventObjectId]; - eventObject->fixedPriority = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->fixedPriority = FALSE; + objectEvent->triggerGroundEffectsOnMove = TRUE; } } void sub_808E82C(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *sprite; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos2.x = x; sprite->pos2.y = y; } @@ -2122,23 +2122,23 @@ void FreeAndReserveObjectSpritePalettes(void) gReservedSpritePaletteCount = 12; } -static void LoadEventObjectPalette(u16 paletteTag) +static void LoadObjectEventPalette(u16 paletteTag) { - u16 i = FindEventObjectPaletteIndexByTag(paletteTag); + u16 i = FindObjectEventPaletteIndexByTag(paletteTag); if (i != EVENT_OBJ_PAL_TAG_NONE) // always true { - sub_808E8F4(&sEventObjectSpritePalettes[i]); + sub_808E8F4(&sObjectEventSpritePalettes[i]); } } -void Unused_LoadEventObjectPaletteSet(u16 *paletteTags) +void Unused_LoadObjectEventPaletteSet(u16 *paletteTags) { u8 i; for (i = 0; paletteTags[i] != EVENT_OBJ_PAL_TAG_NONE; i++) { - LoadEventObjectPalette(paletteTags[i]); + LoadObjectEventPalette(paletteTags[i]); } } @@ -2153,9 +2153,9 @@ static u8 sub_808E8F4(const struct SpritePalette *spritePalette) void PatchObjectPalette(u16 paletteTag, u8 paletteSlot) { - u8 paletteIndex = FindEventObjectPaletteIndexByTag(paletteTag); + u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag); - LoadPalette(sEventObjectSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); + LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20); } void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) @@ -2168,13 +2168,13 @@ void PatchObjectPaletteRange(const u16 *paletteTags, u8 minSlot, u8 maxSlot) } } -static u8 FindEventObjectPaletteIndexByTag(u16 tag) +static u8 FindObjectEventPaletteIndexByTag(u16 tag) { u8 i; - for (i = 0; sEventObjectSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) + for (i = 0; sObjectEventSpritePalettes[i].tag != EVENT_OBJ_PAL_TAG_NONE; i++) { - if (sEventObjectSpritePalettes[i].tag == tag) + if (sObjectEventSpritePalettes[i].tag == tag) { return i; } @@ -2218,65 +2218,65 @@ static void sub_808EAB0(u16 tag, u8 slot) PatchObjectPalette(tag, slot); } -void unref_sub_808EAC4(struct EventObject *eventObject, s16 x, s16 y) +void unref_sub_808EAC4(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x += x; - eventObject->currentCoords.y += y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x += x; + objectEvent->currentCoords.y += y; } -void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +void ShiftObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = eventObject->currentCoords.x; - eventObject->previousCoords.y = eventObject->currentCoords.y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = objectEvent->currentCoords.x; + objectEvent->previousCoords.y = objectEvent->currentCoords.y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -static void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y) +static void SetObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { - eventObject->previousCoords.x = x; - eventObject->previousCoords.y = y; - eventObject->currentCoords.x = x; - eventObject->currentCoords.y = y; + objectEvent->previousCoords.x = x; + objectEvent->previousCoords.y = y; + objectEvent->currentCoords.x = x; + objectEvent->currentCoords.y = y; } -void MoveEventObjectToMapCoords(struct EventObject *eventObject, s16 x, s16 y) +void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y) { struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - sprite = &gSprites[eventObject->spriteId]; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - SetEventObjectCoords(eventObject, x, y); - SetSpritePosToMapCoords(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); + sprite = &gSprites[objectEvent->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + SetObjectEventCoords(objectEvent, x, y); + SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(graphicsInfo->width >> 1); sprite->centerToCornerVecY = -(graphicsInfo->height >> 1); sprite->pos1.x += 8; sprite->pos1.y += 16 + sprite->centerToCornerVecY; - sub_808E38C(eventObject); - if (eventObject->trackedByCamera) + sub_808E38C(objectEvent); + if (objectEvent->trackedByCamera) CameraObjectReset1(); } -void TryMoveEventObjectToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) +void TryMoveObjectEventToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { x += 7; y += 7; - MoveEventObjectToMapCoords(&gEventObjects[eventObjectId], x, y); + MoveObjectEventToMapCoords(&gObjectEvents[objectEventId], x, y); } } -void ShiftStillEventObjectCoords(struct EventObject *eventObject) +void ShiftStillObjectEventCoords(struct ObjectEvent *objectEvent) { - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); } -void UpdateEventObjectCoordsForCameraUpdate(void) +void UpdateObjectEventCoordsForCameraUpdate(void) { u8 i; s16 dx; @@ -2288,28 +2288,28 @@ void UpdateEventObjectCoordsForCameraUpdate(void) dy = gCamera.y; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gEventObjects[i].active) + if (gObjectEvents[i].active) { - gEventObjects[i].initialCoords.x -= dx; - gEventObjects[i].initialCoords.y -= dy; - gEventObjects[i].currentCoords.x -= dx; - gEventObjects[i].currentCoords.y -= dy; - gEventObjects[i].previousCoords.x -= dx; - gEventObjects[i].previousCoords.y -= dy; + gObjectEvents[i].initialCoords.x -= dx; + gObjectEvents[i].initialCoords.y -= dy; + gObjectEvents[i].currentCoords.x -= dx; + gObjectEvents[i].currentCoords.y -= dy; + gObjectEvents[i].previousCoords.x -= dx; + gObjectEvents[i].previousCoords.y -= dy; } } } } -u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) +u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - 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; } @@ -2318,20 +2318,20 @@ u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z) return EVENT_OBJECTS_COUNT; } -static bool8 EventObjectDoesZCoordMatch(struct EventObject *eventObject, u8 z) +static bool8 ObjectEventDoesZCoordMatch(struct ObjectEvent *objectEvent, u8 z) { - if (eventObject->currentElevation != 0 && z != 0 && eventObject->currentElevation != z) + if (objectEvent->currentElevation != 0 && z != 0 && objectEvent->currentElevation != z) { return FALSE; } return TRUE; } -void UpdateEventObjectsForCameraUpdate(s16 x, s16 y) +void UpdateObjectEventsForCameraUpdate(s16 x, s16 y) { - UpdateEventObjectCoordsForCameraUpdate(); - TrySpawnEventObjects(x, y); - RemoveEventObjectsOutsideView(); + UpdateObjectEventCoordsForCameraUpdate(); + TrySpawnObjectEvents(x, y); + RemoveObjectEventsOutsideView(); } u8 AddCameraObject(u8 linkedSpriteId) @@ -2470,91 +2470,91 @@ u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority) return MAX_SPRITES; } -void SetEventObjectDirection(struct EventObject *eventObject, u8 direction) +void SetObjectEventDirection(struct ObjectEvent *objectEvent, u8 direction) { s8 d2; - eventObject->previousMovementDirection = eventObject->facingDirection; - if (!eventObject->facingDirectionLocked) + objectEvent->previousMovementDirection = objectEvent->facingDirection; + if (!objectEvent->facingDirectionLocked) { d2 = direction; - eventObject->facingDirection = d2; + objectEvent->facingDirection = d2; } - eventObject->movementDirection = direction; + objectEvent->movementDirection = direction; } -static const u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static const u8 *GetObjectEventScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->script; } -const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId) +const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId) { - return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventScriptPointerByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } -static u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static u16 GetObjectEventFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - return GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; + return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->flagId; } -static u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId) +static u16 GetObjectEventFlagIdByObjectEventId(u8 objectEventId) { - return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup); + return GetObjectEventFlagIdByLocalIdAndMap(gObjectEvents[objectEventId].localId, gObjectEvents[objectEventId].mapNum, gObjectEvents[objectEventId].mapGroup); } u8 sub_808F080(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { return 0xFF; } - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } -u8 sub_808F0BC(u8 eventObjectId) +u8 sub_808F0BC(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerType; + return gObjectEvents[objectEventId].trainerType; } u8 sub_808F0D4(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { return 0xFF; } - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -u8 EventObjectGetBerryTreeId(u8 eventObjectId) +u8 ObjectEventGetBerryTreeId(u8 objectEventId) { - return gEventObjects[eventObjectId].trainerRange_berryTreeId; + return gObjectEvents[objectEventId].trainerRange_berryTreeId; } -static struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) +static struct ObjectEventTemplate *GetObjectEventTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { - struct EventObjectTemplate *templates; + struct ObjectEventTemplate *templates; const struct MapHeader *mapHeader; u8 count; if (gSaveBlock1Ptr->location.mapNum == mapNum && gSaveBlock1Ptr->location.mapGroup == mapGroup) { - templates = gSaveBlock1Ptr->eventObjectTemplates; - count = gMapHeader.events->eventObjectCount; + templates = gSaveBlock1Ptr->objectEventTemplates; + count = gMapHeader.events->objectEventCount; } else { mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - templates = mapHeader->events->eventObjects; - count = mapHeader->events->eventObjectCount; + templates = mapHeader->events->objectEvents; + count = mapHeader->events->objectEventCount; } - return FindEventObjectTemplateByLocalId(localId, templates, count); + return FindObjectEventTemplateByLocalId(localId, templates, count); } -static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count) +static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, struct ObjectEventTemplate *templates, u8 count) { u8 i; @@ -2568,81 +2568,81 @@ static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, return NULL; } -struct EventObjectTemplate *GetBaseTemplateForEventObject(const struct EventObject *eventObject) +struct ObjectEventTemplate *GetBaseTemplateForObjectEvent(const struct ObjectEvent *objectEvent) { int i; - if (eventObject->mapNum != gSaveBlock1Ptr->location.mapNum || eventObject->mapGroup != gSaveBlock1Ptr->location.mapGroup) + if (objectEvent->mapNum != gSaveBlock1Ptr->location.mapNum || objectEvent->mapGroup != gSaveBlock1Ptr->location.mapGroup) { return NULL; } for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { - if (eventObject->localId == gSaveBlock1Ptr->eventObjectTemplates[i].localId) + if (objectEvent->localId == gSaveBlock1Ptr->objectEventTemplates[i].localId) { - return &gSaveBlock1Ptr->eventObjectTemplates[i]; + return &gSaveBlock1Ptr->objectEventTemplates[i]; } } return NULL; } -void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject) +void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate != NULL) + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate != NULL) { - eventObjectTemplate->x = eventObject->currentCoords.x - 7; - eventObjectTemplate->y = eventObject->currentCoords.y - 7; + objectEventTemplate->x = objectEvent->currentCoords.x - 7; + objectEventTemplate->y = objectEvent->currentCoords.y - 7; } } -static void OverrideEventObjectTemplateScript(const struct EventObject *eventObject, const u8 *script) +static void OverrideObjectEventTemplateScript(const struct ObjectEvent *objectEvent, const u8 *script) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate) - eventObjectTemplate->script = script; + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate) + objectEventTemplate->script = script; } -void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType) +void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType) { - struct EventObjectTemplate *eventObjectTemplate; + struct ObjectEventTemplate *objectEventTemplate; - eventObjectTemplate = GetBaseTemplateForEventObject(eventObject); - if (eventObjectTemplate != NULL) + objectEventTemplate = GetBaseTemplateForObjectEvent(objectEvent); + if (objectEventTemplate != NULL) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; } } -void TryOverrideEventObjectTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup) +void TryOverrideObjectEventTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) - OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]); + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) + OverrideTemplateCoordsForObjectEvent(&gObjectEvents[objectEventId]); } void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorationCategory) { - u8 eventObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { switch (decorationCategory) { case DECORCAT_DOLL: - OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_DollInteract); + OverrideObjectEventTemplateScript(&gObjectEvents[objectEventId], SecretBase_EventScript_DollInteract); break; case DECORCAT_CUSHION: - OverrideEventObjectTemplateScript(&gEventObjects[eventObjectId], SecretBase_EventScript_CushionInteract); + OverrideObjectEventTemplateScript(&gObjectEvents[objectEventId], SecretBase_EventScript_CushionInteract); break; } } } -void InitEventObjectPalettes(u8 palSlot) +void InitObjectEventPalettes(u8 palSlot) { FreeAndReserveObjectSpritePalettes(); sCurrentSpecialObjectPaletteTag = EVENT_OBJ_PAL_TAG_NONE; @@ -2679,23 +2679,23 @@ u16 GetObjectPaletteTag(u8 palSlot) movement_type_empty_callback(MovementType_None) movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround) -bool8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -2704,7 +2704,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)) { @@ -2714,40 +2714,40 @@ bool8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[4]; u8 chosenDirection; memcpy(directions, gStandardDirections, sizeof directions); chosenDirection = directions[Random() & 3]; - SetEventObjectDirection(eventObject, chosenDirection); + SetObjectEventDirection(objectEvent, chosenDirection); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, chosenDirection)) + if (GetCollisionInDirection(objectEvent, chosenDirection)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) +bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent) { s16 playerX; s16 playerY; @@ -2762,17 +2762,17 @@ bool8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject) { return FALSE; } - if (eventObject->trainerType != 1 && eventObject->trainerType != 3) + if (objectEvent->trainerType != 1 && objectEvent->trainerType != 3) { return FALSE; } PlayerGetDestCoords(&playerX, &playerY); - objX = eventObject->currentCoords.x; - objY = eventObject->currentCoords.y; - minX = objX - eventObject->trainerRange_berryTreeId; - minY = objY - eventObject->trainerRange_berryTreeId; - maxX = objX + eventObject->trainerRange_berryTreeId; - maxY = objY + eventObject->trainerRange_berryTreeId; + objX = objectEvent->currentCoords.x; + objY = objectEvent->currentCoords.y; + minX = objX - objectEvent->trainerRange_berryTreeId; + minY = objY - objectEvent->trainerRange_berryTreeId; + maxX = objX + objectEvent->trainerRange_berryTreeId; + maxY = objY + objectEvent->trainerRange_berryTreeId; if (minX > playerX || maxX < playerX || minY > playerY || maxY < playerY) { return FALSE; @@ -2971,18 +2971,18 @@ u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy) return direction; } -u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementType) +u8 TryGetTrainerEncounterDirection(struct ObjectEvent *objectEvent, u8 movementType) { s16 dx, dy; s16 absdx, absdy; - if (!EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (!ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { return 0; } PlayerGetDestCoords(&dx, &dy); - dx -= eventObject->currentCoords.x; - dy -= eventObject->currentCoords.y; + dx -= objectEvent->currentCoords.x; + dy -= objectEvent->currentCoords.y; absdx = dx; absdy = dy; if (absdx < 0) @@ -2998,34 +2998,34 @@ u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 movementT movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround) -bool8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3033,39 +3033,39 @@ bool8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Spri return FALSE; } -bool8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_LookAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gStandardDirections, sizeof directions); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == DIR_NONE) direction = directions[Random() & 3]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown) -bool8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -3074,7 +3074,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)) { @@ -3084,33 +3084,33 @@ bool8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction)) + if (GetCollisionInDirection(objectEvent, direction)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3118,23 +3118,23 @@ bool8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight) -bool8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (!EventObjectExecSingleMovementAction(eventObject, sprite)) + if (!ObjectEventExecSingleMovementAction(objectEvent, sprite)) { return FALSE; } @@ -3143,7 +3143,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)) { @@ -3153,33 +3153,33 @@ bool8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof directions); direction = directions[Random() & 1]; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 5; - if (GetCollisionInDirection(eventObject, direction)) + if (GetCollisionInDirection(objectEvent, direction)) sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection)); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 6; return TRUE; } -bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -3187,17 +3187,17 @@ bool8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, str movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection) -bool8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -3205,44 +3205,44 @@ bool8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDirection_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; return FALSE; } -static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite); -extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *eventObject, struct Sprite *sprite); +static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite); +extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *objectEvent, struct Sprite *sprite); void MovementType_BerryTreeGrowth(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; + objectEvent = &gObjectEvents[sprite->data[0]]; if (!(sprite->data[7] & 1)) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[7] |= 1; } - UpdateEventObjectCurrentMovement(eventObject, sprite, EventObjectCB2_BerryTree); + UpdateObjectEventCurrentMovement(objectEvent, sprite, ObjectEventCB2_BerryTree); } -static bool8 EventObjectCB2_BerryTree(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite); + return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](objectEvent, sprite); } -bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 berryStage; - ClearEventObjectMovement(eventObject, sprite); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + objectEvent->invisible = TRUE; sprite->invisible = TRUE; - berryStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId); + berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId); if (berryStage == 0) { if (!(sprite->data[7] & 4) && sprite->animNum == 4) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); @@ -3250,7 +3250,7 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct } return FALSE; } - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->invisible = FALSE; berryStage --; if (sprite->animNum != berryStage) @@ -3258,15 +3258,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; @@ -3274,28 +3274,28 @@ bool8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; sprite->data[2] = 0; sprite->data[7] |= 2; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE); return TRUE; } -bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = (sprite->data[2] & 0x02) >> 1; + objectEvent->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { - get_berry_tree_graphics(eventObject, sprite); + get_berry_tree_graphics(objectEvent, sprite); sprite->data[1] = 4; sprite->data[2] = 0; return TRUE; @@ -3303,10 +3303,10 @@ bool8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->data[2]++; - eventObject->invisible = (sprite->data[2] & 0x02) >> 1; + objectEvent->invisible = (sprite->data[2] & 0x02) >> 1; sprite->animPaused = TRUE; if (sprite->data[2] > 64) { @@ -3319,34 +3319,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; @@ -3354,51 +3354,51 @@ bool8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndDownDirections, sizeof gUpAndDownDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight) -bool8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3406,51 +3406,51 @@ bool8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gLeftAndRightDirections, sizeof gLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_EAST_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft) -bool8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3458,51 +3458,51 @@ bool8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndLeftDirections, sizeof gUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight) -bool8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3510,51 +3510,51 @@ bool8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gUpAndRightDirections, sizeof gUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_EAST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft) -bool8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3562,51 +3562,51 @@ bool8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndLeftDirections, sizeof gDownAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight) -bool8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3614,51 +3614,51 @@ bool8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[2]; memcpy(directions, gDownAndRightDirections, sizeof gDownAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 1]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft) -bool8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3666,51 +3666,51 @@ bool8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndLeftDirections, sizeof gDownUpAndLeftDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight) -bool8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3718,51 +3718,51 @@ bool8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownUpAndRightDirections, sizeof gDownUpAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_SOUTH_EAST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_SOUTH_EAST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceUpRightAndLeft, gMovementTypeFuncs_FaceUpLeftAndRight) -bool8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3770,51 +3770,51 @@ bool8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, str return FALSE; } -bool8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gUpLeftAndRightDirections, sizeof gUpLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_NORTH_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_NORTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_FaceDownRightAndLeft, gMovementTypeFuncs_FaceDownLeftAndRight) -bool8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]); - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 4; return TRUE; @@ -3822,34 +3822,34 @@ bool8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, s return FALSE; } -bool8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[4]; memcpy(directions, gDownLeftAndRightDirections, sizeof gDownLeftAndRightDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_SOUTH_EAST_WEST); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_SOUTH_EAST_WEST); if (direction == 0) { direction = directions[Random() & 3]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise) -bool8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3857,43 +3857,43 @@ bool8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gCounterclockwiseDirections, sizeof gCounterclockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise) -bool8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { SetMovementDelay(sprite, 48); sprite->data[1] = 2; @@ -3901,132 +3901,132 @@ bool8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject)) + if (WaitForMovementDelay(sprite) || ObjectEventIsTrainerAndCloseToPlayer(objectEvent)) { sprite->data[1] = 3; } return FALSE; } -bool8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RotateClockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; u8 directions[5]; memcpy(directions, gClockwiseDirections, sizeof gClockwiseDirections); - direction = TryGetTrainerEncounterDirection(eventObject, RUNFOLLOW_ANY); + direction = TryGetTrainerEncounterDirection(objectEvent, RUNFOLLOW_ANY); if (direction == 0) { - direction = directions[eventObject->facingDirection]; + direction = directions[objectEvent->facingDirection]; } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 0; return TRUE; } movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth) -bool8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 direction; - direction = gInitialMovementTypeFacingDirections[eventObject->movementType]; - if (eventObject->directionSequenceIndex) + direction = gInitialMovementTypeFacingDirections[objectEvent->movementType]; + if (objectEvent->directionSequenceIndex) { direction = GetOppositeDirection(direction); } - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool8 collision; u8 movementActionId; - if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); + objectEvent->directionSequenceIndex = 0; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); } - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); if (collision == COLLISION_OUTSIDE_RANGE) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collision) - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 3; return TRUE; } -bool8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); sprite->data[1] = 1; return TRUE; } -bool8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *route) +bool8 MoveNextDirectionInSequence(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 *route) { u8 collision; u8 movementActionId; - if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y) - eventObject->directionSequenceIndex = 0; + if (objectEvent->directionSequenceIndex == 3 && objectEvent->initialCoords.x == objectEvent->currentCoords.x && objectEvent->initialCoords.y == objectEvent->currentCoords.y) + objectEvent->directionSequenceIndex = 0; - SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + SetObjectEventDirection(objectEvent, route[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); if (collision == COLLISION_OUTSIDE_RANGE) { - eventObject->directionSequenceIndex++; - SetEventObjectDirection(eventObject, route[eventObject->directionSequenceIndex]); - movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection); - collision = GetCollisionInDirection(eventObject, eventObject->movementDirection); + objectEvent->directionSequenceIndex++; + SetObjectEventDirection(objectEvent, route[objectEvent->directionSequenceIndex]); + movementActionId = GetWalkNormalMovementAction(objectEvent->movementDirection); + collision = GetCollisionInDirection(objectEvent, objectEvent->movementDirection); } if (collision) - movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection); + movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection); - EventObjectSetSingleMovement(eventObject, sprite, movementActionId); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSequence_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; @@ -4034,579 +4034,579 @@ bool8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sp movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown) -u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpRightLeftDownDirections)]; memcpy(directions, gUpRightLeftDownDirections, sizeof(gUpRightLeftDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp) -u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightLeftDownUpDirections)]; memcpy(directions, gRightLeftDownUpDirections, sizeof(gRightLeftDownUpDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft) -u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownUpRightLeftDirections)]; memcpy(directions, gDownUpRightLeftDirections, sizeof(gDownUpRightLeftDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight) -u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftDownUpRightDirections)]; memcpy(directions, gLeftDownUpRightDirections, sizeof(gLeftDownUpRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown) -u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpLeftRightDownDirections)]; memcpy(directions, gUpLeftRightDownDirections, sizeof(gUpLeftRightDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp) -u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftRightDownUpDirections)]; memcpy(directions, gLeftRightDownUpDirections, sizeof(gLeftRightDownUpDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight) -u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gStandardDirections)]; memcpy(directions, gStandardDirections, sizeof(gStandardDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft) -u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightDownUpLeftDirections)]; memcpy(directions, gRightDownUpLeftDirections, sizeof(gRightDownUpLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight) -u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftUpDownRightDirections)]; memcpy(directions, gLeftUpDownRightDirections, sizeof(gLeftUpDownRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft) -u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpDownRightLeftDirections)]; memcpy(directions, gUpDownRightLeftDirections, sizeof(gUpDownRightLeftDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown) -u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightLeftUpDownDirections)]; memcpy(directions, gRightLeftUpDownDirections, sizeof(gRightLeftUpDownDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp) -u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownRightLeftUpDirections)]; memcpy(directions, gDownRightLeftUpDirections, sizeof(gDownRightLeftUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft) -u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightUpDownLeftDirections)]; memcpy(directions, gRightUpDownLeftDirections, sizeof(gRightUpDownLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight) -u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpDownLeftRightDirections)]; memcpy(directions, gUpDownLeftRightDirections, sizeof(gUpDownLeftRightDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown) -u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftRightUpDownDirections)]; memcpy(directions, gLeftRightUpDownDirections, sizeof(gLeftRightUpDownDirections)); - if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 1 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp) -u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownLeftRightUpDirections)]; memcpy(directions, gDownLeftRightUpDirections, sizeof(gDownLeftRightUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight) -u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpLeftDownRightDirections)]; memcpy(directions, gUpLeftDownRightDirections, sizeof(gUpLeftDownRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft) -u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownRightUpLeftDirections)]; memcpy(directions, gDownRightUpLeftDirections, sizeof(gDownRightUpLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp) -u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftDownRightUpDirections)]; memcpy(directions, gLeftDownRightUpDirections, sizeof(gLeftDownRightUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown) -u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightUpLeftDownDirections)]; memcpy(directions, gRightUpLeftDownDirections, sizeof(gRightUpLeftDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft) -u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gUpRightDownLeftDirections)]; memcpy(directions, gUpRightDownLeftDirections, sizeof(gUpRightDownLeftDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight) -u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gDownLeftUpRightDirections)]; memcpy(directions, gDownLeftUpRightDirections, sizeof(gDownLeftUpRightDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.y == objectEvent->currentCoords.y) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown) -u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gLeftUpRightDownDirections)]; memcpy(directions, gLeftUpRightDownDirections, sizeof(gLeftUpRightDownDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp) -u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 directions[sizeof(gRightDownLeftUpDirections)]; memcpy(directions, gRightDownLeftUpDirections, sizeof(gRightDownLeftUpDirections)); - if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x) + if (objectEvent->directionSequenceIndex == 2 && objectEvent->initialCoords.x == objectEvent->currentCoords.x) { - eventObject->directionSequenceIndex = 3; + objectEvent->directionSequenceIndex = 3; } - return MoveNextDirectionInSequence(eventObject, sprite, directions); + return MoveNextDirectionInSequence(objectEvent, sprite, directions); } movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer) -bool8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - if (eventObject->directionSequenceIndex == 0) + ClearObjectEventMovement(objectEvent, sprite); + if (objectEvent->directionSequenceIndex == 0) { - eventObject->directionSequenceIndex = GetPlayerFacingDirection(); + objectEvent->directionSequenceIndex = GetPlayerFacingDirection(); } sprite->data[1] = 1; return TRUE; } -bool8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), NULL); } -bool8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayer_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { - eventObject->singleMovementActive = 0; + objectEvent->singleMovementActive = 0; sprite->data[1] = 1; } return FALSE; } -bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_None(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { return FALSE; } -bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection))); - eventObject->singleMovementActive = 1; + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, playerDirection))); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - if (EventObjectIsFarawayIslandMew(eventObject)) + if (ObjectEventIsFarawayIslandMew(objectEvent)) { direction = GetMewMoveDirection(); if (direction == DIR_NONE) { direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); - eventObject->singleMovementActive = 1; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } } else { - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); } - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = 1; + objectEvent->singleMovementActive = 1; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkFastestMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetSlideMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 cph_IM_DIFFERENT(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction)); - eventObject->singleMovementActive = TRUE; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpInPlaceMovementAction(direction)); + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - EventObjectMoveDestCoords(eventObject, direction, &x, &y); - EventObjectSetSingleMovement(eventObject, sprite, GetJumpMovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + ObjectEventMoveDestCoords(objectEvent, direction, &x, &y); + ObjectEventSetSingleMovement(objectEvent, sprite, GetJumpMovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } -bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) +bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8)) { u32 direction; s16 x; s16 y; direction = playerDirection; - direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction); - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoordsInDirection(direction, &x, &y, 2, 2); - EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction)); - if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) + ObjectEventSetSingleMovement(objectEvent, sprite, GetJump2MovementAction(direction)); + if (GetCollisionAtCoords(objectEvent, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y)))) { - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction)); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction)); } - eventObject->singleMovementActive = TRUE; + objectEvent->singleMovementActive = TRUE; sprite->data[1] = 2; return TRUE; } movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass) -bool8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) + if (gObjectEvents[gPlayerAvatar.objectEventId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER) { return FALSE; } - return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); + return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](objectEvent, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass); } void MovementType_TreeDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } -static bool8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 MovementType_Disguise_Callback(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); + ClearObjectEventMovement(objectEvent, sprite); return FALSE; } void MovementType_MountainDisguise(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - eventObject = &gEventObjects[sprite->data[0]]; - if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && !sprite->data[7])) + objectEvent = &gObjectEvents[sprite->data[0]]; + if (objectEvent->directionSequenceIndex == 0 || (objectEvent->directionSequenceIndex == 1 && !sprite->data[7])) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); - eventObject->directionSequenceIndex = 1; + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); + objectEvent->directionSequenceIndex = 1; sprite->data[7]++; } - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, MovementType_Disguise_Callback); } void MovementType_Hidden(struct Sprite *sprite) { if (!sprite->data[7]) { - gEventObjects[sprite->data[0]].fixedPriority = TRUE; + gObjectEvents[sprite->data[0]].fixedPriority = TRUE; sprite->subspriteMode = 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; } @@ -4615,57 +4615,57 @@ bool8 MovementType_MoveInPlace_Step1(struct EventObject *eventObject, struct Spr movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace) -bool8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_WalkSlowlyInPlace, gMovementTypeFuncs_WalkSlowlyInPlace) -bool8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceSlowMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceSlowMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace) -bool8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_JogInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace) -bool8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_RunInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); sprite->data[1] = 1; return TRUE; } movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible) -bool8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - ClearEventObjectMovement(eventObject, sprite); - EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection)); - eventObject->invisible = TRUE; + ClearObjectEventMovement(objectEvent, sprite); + ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(objectEvent->facingDirection)); + objectEvent->invisible = TRUE; sprite->data[1] = 1; return TRUE; } -bool8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectExecSingleMovementAction(eventObject, sprite)) + if (ObjectEventExecSingleMovementAction(objectEvent, sprite)) { sprite->data[1] = 2; return TRUE; @@ -4673,18 +4673,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; } @@ -4777,11 +4777,11 @@ static const struct UnkStruct_085094AC *sub_8092A4C(const union AnimCmd *const * return NULL; } -void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void npc_apply_anim_looping(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { sprite->animNum = animNum; unk85094AC = sub_8092A4C(sprite->anims); @@ -4800,11 +4800,11 @@ void npc_apply_anim_looping(struct EventObject *eventObject, struct Sprite *spri } } -void obj_npc_animation_step(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum) +void obj_npc_animation_step(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { const struct UnkStruct_085094AC *unk85094AC; - if (!eventObject->inanimate) + if (!objectEvent->inanimate) { u8 animPos; @@ -4841,13 +4841,13 @@ u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2) return DIR_SOUTH; } -void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType) +void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType) { - eventObject->movementType = movementType; - eventObject->directionSequenceIndex = 0; - eventObject->playerCopyableMovement = 0; - gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType]; - gSprites[eventObject->spriteId].data[1] = 0; + objectEvent->movementType = movementType; + objectEvent->directionSequenceIndex = 0; + objectEvent->playerCopyableMovement = 0; + gSprites[objectEvent->spriteId].callback = sMovementTypeCallbacks[movementType]; + gSprites[objectEvent->spriteId].data[1] = 0; } u8 GetTrainerFacingDirectionMovementType(u8 direction) @@ -4855,67 +4855,67 @@ u8 GetTrainerFacingDirectionMovementType(u8 direction) return gTrainerFacingDirectionMovementTypes[direction]; } -static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction) +static u8 GetCollisionInDirection(struct ObjectEvent *objectEvent, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - return GetCollisionAtCoords(eventObject, x, y, direction); + return GetCollisionAtCoords(objectEvent, x, y, direction); } -u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dir) +u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir) { u8 direction = dir; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) return COLLISION_OUTSIDE_RANGE; - else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction)) + else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction)) return COLLISION_IMPASSABLE; - else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)) + else if (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction)) return COLLISION_IMPASSABLE; - else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + else if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) return COLLISION_ELEVATION_MISMATCH; - else if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + else if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) return COLLISION_EVENT_OBJECT; return COLLISION_NONE; } -u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { u8 flags = 0; - if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y)) + if (IsCoordOutsideObjectEventMovementRange(objectEvent, x, y)) flags |= 1; - if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))) + if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(objectEvent, x, y, direction) || (objectEvent->trackedByCamera && !CanCameraMoveInDirection(direction))) flags |= 2; - if (IsZCoordMismatchAt(eventObject->currentElevation, x, y)) + if (IsZCoordMismatchAt(objectEvent->currentElevation, x, y)) flags |= 4; - if (DoesObjectCollideWithObjectAt(eventObject, x, y)) + if (DoesObjectCollideWithObjectAt(objectEvent, x, y)) flags |= 8; return flags; } -static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y) +static bool8 IsCoordOutsideObjectEventMovementRange(struct ObjectEvent *objectEvent, s16 x, s16 y) { s16 left; s16 right; s16 top; s16 bottom; - if (eventObject->range.as_nybbles.x != 0) + if (objectEvent->range.as_nybbles.x != 0) { - left = eventObject->initialCoords.x - eventObject->range.as_nybbles.x; - right = eventObject->initialCoords.x + eventObject->range.as_nybbles.x; + left = objectEvent->initialCoords.x - objectEvent->range.as_nybbles.x; + right = objectEvent->initialCoords.x + objectEvent->range.as_nybbles.x; if (left > x || right < x) { return TRUE; } } - if (eventObject->range.as_nybbles.y != 0) + if (objectEvent->range.as_nybbles.y != 0) { - top = eventObject->initialCoords.y - eventObject->range.as_nybbles.y; - bottom = eventObject->initialCoords.y + eventObject->range.as_nybbles.y; + top = objectEvent->initialCoords.y - objectEvent->range.as_nybbles.y; + bottom = objectEvent->initialCoords.y + objectEvent->range.as_nybbles.y; if (top > y || bottom < y) { return TRUE; @@ -4924,9 +4924,9 @@ static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObj return FALSE; } -static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction) +static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction) { - if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior) + if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](objectEvent->currentMetatileBehavior) || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y))) { return TRUE; @@ -4934,19 +4934,19 @@ static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, return FALSE; } -static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y) +static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *objectEvent, s16 x, s16 y) { u8 i; - struct EventObject *curObject; + struct ObjectEvent *curObject; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - curObject = &gEventObjects[i]; - if (curObject->active && curObject != eventObject) + curObject = &gObjectEvents[i]; + if (curObject->active && curObject != objectEvent) { if ((curObject->currentCoords.x == x && curObject->currentCoords.y == y) || (curObject->previousCoords.x == x && curObject->previousCoords.y == y)) { - if (AreZCoordsCompatible(eventObject->currentElevation, curObject->currentElevation)) + if (AreZCoordsCompatible(objectEvent->currentElevation, curObject->currentElevation)) { return TRUE; } @@ -4958,10 +4958,10 @@ static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) - && gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) + && gSprites[gObjectEvents[objectEventId].spriteId].data[7] & 2) { return TRUE; } @@ -4971,11 +4971,11 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup) void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjectId; + u8 objectEventId; - if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)) { - gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 0x04; + gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 0x04; } } @@ -5041,7 +5041,7 @@ void sub_80930E0(s16 *x, s16 *y, s16 dx, s16 dy) *y += dy; } -static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) +static void GetObjectEventMovingCameraOffset(s16 *x, s16 *y) { *x = 0; *y = 0; @@ -5063,106 +5063,106 @@ static void GetEventObjectMovingCameraOffset(s16 *x, s16 *y) } } -void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y) +void ObjectEventMoveDestCoords(struct ObjectEvent *objectEvent, u32 direction, s16 *x, s16 *y) { u8 newDirn = direction; - *x = eventObject->currentCoords.x; - *y = eventObject->currentCoords.y; + *x = objectEvent->currentCoords.x; + *y = objectEvent->currentCoords.y; MoveCoords(newDirn, x, y); } -bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject) +bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent) { - if (eventObject->singleMovementActive || eventObject->heldMovementActive) + if (objectEvent->singleMovementActive || objectEvent->heldMovementActive) return TRUE; return FALSE; } -bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject) +bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive && eventObject->movementActionId != 0xFF) + if (objectEvent->heldMovementActive && objectEvent->movementActionId != 0xFF) return TRUE; return FALSE; } -bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - if (EventObjectIsMovementOverridden(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent)) return TRUE; - UnfreezeEventObject(eventObject); - eventObject->movementActionId = movementActionId; - eventObject->heldMovementActive = TRUE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[2] = 0; + UnfreezeObjectEvent(objectEvent); + objectEvent->movementActionId = movementActionId; + objectEvent->heldMovementActive = TRUE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[2] = 0; return FALSE; } -void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId) +void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId) { - EventObjectClearHeldMovementIfActive(eventObject); - EventObjectSetHeldMovement(eventObject, movementActionId); + ObjectEventClearHeldMovementIfActive(objectEvent); + ObjectEventSetHeldMovement(objectEvent, movementActionId); } -void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject) +void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - EventObjectClearHeldMovement(eventObject); + if (objectEvent->heldMovementActive) + ObjectEventClearHeldMovement(objectEvent); } -void EventObjectClearHeldMovement(struct EventObject *eventObject) +void ObjectEventClearHeldMovement(struct ObjectEvent *objectEvent) { - eventObject->movementActionId = 0xFF; - eventObject->heldMovementActive = FALSE; - eventObject->heldMovementFinished = FALSE; - gSprites[eventObject->spriteId].data[1] = 0; - gSprites[eventObject->spriteId].data[2] = 0; + objectEvent->movementActionId = 0xFF; + objectEvent->heldMovementActive = FALSE; + objectEvent->heldMovementFinished = FALSE; + gSprites[objectEvent->spriteId].data[1] = 0; + gSprites[objectEvent->spriteId].data[2] = 0; } -u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject) +u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->heldMovementFinished; + if (objectEvent->heldMovementActive) + return objectEvent->heldMovementFinished; return 16; } -u8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject) +u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *objectEvent) { - u8 heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject); + u8 heldMovementStatus = ObjectEventCheckHeldMovementStatus(objectEvent); if (heldMovementStatus != 0 && heldMovementStatus != 16) - EventObjectClearHeldMovementIfActive(eventObject); + ObjectEventClearHeldMovementIfActive(objectEvent); return heldMovementStatus; } -u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject) +u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive) - return eventObject->movementActionId; + if (objectEvent->heldMovementActive) + return objectEvent->movementActionId; return 0xFF; } -void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, bool8 (*callback)(struct EventObject *, struct Sprite *)) +void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 (*callback)(struct ObjectEvent *, struct Sprite *)) { - DoGroundEffects_OnSpawn(eventObject, sprite); - TryEnableEventObjectAnim(eventObject, sprite); - if (EventObjectIsHeldMovementActive(eventObject)) + DoGroundEffects_OnSpawn(objectEvent, sprite); + TryEnableObjectEventAnim(objectEvent, sprite); + if (ObjectEventIsHeldMovementActive(objectEvent)) { - EventObjectExecHeldMovementAction(eventObject, sprite); + ObjectEventExecHeldMovementAction(objectEvent, sprite); } - else if (!eventObject->frozen) + else if (!objectEvent->frozen) { - while (callback(eventObject, sprite)); + while (callback(objectEvent, sprite)); } - DoGroundEffects_OnBeginStep(eventObject, sprite); - DoGroundEffects_OnFinishStep(eventObject, sprite); - UpdateEventObjectSpriteAnimPause(eventObject, sprite); - UpdateEventObjectVisibility(eventObject, sprite); - EventObjectUpdateSubpriority(eventObject, sprite); + DoGroundEffects_OnBeginStep(objectEvent, sprite); + DoGroundEffects_OnFinishStep(objectEvent, sprite); + UpdateObjectEventSpriteAnimPause(objectEvent, sprite); + UpdateObjectEventVisibility(objectEvent, sprite); + ObjectEventUpdateSubpriority(objectEvent, sprite); } #define dirn_to_anim(name, table)\ @@ -5194,9 +5194,9 @@ dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActio dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions); dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions); -bool8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction) +bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction) { - return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); + return ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetOppositeDirection(direction))); } dirn_to_anim(GetAcroWheelieFaceDirectionMovementAction, gAcroWheelieFaceDirectionMovementActions); @@ -5243,154 +5243,154 @@ static u32 state_to_direction(u8 a0, u32 a1, u32 a2) return gUnknown_0850DC3F[a0 - 1][zffuOffset - 1]; } -static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static void ObjectEventExecHeldMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->heldMovementFinished = TRUE; + objectEvent->heldMovementFinished = TRUE; } } -static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite) +static bool8 ObjectEventExecSingleMovementAction(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite)) + if (gMovementActionFuncs[objectEvent->movementActionId][sprite->data[2]](objectEvent, sprite)) { - eventObject->movementActionId = 0xFF; + objectEvent->movementActionId = 0xFF; sprite->data[2] = 0; return TRUE; } return FALSE; } -static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 animId) +static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animId) { - eventObject->movementActionId = animId; + objectEvent->movementActionId = animId; sprite->data[2] = 0; } -static void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + obj_npc_animation_step(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_SOUTH); + FaceDirection(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_NORTH); + FaceDirection(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_WEST); + FaceDirection(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, DIR_EAST); + FaceDirection(objectEvent, sprite, DIR_EAST); return TRUE; } -void npc_apply_direction(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void npc_apply_direction(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); oamt_npc_ministep_reset(sprite, direction, speed); sprite->animPaused = FALSE; - if (gLockedAnimEventObjects != NULL && FindLockedEventObjectIndex(eventObject) != EVENT_OBJECTS_COUNT) + if (gLockedAnimObjectEvents != NULL && FindLockedObjectEventIndex(objectEvent) != EVENT_OBJECTS_COUNT) { sprite->animPaused = TRUE; } - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void do_go_anim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { u8 (*functions[ARRAY_COUNT(gUnknown_0850DEE8)])(u8); memcpy(functions, gUnknown_0850DEE8, sizeof gUnknown_0850DEE8); - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, functions[speed](eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + npc_apply_anim_looping(objectEvent, sprite, functions[speed](objectEvent->facingDirection)); } -void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void StartRunningAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - npc_apply_direction(eventObject, sprite, direction, 1); - npc_apply_anim_looping(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, 1); + npc_apply_anim_looping(objectEvent, sprite, GetRunningDirectionAnimNum(objectEvent->facingDirection)); } -bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite) +bool8 npc_obj_ministep_stop_on_arrival(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (obj_npc_ministep(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -void sub_8093AF0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8093AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { s16 x; s16 y; - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; - SetEventObjectDirection(eventObject, direction); + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; + SetObjectEventDirection(objectEvent, direction); MoveCoords(direction, &x, &y); - ShiftEventObjectCoords(eventObject, x, y); + ShiftObjectEventCoords(objectEvent, x, y); sub_80976DC(sprite, direction); sprite->animPaused = FALSE; - eventObject->triggerGroundEffectsOnMove = TRUE; + objectEvent->triggerGroundEffectsOnMove = TRUE; sprite->data[2] = 1; } -void sub_8093B60(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8093B60(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8093AF0(eventObject, sprite, direction); - npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + sub_8093AF0(objectEvent, sprite, direction); + npc_apply_anim_looping(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); } -bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite) +bool8 an_walk_any_2(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_80976EC(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTHWEST); - return MovementAction_WalkSlowDiagonalUpLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTHWEST); + return MovementAction_WalkSlowDiagonalUpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5398,15 +5398,15 @@ bool8 MovementAction_WalkSlowDiagonalUpLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTHEAST); - return MovementAction_WalkSlowDiagonalUpRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTHEAST); + return MovementAction_WalkSlowDiagonalUpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5414,15 +5414,15 @@ bool8 MovementAction_WalkSlowDiagonalUpRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTHWEST); - return MovementAction_WalkSlowDiagonalDownLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTHWEST); + return MovementAction_WalkSlowDiagonalDownLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5430,15 +5430,15 @@ bool8 MovementAction_WalkSlowDiagonalDownLeft_Step1(struct EventObject *eventObj return FALSE; } -bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTHEAST); - return MovementAction_WalkSlowDiagonalDownRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTHEAST); + return MovementAction_WalkSlowDiagonalDownRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5446,15 +5446,15 @@ bool8 MovementAction_WalkSlowDiagonalDownRight_Step1(struct EventObject *eventOb return FALSE; } -bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); - return MovementAction_WalkSlowDown_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); + return MovementAction_WalkSlowDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5462,15 +5462,15 @@ bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_NORTH); - return MovementAction_WalkSlowUp_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_NORTH); + return MovementAction_WalkSlowUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5478,15 +5478,15 @@ bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_WEST); - return MovementAction_WalkSlowLeft_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_WEST); + return MovementAction_WalkSlowLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5494,15 +5494,15 @@ bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_EAST); - return MovementAction_WalkSlowRight_Step1(eventObject, sprite); + sub_8093B60(objectEvent, sprite, DIR_EAST); + return MovementAction_WalkSlowRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkSlowRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5510,15 +5510,15 @@ bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTHWEST, 0); - return MovementAction_WalkNormalDiagonalUpLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTHWEST, 0); + return MovementAction_WalkNormalDiagonalUpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5526,15 +5526,15 @@ bool8 MovementAction_WalkNormalDiagonalUpLeft_Step1(struct EventObject *eventObj return FALSE; } -bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTHEAST, 0); - return MovementAction_WalkNormalDiagonalUpRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTHEAST, 0); + return MovementAction_WalkNormalDiagonalUpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5542,15 +5542,15 @@ bool8 MovementAction_WalkNormalDiagonalUpRight_Step1(struct EventObject *eventOb return FALSE; } -bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTHWEST, 0); - return MovementAction_WalkNormalDiagonalDownLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTHWEST, 0); + return MovementAction_WalkNormalDiagonalDownLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5558,15 +5558,15 @@ bool8 MovementAction_WalkNormalDiagonalDownLeft_Step1(struct EventObject *eventO return FALSE; } -bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTHEAST, 0); - return MovementAction_WalkNormalDiagonalDownRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTHEAST, 0); + return MovementAction_WalkNormalDiagonalDownRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5574,15 +5574,15 @@ bool8 MovementAction_WalkNormalDiagonalDownRight_Step1(struct EventObject *event return FALSE; } -bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 0); - return MovementAction_WalkNormalDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 0); + return MovementAction_WalkNormalDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5590,15 +5590,15 @@ bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 0); - return MovementAction_WalkNormalUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 0); + return MovementAction_WalkNormalUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5606,15 +5606,15 @@ bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 0); - return MovementAction_WalkNormalLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 0); + return MovementAction_WalkNormalLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5622,15 +5622,15 @@ bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 0); - return MovementAction_WalkNormalRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 0); + return MovementAction_WalkNormalRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkNormalRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5638,7 +5638,7 @@ bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, stru return FALSE; } -void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) +void sub_8093FC4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a5) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFBC)]; s16 x; @@ -5647,24 +5647,24 @@ void sub_8093FC4(struct EventObject *eventObject, struct Sprite *sprite, u8 dire memcpy(displacements, gUnknown_0850DFBC, sizeof gUnknown_0850DFBC); x = 0; y = 0; - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); MoveCoordsInDirection(direction, &x, &y, displacements[speed], displacements[speed]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); sub_809783C(sprite, direction, speed, a5); sprite->data[2] = 1; sprite->animPaused = 0; - eventObject->triggerGroundEffectsOnMove = 1; - eventObject->disableCoveringGroundEffects = 1; + objectEvent->triggerGroundEffectsOnMove = 1; + objectEvent->disableCoveringGroundEffects = 1; } -void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void maybe_shadow_1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); - npc_apply_anim_looping(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); - DoShadowFieldEffect(eventObject); + sub_8093FC4(objectEvent, sprite, direction, speed, a4); + npc_apply_anim_looping(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); + DoShadowFieldEffect(objectEvent); } -u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callback(struct Sprite *)) +u8 sub_80940C4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 callback(struct Sprite *)) { s16 displacements[ARRAY_COUNT(gUnknown_0850DFC2)]; s16 x; @@ -5677,125 +5677,125 @@ u8 sub_80940C4(struct EventObject *eventObject, struct Sprite *sprite, u8 callba { x = 0; y = 0; - MoveCoordsInDirection(eventObject->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); - ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y); - eventObject->triggerGroundEffectsOnMove = TRUE; - eventObject->disableCoveringGroundEffects = TRUE; + MoveCoordsInDirection(objectEvent->movementDirection, &x, &y, displacements[sprite->data[4]], displacements[sprite->data[4]]); + ShiftObjectEventCoords(objectEvent, objectEvent->currentCoords.x + x, objectEvent->currentCoords.y + y); + objectEvent->triggerGroundEffectsOnMove = TRUE; + objectEvent->disableCoveringGroundEffects = TRUE; } else if (result == 0xFF) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; - eventObject->landingJump = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; + objectEvent->landingJump = TRUE; sprite->animPaused = TRUE; } return result; } -u8 sub_8094188(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_8094188(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_80940C4(eventObject, sprite, sub_809785C); + return sub_80940C4(objectEvent, sprite, sub_809785C); } -u8 sub_809419C(struct EventObject *eventObject, struct Sprite *sprite) +u8 sub_809419C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - return sub_80940C4(eventObject, sprite, sub_80978E4); + return sub_80940C4(objectEvent, sprite, sub_80978E4); } -bool8 sub_80941B0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941B0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8094188(eventObject, sprite) == 0xFF) + if (sub_8094188(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941C8(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941C8(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_809419C(eventObject, sprite) == 0xFF) + if (sub_809419C(objectEvent, sprite) == 0xFF) { return TRUE; } return FALSE; } -bool8 sub_80941E0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80941E0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - switch (sub_8094188(eventObject, sprite)) + switch (sub_8094188(objectEvent, sprite)) { case 255: return TRUE; case 1: - SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection)); - obj_npc_animation_step(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection)); + SetObjectEventDirection(objectEvent, GetOppositeDirection(objectEvent->movementDirection)); + obj_npc_animation_step(objectEvent, sprite, GetMoveDirectionAnimNum(objectEvent->facingDirection)); default: return FALSE; } } -bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_Jump2Down_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_Jump2Down_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Down_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_Jump2Up_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_Jump2Up_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Up_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_Jump2Left_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_Jump2Left_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Left_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_Jump2Right_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_Jump2Right_Step1(objectEvent, sprite); } -bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Jump2Right_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } @@ -5809,7 +5809,7 @@ void sub_8094390(struct Sprite *sprite, u16 duration) sprite->data[3] = duration; } -bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5819,45 +5819,45 @@ bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite return FALSE; } -bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay1_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 1); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay2_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 2); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay4_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 4); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 8); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Delay16_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8094390(sprite, 16); - return MovementAction_Delay_Step1(eventObject, sprite); + return MovementAction_Delay_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_WalkFastDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_WalkFastDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -5865,15 +5865,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; @@ -5881,15 +5881,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; @@ -5897,15 +5897,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; @@ -5914,16 +5914,16 @@ bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct } -void sub_8094554(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) +void sub_8094554(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration) { - SetEventObjectDirection(eventObject, direction); - npc_apply_anim_looping(eventObject, sprite, animNum); + SetObjectEventDirection(objectEvent, direction); + npc_apply_anim_looping(objectEvent, sprite, animNum); sprite->animPaused = FALSE; sprite->data[2] = 1; sprite->data[3] = duration; } -bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (-- sprite->data[3] == 0) { @@ -5934,120 +5934,120 @@ bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlow_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->data[3] & 1) { sprite->animDelayCounter++; } - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); - return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32); + return MovementAction_WalkInPlaceSlow_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 2); - return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 2); + return MovementAction_RideWaterCurrentDown_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6055,15 +6055,15 @@ bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 2); - return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 2); + return MovementAction_RideWaterCurrentUp_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6071,15 +6071,15 @@ bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, s return FALSE; } -bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 2); - return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 2); + return MovementAction_RideWaterCurrentLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6087,15 +6087,15 @@ bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 2); - return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 2); + return MovementAction_RideWaterCurrentRight_Step1(objectEvent, sprite); } -bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RideWaterCurrentRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6103,15 +6103,15 @@ bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject return FALSE; } -bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 3); - return MovementAction_WalkFastestDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 3); + return MovementAction_WalkFastestDown_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6119,15 +6119,15 @@ bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 3); - return MovementAction_WalkFastestUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 3); + return MovementAction_WalkFastestUp_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6135,15 +6135,15 @@ bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 3); - return MovementAction_WalkFastestLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 3); + return MovementAction_WalkFastestLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6151,15 +6151,15 @@ bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, stru return FALSE; } -bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 3); - return MovementAction_WalkFastestRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 3); + return MovementAction_WalkFastestRight_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkFastestRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6167,15 +6167,15 @@ bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, str return FALSE; } -bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_SOUTH, 4); - return MovementAction_SlideDown_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_SOUTH, 4); + return MovementAction_SlideDown_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6183,15 +6183,15 @@ bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_NORTH, 4); - return MovementAction_SlideUp_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_NORTH, 4); + return MovementAction_SlideUp_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6199,15 +6199,15 @@ bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 4); - return MovementAction_SlideLeft_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_WEST, 4); + return MovementAction_SlideLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6215,15 +6215,15 @@ bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Spr return FALSE; } -bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 4); - return MovementAction_SlideRight_Step1(eventObject, sprite); + do_go_anim(objectEvent, sprite, DIR_EAST, 4); + return MovementAction_SlideRight_Step1(objectEvent, sprite); } -bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SlideRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6231,15 +6231,15 @@ bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sp return FALSE; } -bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_SOUTH); - return MovementAction_PlayerRunDown_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_SOUTH); + return MovementAction_PlayerRunDown_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6247,15 +6247,15 @@ bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_NORTH); - return MovementAction_PlayerRunUp_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_NORTH); + return MovementAction_PlayerRunUp_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6263,15 +6263,15 @@ bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct S return FALSE; } -bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_WEST); - return MovementAction_PlayerRunLeft_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_WEST); + return MovementAction_PlayerRunLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6279,15 +6279,15 @@ bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct return FALSE; } -bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartRunningAnim(eventObject, sprite, DIR_EAST); - return MovementAction_PlayerRunRight_Step1(eventObject, sprite); + StartRunningAnim(objectEvent, sprite, DIR_EAST); + return MovementAction_PlayerRunRight_Step1(objectEvent, sprite); } -bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PlayerRunRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -6295,20 +6295,20 @@ bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struc return FALSE; } -void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum) +void StartSpriteAnimInDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum) { SetAndStartSpriteAnim(sprite, animNum, 0); - SetEventObjectDirection(eventObject, direction); + SetObjectEventDirection(objectEvent, direction); sprite->data[2] = 1; } -bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StartAnimInDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum); + StartSpriteAnimInDirection(objectEvent, sprite, objectEvent->movementDirection, sprite->animNum); return FALSE; } -bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WaitSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (SpriteAnimEnded(sprite)) { @@ -6318,420 +6318,420 @@ bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Spri return FALSE; } -void sub_8094DE4(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +void sub_8094DE4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - sub_8093FC4(eventObject, sprite, direction, 1, 0); + sub_8093FC4(objectEvent, sprite, direction, 1, 0); StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction)); } -bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_SOUTH); - return MovementAction_JumpSpecialDown_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_SOUTH); + return MovementAction_JumpSpecialDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_NORTH); - return MovementAction_JumpSpecialUp_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_NORTH); + return MovementAction_JumpSpecialUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_WEST); - return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_WEST); + return MovementAction_JumpSpecialLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094DE4(eventObject, sprite, DIR_EAST); - return MovementAction_JumpSpecialRight_Step1(eventObject, sprite); + sub_8094DE4(objectEvent, sprite, DIR_EAST); + return MovementAction_JumpSpecialRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpSpecialRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941C8(eventObject, sprite)) + if (sub_80941C8(objectEvent, sprite)) { sprite->data[2] = 2; - eventObject->landingJump = FALSE; + objectEvent->landingJump = FALSE; return TRUE; } return FALSE; } -bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)); + FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 playerObjectId; - if (!TryGetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) + if (!TryGetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0, &playerObjectId)) { - FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y))); + FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y))); } sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_LockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = TRUE; + objectEvent->facingDirectionLocked = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnlockFacingDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->facingDirectionLocked = FALSE; + objectEvent->facingDirectionLocked = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2); - return MovementAction_JumpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 1, 2); + return MovementAction_JumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2); - return MovementAction_JumpUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 1, 2); + return MovementAction_JumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2); - return MovementAction_JumpLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 1, 2); + return MovementAction_JumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2); - return MovementAction_JumpRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 1, 2); + return MovementAction_JumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0); - return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 0); + return MovementAction_JumpInPlaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0); - return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 0); + return MovementAction_JumpInPlaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0); - return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 0); + return MovementAction_JumpInPlaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0); - return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 0); + return MovementAction_JumpInPlaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2); - return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_SOUTH, 0, 2); + return MovementAction_JumpInPlaceDownUp_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2); - return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_NORTH, 0, 2); + return MovementAction_JumpInPlaceUpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2); - return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_WEST, 0, 2); + return MovementAction_JumpInPlaceLeftRight_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2); - return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite); + maybe_shadow_1(objectEvent, sprite, DIR_EAST, 0, 2); + return MovementAction_JumpInPlaceRightLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941E0(eventObject, sprite)) + if (sub_80941E0(objectEvent, sprite)) { - eventObject->hasShadow = 0; + objectEvent->hasShadow = 0; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]); + FaceDirection(objectEvent, sprite, gInitialMovementTypeFacingDirections[objectEvent->movementType]); return TRUE; } -bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, 0x14); return FALSE; } -bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = FALSE; + objectEvent->disableJumpLandingGroundEffect = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->disableJumpLandingGroundEffect = TRUE; + objectEvent->disableJumpLandingGroundEffect = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DisableAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = TRUE; + objectEvent->inanimate = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RestoreAnimation_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetInvisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_SetVisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteExclamationMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteQuestionMark_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_QUESTION_MARK_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_EmoteHeart_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN) + if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN) { - sub_80B4578(eventObject); + sub_80B4578(objectEvent); return FALSE; } - if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) + if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE) { sprite->data[2] = 2; return TRUE; } - sub_8155D78(eventObject); + sub_8155D78(objectEvent); sprite->data[2] = 1; - return MovementAction_RevealTrainer_Step1(eventObject, sprite); + return MovementAction_RevealTrainer_Step1(objectEvent, sprite); } -bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8155DA0(eventObject)) + if (sub_8155DA0(objectEvent)) { sprite->data[2] = 2; return TRUE; @@ -6739,14 +6739,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)) { @@ -6756,25 +6756,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)) { @@ -6784,32 +6784,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); @@ -6818,7 +6818,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; @@ -6826,29 +6826,29 @@ bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, stru return TRUE; } -bool8 MovementAction_HideReflection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_HideReflection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->hideReflection = TRUE; + objectEvent->hideReflection = TRUE; return TRUE; } -bool8 MovementAction_ShowReflection_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_ShowReflection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - eventObject->hideReflection = FALSE; + objectEvent->hideReflection = FALSE; return TRUE; } -bool8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = FALSE; StartSpriteAffineAnimIfDifferent(sprite, 0); - return MovementAction_WalkDownStartAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownStartAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownStartAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6857,17 +6857,17 @@ bool8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_WalkDownAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8093B60(eventObject, sprite, DIR_SOUTH); + sub_8093B60(objectEvent, sprite, DIR_SOUTH); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 1); - return MovementAction_WalkDownAffine_Step1(eventObject, sprite); + return MovementAction_WalkDownAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkDownAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (an_walk_any_2(eventObject, sprite)) + if (an_walk_any_2(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6876,17 +6876,17 @@ bool8 MovementAction_WalkDownAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkLeftAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkLeftAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_WEST, 1); + do_go_anim(objectEvent, sprite, DIR_WEST, 1); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 2); - return MovementAction_WalkLeftAffine_Step1(eventObject, sprite); + return MovementAction_WalkLeftAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkLeftAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6895,17 +6895,17 @@ bool8 MovementAction_WalkLeftAffine_Step1(struct EventObject *eventObject, struc return FALSE; } -bool8 MovementAction_WalkRightAffine_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkRightAffine_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - do_go_anim(eventObject, sprite, DIR_EAST, 1); + do_go_anim(objectEvent, sprite, DIR_EAST, 1); sprite->affineAnimPaused = FALSE; ChangeSpriteAffineAnimIfDifferent(sprite, 3); - return MovementAction_WalkRightAffine_Step1(eventObject, sprite); + return MovementAction_WalkRightAffine_Step1(objectEvent, sprite); } -bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_WalkRightAffine_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->affineAnimPaused = TRUE; sprite->data[2] = 2; @@ -6914,139 +6914,139 @@ bool8 MovementAction_WalkRightAffine_Step1(struct EventObject *eventObject, stru return FALSE; } -static void sub_80958C0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction) +static void sub_80958C0(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction) { - SetEventObjectDirection(eventObject, direction); - ShiftStillEventObjectCoords(eventObject); - obj_npc_animation_step(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); + SetObjectEventDirection(objectEvent, direction); + ShiftStillObjectEventCoords(objectEvent); + obj_npc_animation_step(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(direction)); sprite->animPaused = TRUE; sprite->data[2] = 1; } -bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_SOUTH); + sub_80958C0(objectEvent, sprite, DIR_SOUTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_NORTH); + sub_80958C0(objectEvent, sprite, DIR_NORTH); return TRUE; } -bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_WEST); + sub_80958C0(objectEvent, sprite, DIR_WEST); return TRUE; } -bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80958C0(eventObject, sprite, DIR_EAST); + sub_80958C0(objectEvent, sprite, DIR_EAST); return TRUE; } -bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH)); return FALSE; } -bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST)); return FALSE; } -bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_UnusedAcroActionRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST)); return FALSE; } -void sub_8095AF0(struct EventObject *eventObject, struct Sprite *sprite) +void sub_8095AF0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sub_8097750(sprite); sprite->animPaused = FALSE; } -bool8 sub_8095B0C(struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8095B0C(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sub_8097758(sprite)) { - ShiftStillEventObjectCoords(eventObject); - eventObject->triggerGroundEffectsOnStop = TRUE; + ShiftStillObjectEventCoords(objectEvent); + objectEvent->triggerGroundEffectsOnStop = TRUE; sprite->animPaused = TRUE; return TRUE; } return FALSE; } -bool8 MovementAction_Figure8_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095AF0(eventObject, sprite); + sub_8095AF0(objectEvent, sprite); sprite->data[2] = 1; - return MovementAction_Figure8_Step1(eventObject, sprite); + return MovementAction_Figure8_Step1(objectEvent, sprite); } -bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Figure8_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_8095B0C(eventObject, sprite)) + if (sub_8095B0C(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7054,257 +7054,257 @@ bool8 MovementAction_Figure8_Step1(struct EventObject *eventObject, struct Sprit return FALSE; } -void sub_8095B84(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) +void sub_8095B84(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed, u8 a4) { - sub_8093FC4(eventObject, sprite, direction, speed, a4); + sub_8093FC4(objectEvent, sprite, direction, speed, a4); StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction)); - DoShadowFieldEffect(eventObject); + DoShadowFieldEffect(objectEvent); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 0, 1); - return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 0, 1); + return MovementAction_AcroWheelieHopFaceDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 0, 1); - return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 0, 1); + return MovementAction_AcroWheelieHopFaceUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 0, 1); - return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 0, 1); + return MovementAction_AcroWheelieHopFaceLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 0, 1); - return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 0, 1); + return MovementAction_AcroWheelieHopFaceRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 1, 1); - return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 1, 1); + return MovementAction_AcroWheelieHopDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 1, 1); - return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 1, 1); + return MovementAction_AcroWheelieHopUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 1, 1); - return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 1, 1); + return MovementAction_AcroWheelieHopLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 1, 1); - return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 1, 1); + return MovementAction_AcroWheelieHopRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieHopRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_SOUTH, 2, 0); - return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_SOUTH, 2, 0); + return MovementAction_AcroWheelieJumpDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_NORTH, 2, 0); - return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_NORTH, 2, 0); + return MovementAction_AcroWheelieJumpUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_WEST, 2, 0); - return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_WEST, 2, 0); + return MovementAction_AcroWheelieJumpLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8095B84(eventObject, sprite, DIR_EAST, 2, 0); - return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite); + sub_8095B84(objectEvent, sprite, DIR_EAST, 2, 0); + return MovementAction_AcroWheelieJumpRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieJumpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (sub_80941B0(eventObject, sprite)) + if (sub_80941B0(objectEvent, sprite)) { - eventObject->hasShadow = FALSE; + objectEvent->hasShadow = FALSE; sprite->data[2] = 2; return TRUE; } return FALSE; } -bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8094554(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); - return MovementAction_WalkInPlace_Step1(eventObject, sprite); + sub_8094554(objectEvent, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8); + return MovementAction_WalkInPlace_Step1(objectEvent, sprite); } -void sub_80960C8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_80960C8(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroPopWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7312,15 +7312,15 @@ bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroPopWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7328,15 +7328,15 @@ bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroPopWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7344,15 +7344,15 @@ bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_80960C8(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite); + sub_80960C8(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroPopWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7360,21 +7360,21 @@ bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -void sub_8096200(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096200(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - npc_apply_anim_looping(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + npc_apply_anim_looping(objectEvent, sprite, GetAcroWheeliePedalDirectionAnimNum(objectEvent->facingDirection)); } -bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7382,15 +7382,15 @@ bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7398,15 +7398,15 @@ bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, st return FALSE; } -bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7414,15 +7414,15 @@ bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096200(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite); + sub_8096200(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7430,22 +7430,22 @@ bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, return FALSE; } -void sub_8096330(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 speed) +void sub_8096330(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 speed) { - npc_apply_direction(eventObject, sprite, direction, speed); - StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection)); + npc_apply_direction(objectEvent, sprite, direction, speed); + StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(objectEvent->facingDirection)); SeekSpriteAnim(sprite, 0); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_SOUTH, 1); - return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_SOUTH, 1); + return MovementAction_AcroEndWheelieMoveDown_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7453,15 +7453,15 @@ bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_NORTH, 1); - return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_NORTH, 1); + return MovementAction_AcroEndWheelieMoveUp_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7469,15 +7469,15 @@ bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_WEST, 1); - return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_WEST, 1); + return MovementAction_AcroEndWheelieMoveLeft_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7485,15 +7485,15 @@ bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObjec return FALSE; } -bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096330(eventObject, sprite, DIR_EAST, 1); - return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite); + sub_8096330(objectEvent, sprite, DIR_EAST, 1); + return MovementAction_AcroEndWheelieMoveRight_Step1(objectEvent, sprite); } -bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (npc_obj_ministep_stop_on_arrival(eventObject, sprite)) + if (npc_obj_ministep_stop_on_arrival(objectEvent, sprite)) { sprite->data[2] = 2; return TRUE; @@ -7501,75 +7501,75 @@ bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObje return FALSE; } -bool8 MovementAction_Levitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_Levitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - CreateLevitateMovementTask(eventObject); + CreateLevitateMovementTask(objectEvent); sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_StopLevitate_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_StopLevitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - DestroyExtraMovementTask(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(objectEvent->warpArrowSpriteId); sprite->pos2.y = 0; sprite->data[2] = 1; return TRUE; } -bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_DestroyExtraTaskIfAtTop_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (sprite->pos2.y == 0) { - DestroyExtraMovementTask(eventObject->warpArrowSpriteId); + DestroyExtraMovementTask(objectEvent->warpArrowSpriteId); sprite->data[2] = 1; return TRUE; } return FALSE; } -u8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } -bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite) +bool8 MovementAction_PauseSpriteAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->animPaused = TRUE; return TRUE; } -static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventSpriteAnimPause(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->disableAnim) + if (objectEvent->disableAnim) { sprite->animPaused = TRUE; } } -static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void TryEnableObjectEventAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (eventObject->enableAnim) + if (objectEvent->enableAnim) { sprite->animPaused = FALSE; - eventObject->disableAnim = FALSE; - eventObject->enableAnim = FALSE; + objectEvent->disableAnim = FALSE; + objectEvent->enableAnim = FALSE; } } -static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateObjectEventVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - sub_8096530(eventObject, sprite); - UpdateEventObjSpriteVisibility(eventObject, sprite); + sub_8096530(objectEvent, sprite); + UpdateEventObjSpriteVisibility(objectEvent, sprite); } -static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) +static void sub_8096530(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u16 x, y; u16 x2, y2; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObject->offScreen = FALSE; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + objectEvent->offScreen = FALSE; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (sprite->coordOffsetEnabled) { x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; @@ -7586,221 +7586,221 @@ static void sub_8096530(struct EventObject *eventObject, struct Sprite *sprite) y2 += graphicsInfo->height; if ((s16)x >= 0x100 || (s16)x2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } if ((s16)y >= 0xB0 || (s16)y2 < -0x10) { - eventObject->offScreen = TRUE; + objectEvent->offScreen = TRUE; } } -static void UpdateEventObjSpriteVisibility(struct EventObject *eventObject, struct Sprite *sprite) +static void UpdateEventObjSpriteVisibility(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->invisible = FALSE; - if (eventObject->invisible || eventObject->offScreen) + if (objectEvent->invisible || objectEvent->offScreen) { sprite->invisible = TRUE; } } -static void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_LongGrassOnSpawn(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_Reflection(eventObj, flags); - GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags); - GetGroundEffectFlags_Tracks(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_Reflection(objEvent, flags); + GetGroundEffectFlags_TallGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_LongGrassOnBeginStep(objEvent, flags); + GetGroundEffectFlags_Tracks(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); } -static void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags) +static void GetAllGroundEffectFlags_OnFinishStep(struct ObjectEvent *objEvent, u32 *flags) { - EventObjectUpdateMetatileBehaviors(eventObj); - GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags); - GetGroundEffectFlags_SandHeap(eventObj, flags); - GetGroundEffectFlags_Puddle(eventObj, flags); - GetGroundEffectFlags_Ripple(eventObj, flags); - GetGroundEffectFlags_ShortGrass(eventObj, flags); - GetGroundEffectFlags_HotSprings(eventObj, flags); - GetGroundEffectFlags_Seaweed(eventObj, flags); - GetGroundEffectFlags_JumpLanding(eventObj, flags); + ObjectEventUpdateMetatileBehaviors(objEvent); + GetGroundEffectFlags_ShallowFlowingWater(objEvent, flags); + GetGroundEffectFlags_SandHeap(objEvent, flags); + GetGroundEffectFlags_Puddle(objEvent, flags); + GetGroundEffectFlags_Ripple(objEvent, flags); + GetGroundEffectFlags_ShortGrass(objEvent, flags); + GetGroundEffectFlags_HotSprings(objEvent, flags); + GetGroundEffectFlags_Seaweed(objEvent, flags); + GetGroundEffectFlags_JumpLanding(objEvent, flags); } -static void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj) +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *objEvent) { - eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y); - eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y); + objEvent->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->previousCoords.x, objEvent->previousCoords.y); + objEvent->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(objEvent->currentCoords.x, objEvent->currentCoords.y); } -static void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *flags) { u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; - u8 type = EventObjectCheckForReflectiveSurface(eventObj); + u8 type = ObjectEventCheckForReflectiveSurface(objEvent); if (type) { - if (!eventObj->hasReflection) + if (!objEvent->hasReflection) { - eventObj->hasReflection = 0; - eventObj->hasReflection = 1; + objEvent->hasReflection = 0; + objEvent->hasReflection = 1; *flags |= reflectionFlags[type - 1]; } } else { - eventObj->hasReflection = 0; + objEvent->hasReflection = 0; } } -static void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN; } -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsLongGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE; } -static void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_DEEP_SAND; } - else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior) - || MetatileBehavior_IsFootprints(eventObj->previousMetatileBehavior)) + else if (MetatileBehavior_IsSandOrDeepSand(objEvent->previousMetatileBehavior) + || MetatileBehavior_IsFootprints(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_SAND; } } -static void GetGroundEffectFlags_SandHeap(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsDeepSand(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsDeepSand(objEvent->previousMetatileBehavior)) { - if (!eventObj->inSandPile) + if (!objEvent->inSandPile) { - eventObj->inSandPile = 0; - eventObj->inSandPile = 1; + objEvent->inSandPile = 0; + objEvent->inSandPile = 1; *flags |= GROUND_EFFECT_FLAG_SAND_PILE; } } else { - eventObj->inSandPile = 0; + objEvent->inSandPile = 0; } } -static void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *objEvent, u32 *flags) { - if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior)) - || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior))) + if ((MetatileBehavior_IsShallowFlowingWater(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShallowFlowingWater(objEvent->previousMetatileBehavior)) + || (MetatileBehavior_IsPacifidlogLog(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPacifidlogLog(objEvent->previousMetatileBehavior))) { - if (!eventObj->inShallowFlowingWater) + if (!objEvent->inShallowFlowingWater) { - eventObj->inShallowFlowingWater = 0; - eventObj->inShallowFlowingWater = 1; + objEvent->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 1; *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER; } } else { - eventObj->inShallowFlowingWater = 0; + objEvent->inShallowFlowingWater = 0; } } -static void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsPuddle(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsPuddle(objEvent->previousMetatileBehavior)) { *flags |= GROUND_EFFECT_FLAG_PUDDLE; } } -static void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_HasRipples(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_RIPPLES; } -static void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsShortGrass(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsShortGrass(objEvent->previousMetatileBehavior)) { - if (!eventObj->inShortGrass) + if (!objEvent->inShortGrass) { - eventObj->inShortGrass = 0; - eventObj->inShortGrass = 1; + objEvent->inShortGrass = 0; + objEvent->inShortGrass = 1; *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS; } } else { - eventObj->inShortGrass = 0; + objEvent->inShortGrass = 0; } } -static void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior) - && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior)) + if (MetatileBehavior_IsHotSprings(objEvent->currentMetatileBehavior) + && MetatileBehavior_IsHotSprings(objEvent->previousMetatileBehavior)) { - if (!eventObj->inHotSprings) + if (!objEvent->inHotSprings) { - eventObj->inHotSprings = 0; - eventObj->inHotSprings = 1; + objEvent->inHotSprings = 0; + objEvent->inHotSprings = 1; *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS; } } else { - eventObj->inHotSprings = 0; + objEvent->inHotSprings = 0; } } -static void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior)) + if (MetatileBehavior_IsSeaweed(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_SEAWEED; } -static void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags) +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 *flags) { typedef bool8 (*MetatileFunc)(u8); @@ -7822,13 +7822,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; @@ -7837,9 +7837,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; @@ -7858,14 +7858,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; @@ -7909,20 +7909,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; } @@ -7948,54 +7948,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) @@ -8008,12 +8008,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) @@ -8027,96 +8027,96 @@ bool8 AreZCoordsCompatible(u8 a, u8 b) return TRUE; } -void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_StepOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_TALL_GRASS); } -void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SpawnOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 1; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_StepOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; - gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum; - gFieldEffectArguments[5] = eventObj->mapGroup; + gFieldEffectArguments[4] = (objEvent->localId << 8) | objEvent->mapNum; + gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[7] = 0; FieldEffectStart(FLDEFF_LONG_GRASS); } -void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_WaterReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(eventObj, sprite, 0); + SetUpReflection(objEvent, sprite, 0); } -void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_IceReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(eventObj, sprite, 1); + SetUpReflection(objEvent, sprite, 1); } -void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_FlowingWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_FEET_IN_FLOWING_WATER, objEvent); } -static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = { +static void (*const sGroundEffectTracksFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) = { DoTracksGroundEffect_None, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks, }; -void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 0); } -void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_DeepSandTracks(struct ObjectEvent *objEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId); - sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1); + const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); + sGroundEffectTracksFuncs[info->tracks](objEvent, sprite, 1); } -static void DoTracksGroundEffect_None(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_None(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { } -static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a) +static void DoTracksGroundEffect_Footprints(struct ObjectEvent *objEvent, struct Sprite *sprite, u8 a) { // First half-word is a Field Effect script id. (gFieldEffectScriptPointers) u16 sandFootprints_FieldEffectData[2] = { @@ -8124,15 +8124,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 @@ -8147,108 +8147,108 @@ static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, st 6, 7, 3, 4, }; - if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y) + if (objEvent->currentCoords.x != objEvent->previousCoords.x || objEvent->currentCoords.y != objEvent->previousCoords.y) { - gFieldEffectArguments[0] = eventObj->previousCoords.x; - gFieldEffectArguments[1] = eventObj->previousCoords.y; + gFieldEffectArguments[0] = objEvent->previousCoords.x; + gFieldEffectArguments[1] = objEvent->previousCoords.y; gFieldEffectArguments[2] = 149; gFieldEffectArguments[3] = 2; gFieldEffectArguments[4] = - bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5]; + bikeTireTracks_Transitions[objEvent->previousMovementDirection][objEvent->facingDirection - 5]; FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS); } } -void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Ripple(struct ObjectEvent *objEvent, struct Sprite *sprite) { - DoRippleFieldEffect(eventObj, sprite); + DoRippleFieldEffect(objEvent, sprite); } -void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_StepOnPuddle(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SPLASH, objEvent); } -void GroundEffect_SandHeap(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_SandHeap(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SAND_PILE, objEvent); } -void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { u8 spriteId; - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_TALL_GRASS); spriteId = FindTallGrassFieldEffectSpriteId( - eventObj->localId, - eventObj->mapNum, - eventObj->mapGroup, - eventObj->currentCoords.x, - eventObj->currentCoords.y); + objEvent->localId, + objEvent->mapNum, + objEvent->mapGroup, + objEvent->currentCoords.x, + objEvent->currentCoords.y); if (spriteId == MAX_SPRITES) - GroundEffect_SpawnOnTallGrass(eventObj, sprite); + GroundEffect_SpawnOnTallGrass(objEvent, sprite); } -void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = 2; FieldEffectStart(FLDEFF_JUMP_LONG_GRASS); } -void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnShallowWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH); } -void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpOnWater(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH); } -void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_JumpLandingDust(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = eventObj->previousElevation; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_DUST); } -void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_ShortGrass(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_SHORT_GRASS, objEvent); } -void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_HotSprings(struct ObjectEvent *objEvent, struct Sprite *sprite) { - StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj); + StartFieldEffectForObjectEvent(FLDEFF_HOT_SPRINGS_WATER, objEvent); } -void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite) +void GroundEffect_Seaweed(struct ObjectEvent *objEvent, struct Sprite *sprite) { - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; FieldEffectStart(FLDEFF_BUBBLES); } -static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = { +static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct Sprite *sprite) = { GroundEffect_SpawnOnTallGrass, GroundEffect_StepOnTallGrass, GroundEffect_SpawnOnLongGrass, @@ -8271,26 +8271,26 @@ static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct S GroundEffect_Seaweed }; -static void DoFlaggedGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags) +static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *sprite, u32 flags) { u8 i; - if (EventObjectIsFarawayIslandMew(eventObj) == TRUE && !sub_81D4A58(eventObj)) + if (ObjectEventIsFarawayIslandMew(objEvent) == TRUE && !sub_81D4A58(objEvent)) return; for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1) if (flags & 1) - sGroundEffectFuncs[i](eventObj, sprite); + sGroundEffectFuncs[i](objEvent, sprite); } -void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) +void filters_out_some_ground_effects(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->disableCoveringGroundEffects) + if (objEvent->disableCoveringGroundEffects) { - eventObj->inShortGrass = 0; - eventObj->inSandPile = 0; - eventObj->inShallowFlowingWater = 0; - eventObj->inHotSprings = 0; + objEvent->inShortGrass = 0; + objEvent->inSandPile = 0; + objEvent->inShallowFlowingWater = 0; + objEvent->inHotSprings = 0; *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS | GROUND_EFFECT_FLAG_SHORT_GRASS | GROUND_EFFECT_FLAG_SAND_PILE @@ -8299,111 +8299,111 @@ void filters_out_some_ground_effects(struct EventObject *eventObj, u32 *flags) } } -void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags) +void FilterOutStepOnPuddleGroundEffectIfJumping(struct ObjectEvent *objEvent, u32 *flags) { - if (eventObj->landingJump) + if (objEvent->landingJump) *flags &= ~GROUND_EFFECT_FLAG_PUDDLE; } -static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnSpawn(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnSpawn(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnSpawn(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnBeginStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnMove) + if (objEvent->triggerGroundEffectsOnMove) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - filters_out_some_ground_effects(eventObj, &flags); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnMove = 0; - eventObj->disableCoveringGroundEffects = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnBeginStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + filters_out_some_ground_effects(objEvent, &flags); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnMove = 0; + objEvent->disableCoveringGroundEffects = 0; } } -static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite) +static void DoGroundEffects_OnFinishStep(struct ObjectEvent *objEvent, struct Sprite *sprite) { u32 flags; - if (eventObj->triggerGroundEffectsOnStop) + if (objEvent->triggerGroundEffectsOnStop) { flags = 0; - UpdateEventObjectZCoordAndPriority(eventObj, sprite); - GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags); - SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite); - FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags); - DoFlaggedGroundEffects(eventObj, sprite, flags); - eventObj->triggerGroundEffectsOnStop = 0; - eventObj->landingJump = 0; + UpdateObjectEventZCoordAndPriority(objEvent, sprite); + GetAllGroundEffectFlags_OnFinishStep(objEvent, &flags); + SetObjectEventSpriteOamTableForLongGrass(objEvent, sprite); + FilterOutStepOnPuddleGroundEffectIfJumping(objEvent, &flags); + DoFlaggedGroundEffects(objEvent, sprite, flags); + objEvent->triggerGroundEffectsOnStop = 0; + objEvent->landingJump = 0; } } -bool8 FreezeEventObject(struct EventObject *eventObject) +bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent) { - if (eventObject->heldMovementActive || eventObject->frozen) + if (objectEvent->heldMovementActive || objectEvent->frozen) { return TRUE; } else { - eventObject->frozen = 1; - eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused; - eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused; - gSprites[eventObject->spriteId].animPaused = 1; - gSprites[eventObject->spriteId].affineAnimPaused = 1; + objectEvent->frozen = 1; + objectEvent->spriteAnimPausedBackup = gSprites[objectEvent->spriteId].animPaused; + objectEvent->spriteAffineAnimPausedBackup = gSprites[objectEvent->spriteId].affineAnimPaused; + gSprites[objectEvent->spriteId].animPaused = 1; + gSprites[objectEvent->spriteId].affineAnimPaused = 1; return FALSE; } } -void FreezeEventObjects(void) +void FreezeObjectEvents(void) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + 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]); + 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]); + if (gObjectEvents[i].active) + UnfreezeObjectEvent(&gObjectEvents[i]); } static void Step1(struct Sprite *sprite, u8 dir) @@ -8758,7 +8758,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; @@ -8785,11 +8785,11 @@ void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible) sprite->invisible = TRUE; } -static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite) +static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *sprite) { sub_8097D68(sprite); SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); - UpdateEventObjectSpriteVisibility(sprite, sprite->data[2]); + UpdateObjectEventSpriteVisibility(sprite, sprite->data[2]); } void sub_8097AF0(void) @@ -8799,7 +8799,7 @@ void sub_8097AF0(void) for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility) + if(sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility) DestroySprite(sprite); } } @@ -8811,7 +8811,7 @@ int sub_8097B2C(u8 var) // this should return a u8, because all that call this s for(i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) + if(sprite->inUse && sprite->callback == UpdateObjectEventSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == var) return i; } return MAX_SPRITES; @@ -8832,7 +8832,7 @@ void sub_8097BB4(u8 var1, u8 graphicsId) if(spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); u16 tileNum = sprite->oam.tileNum; sprite->oam = *graphicsInfo->oam; @@ -8956,24 +8956,24 @@ bool32 sub_8097D9C(u8 var) return FALSE; } -u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject) +u32 StartFieldEffectForObjectEvent(u8 fieldEffectId, struct ObjectEvent *objectEvent) { - EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(objectEvent, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); return FieldEffectStart(fieldEffectId); } -void DoShadowFieldEffect(struct EventObject *eventObject) +void DoShadowFieldEffect(struct ObjectEvent *objectEvent) { - if (!eventObject->hasShadow) + if (!objectEvent->hasShadow) { - eventObject->hasShadow = 1; - StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject); + objectEvent->hasShadow = 1; + StartFieldEffectForObjectEvent(FLDEFF_SHADOW, objectEvent); } } -static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite) +static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - const struct EventObjectGraphicsInfo *graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); gFieldEffectArguments[0] = sprite->pos1.x; gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2; gFieldEffectArguments[2] = 151; @@ -8981,38 +8981,38 @@ static void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite * FieldEffectStart(FLDEFF_RIPPLE); } -u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_StoreAndLockAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_StoreAndLockAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FreeAndUnlockAnim[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FreeAndUnlockAnim_Step0, MovementAction_Finish, }; -u8 (*const gMovementActionFuncs_FlyUp[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FlyUp[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FlyUp_Step0, MovementAction_FlyUp_Step1, MovementAction_Fly_Finish, }; -u8 (*const gMovementActionFuncs_FlyDown[])(struct EventObject *, struct Sprite *) = { +u8 (*const gMovementActionFuncs_FlyDown[])(struct ObjectEvent *, struct Sprite *) = { MovementAction_FlyDown_Step0, MovementAction_FlyDown_Step1, MovementAction_Fly_Finish, }; -u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_StoreAndLockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u32 one; bool32 ableToStore = FALSE; - if (gLockedAnimEventObjects == NULL) + if (gLockedAnimObjectEvents == NULL) { - gLockedAnimEventObjects = AllocZeroed(sizeof(struct LockedAnimEventObjects)); - gLockedAnimEventObjects->eventObjectIds[0] = eventObject->localId; + gLockedAnimObjectEvents = AllocZeroed(sizeof(struct LockedAnimObjectEvents)); + gLockedAnimObjectEvents->objectEventIds[0] = objectEvent->localId; // needed to match - gLockedAnimEventObjects->count = (one = 1); + gLockedAnimObjectEvents->count = (one = 1); ableToStore = one; } else @@ -9022,10 +9022,10 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct bool32 found; for (firstFreeSlot = 16, found = FALSE, i = 0; i < 16; i++) { - if (firstFreeSlot == 16 && gLockedAnimEventObjects->eventObjectIds[i] == 0) + if (firstFreeSlot == 16 && gLockedAnimObjectEvents->objectEventIds[i] == 0) firstFreeSlot = i; - if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) + if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) { found = TRUE; break; @@ -9034,44 +9034,44 @@ u8 MovementAction_StoreAndLockAnim_Step0(struct EventObject *eventObject, struct if (!found && firstFreeSlot != 16) { - gLockedAnimEventObjects->eventObjectIds[firstFreeSlot] = eventObject->localId; - gLockedAnimEventObjects->count++; + gLockedAnimObjectEvents->objectEventIds[firstFreeSlot] = objectEvent->localId; + gLockedAnimObjectEvents->count++; ableToStore = TRUE; } } if (ableToStore == TRUE) { - eventObject->inanimate = TRUE; - eventObject->facingDirectionLocked = TRUE; + objectEvent->inanimate = TRUE; + objectEvent->facingDirectionLocked = TRUE; } sprite->data[2] = 1; return TRUE; } -u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FreeAndUnlockAnim_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { bool32 ableToStore; u8 index; sprite->data[2] = 1; - if (gLockedAnimEventObjects != NULL) + if (gLockedAnimObjectEvents != NULL) { ableToStore = FALSE; - index = FindLockedEventObjectIndex(eventObject); + index = FindLockedObjectEventIndex(objectEvent); if (index != 16) { - gLockedAnimEventObjects->eventObjectIds[index] = 0; - gLockedAnimEventObjects->count--; + gLockedAnimObjectEvents->objectEventIds[index] = 0; + gLockedAnimObjectEvents->count--; ableToStore = TRUE; } - if (gLockedAnimEventObjects->count == 0) - FREE_AND_SET_NULL(gLockedAnimEventObjects); + if (gLockedAnimObjectEvents->count == 0) + FREE_AND_SET_NULL(gLockedAnimObjectEvents); if (ableToStore == TRUE) { - eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate; - eventObject->facingDirectionLocked = FALSE; + objectEvent->inanimate = GetObjectEventGraphicsInfo(objectEvent->graphicsId)->inanimate; + objectEvent->facingDirectionLocked = FALSE; sprite->animPaused = 0; } } @@ -9079,36 +9079,36 @@ u8 MovementAction_FreeAndUnlockAnim_Step0(struct EventObject *eventObject, struc return TRUE; } -u8 FindLockedEventObjectIndex(struct EventObject *eventObject) +u8 FindLockedObjectEventIndex(struct ObjectEvent *objectEvent) { u8 i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - if (gLockedAnimEventObjects->eventObjectIds[i] == eventObject->localId) + if (gLockedAnimObjectEvents->objectEventIds[i] == objectEvent->localId) return i; } return EVENT_OBJECTS_COUNT; } -void CreateLevitateMovementTask(struct EventObject *eventObject) +void CreateLevitateMovementTask(struct ObjectEvent *objectEvent) { u8 taskId = CreateTask(ApplyLevitateMovement, 0xFF); struct Task *task = &gTasks[taskId]; - StoreWordInTwoHalfwords(&task->data[0], (u32)eventObject); - eventObject->warpArrowSpriteId = taskId; + StoreWordInTwoHalfwords(&task->data[0], (u32)objectEvent); + objectEvent->warpArrowSpriteId = taskId; task->data[3] = 0xFFFF; } static void ApplyLevitateMovement(u8 taskId) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // load the map object pointer. - sprite = &gSprites[eventObject->spriteId]; + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // load the map object pointer. + sprite = &gSprites[objectEvent->spriteId]; if(!(task->data[2] & 0x3)) sprite->pos2.y += task->data[3]; @@ -9121,10 +9121,10 @@ static void ApplyLevitateMovement(u8 taskId) void DestroyExtraMovementTask(u8 taskId) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Task *task = &gTasks[taskId]; - LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&eventObject); // unused eventObject + LoadWordFromTwoHalfwords(&task->data[0], (u32 *)&objectEvent); // unused objectEvent DestroyTask(taskId); } @@ -9135,19 +9135,19 @@ void sub_8098074(u8 var1, u8 var2) for(i = 0; i < EVENT_OBJECTS_COUNT; i++) { if(i != var1 && i != var2 && - gEventObjects[i].active && i != gPlayerAvatar.eventObjectId) - FreezeEventObject(&gEventObjects[i]); + gObjectEvents[i].active && i != gPlayerAvatar.objectEventId) + FreezeObjectEvent(&gObjectEvents[i]); } } -u8 MovementAction_FlyUp_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; sprite->data[2]++; return FALSE; } -u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y -= 8; @@ -9156,14 +9156,14 @@ u8 MovementAction_FlyUp_Step1(struct EventObject *eventObject, struct Sprite *sp return FALSE; } -u8 MovementAction_FlyDown_Step0(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = -160; sprite->data[2]++; return FALSE; } -u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_FlyDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y += 8; @@ -9173,7 +9173,7 @@ u8 MovementAction_FlyDown_Step1(struct EventObject *eventObject, struct Sprite * } // though this function returns TRUE without doing anything, this header is required due to being in an array of functions which needs it. -u8 MovementAction_Fly_Finish(struct EventObject *eventObject, struct Sprite *sprite) +u8 MovementAction_Fly_Finish(struct ObjectEvent *objectEvent, struct Sprite *sprite) { return TRUE; } diff --git a/src/faraway_island.c b/src/faraway_island.c index 6a835a02b0..7e31d58f3d 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -12,10 +12,10 @@ #include "constants/vars.h" static u8 sub_81D4890(u8); -static bool8 sub_81D4C14(struct EventObject*, u8); -static u8 sub_81D4C9C(struct EventObject*, u8); -static u8 sub_81D4C58(struct EventObject*, u8); -static u8 sub_81D4CE0(struct EventObject*, u8); +static bool8 sub_81D4C14(struct ObjectEvent*, u8); +static u8 sub_81D4C9C(struct ObjectEvent*, u8); +static u8 sub_81D4C58(struct ObjectEvent*, u8); +static u8 sub_81D4CE0(struct ObjectEvent*, u8); static u8 sub_81D4D24(u8); static bool8 CanMewWalkToCoords(s16, s16); @@ -36,26 +36,26 @@ static const s16 sFarawayIslandRockCoords[4][2] = {20, 20}, }; -static u8 GetMewEventObjectId(void) +static u8 GetMewObjectEventId(void) { - u8 eventObjectId; - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - return eventObjectId; + u8 objectEventId; + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + return objectEventId; } u32 GetMewMoveDirection(void) { u8 i; int skip; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; - sPlayerToMewDeltaX = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x - mew->currentCoords.x; - sPlayerToMewDeltaY = gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y - mew->currentCoords.y; + sPlayerToMewDeltaX = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x - mew->currentCoords.x; + sPlayerToMewDeltaY = gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y - mew->currentCoords.y; for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x - && gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x + && gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y) { return DIR_NONE; } @@ -70,10 +70,10 @@ u32 GetMewMoveDirection(void) for (i = 0; i < ARRAY_COUNT(sFarawayIslandRockCoords); i++) { - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x == sFarawayIslandRockCoords[i][0]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x == sFarawayIslandRockCoords[i][0]) { skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y < sFarawayIslandRockCoords[i][1]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y < sFarawayIslandRockCoords[i][1]) { if (mew->currentCoords.y <= sFarawayIslandRockCoords[i][1]) skip = 1; @@ -88,7 +88,7 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaX > 0) { - if (mew->currentCoords.x + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; @@ -96,14 +96,14 @@ u32 GetMewMoveDirection(void) } else if (sPlayerToMewDeltaX < 0) { - if (mew->currentCoords.x - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } } - if (mew->currentCoords.x == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x) + if (mew->currentCoords.x == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x) { if (sPlayerToMewDeltaY > 0) { @@ -119,10 +119,10 @@ u32 GetMewMoveDirection(void) } } - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y == sFarawayIslandRockCoords[i][1]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y == sFarawayIslandRockCoords[i][1]) { skip = 0; - if (gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.x < sFarawayIslandRockCoords[i][0]) + if (gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.x < sFarawayIslandRockCoords[i][0]) { if (mew->currentCoords.x <= sFarawayIslandRockCoords[i][0]) skip = 1; @@ -137,7 +137,7 @@ u32 GetMewMoveDirection(void) { if (sPlayerToMewDeltaY > 0) { - if (mew->currentCoords.y + 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y + 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; @@ -145,14 +145,14 @@ u32 GetMewMoveDirection(void) } else if (sPlayerToMewDeltaY < 0) { - if (mew->currentCoords.y - 1 == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y - 1 == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } } - if (mew->currentCoords.y == gEventObjects[gPlayerAvatar.eventObjectId].previousCoords.y) + if (mew->currentCoords.y == gObjectEvents[gPlayerAvatar.objectEventId].previousCoords.y) { if (sPlayerToMewDeltaX > 0) { @@ -211,13 +211,13 @@ u32 GetMewMoveDirection(void) if (sPlayerToMewDeltaY == 0) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y > mew->currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y > mew->currentCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) return DIR_NORTH; } - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y < mew->currentCoords.y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y < mew->currentCoords.y) { if (CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) return DIR_SOUTH; @@ -232,13 +232,13 @@ u32 GetMewMoveDirection(void) if (sPlayerToMewDeltaX == 0) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x > mew->currentCoords.x) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x > mew->currentCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) return DIR_WEST; } - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x < mew->currentCoords.x) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x < mew->currentCoords.x) { if (CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) return DIR_EAST; @@ -256,8 +256,8 @@ u32 GetMewMoveDirection(void) static bool8 CanMewWalkToCoords(s16 x, s16 y) { - if (gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x == x - && gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y == y) + if (gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x == x + && gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y == y) { return FALSE; } @@ -269,7 +269,7 @@ static u8 sub_81D4890(u8 ignoredDir) { u8 i; u8 count = 0; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; for (i = 0; i < ARRAY_COUNT(sMewDirectionCandidates); i++) sMewDirectionCandidates[i] = DIR_NONE; @@ -318,12 +318,12 @@ void UpdateFarawayIslandStepCounter(void) } } -bool8 EventObjectIsFarawayIslandMew(struct EventObject *eventObject) +bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent) { if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(FARAWAY_ISLAND_INTERIOR) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(FARAWAY_ISLAND_INTERIOR)) { - if (eventObject->graphicsId == EVENT_OBJ_GFX_MEW) + if (objectEvent->graphicsId == EVENT_OBJ_GFX_MEW) return TRUE; } @@ -342,7 +342,7 @@ bool8 IsMewPlayingHideAndSeek(void) return FALSE; } -bool8 sub_81D4A58(struct EventObject *eventObject) +bool8 sub_81D4A58(struct ObjectEvent *objectEvent) { if (VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) != 0xFFFF && VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % 4 == 0) @@ -356,7 +356,7 @@ void sub_81D4A90(void) s16 x; s16 y; u8 spriteId; - struct EventObject *mew = &gEventObjects[GetMewEventObjectId()]; + struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; mew->invisible = 0; if (gSpecialVar_0x8004 == 1) @@ -396,7 +396,7 @@ void sub_81D4BEC(void) DestroySprite(&gSprites[sUnknown_0203CF50]); } -static bool8 sub_81D4C14(struct EventObject *mew, u8 index) +static bool8 sub_81D4C14(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaY > 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y - 1)) { @@ -407,7 +407,7 @@ static bool8 sub_81D4C14(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4C58(struct EventObject *mew, u8 index) +static u8 sub_81D4C58(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaX < 0 && CanMewWalkToCoords(mew->currentCoords.x + 1, mew->currentCoords.y)) { @@ -418,7 +418,7 @@ static u8 sub_81D4C58(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4C9C(struct EventObject *mew, u8 index) +static u8 sub_81D4C9C(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaY < 0 && CanMewWalkToCoords(mew->currentCoords.x, mew->currentCoords.y + 1)) { @@ -429,7 +429,7 @@ static u8 sub_81D4C9C(struct EventObject *mew, u8 index) return FALSE; } -static u8 sub_81D4CE0(struct EventObject *mew, u8 index) +static u8 sub_81D4CE0(struct ObjectEvent *mew, u8 index) { if (sPlayerToMewDeltaX > 0 && CanMewWalkToCoords(mew->currentCoords.x - 1, mew->currentCoords.y)) { diff --git a/src/field_camera.c b/src/field_camera.c index 7f294afdb7..c5b32ff3b2 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -299,7 +299,7 @@ static void DrawMetatile(s32 metatileLayerType, u16 *metatiles, u16 offset) gBGTilemapBuffers1[offset + 0x20] = metatiles[2]; gBGTilemapBuffers1[offset + 0x21] = metatiles[3]; - // Draw metatile's top layer to the top background layer, which covers event object sprites. + // Draw metatile's top layer to the top background layer, which covers object event sprites. gBGTilemapBuffers2[offset] = metatiles[4]; gBGTilemapBuffers2[offset + 1] = metatiles[5]; gBGTilemapBuffers2[offset + 0x20] = metatiles[6]; @@ -415,7 +415,7 @@ void CameraUpdate(void) if (deltaX != 0 || deltaY != 0) { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); RotatingGatePuzzleCameraUpdate(deltaX, deltaY); ResetBerryTreeSparkleFlags(); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); @@ -430,7 +430,7 @@ void CameraUpdate(void) void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused { CameraMove(deltaX, deltaY); - UpdateEventObjectsForCameraUpdate(deltaX, deltaY); + UpdateObjectEventsForCameraUpdate(deltaX, deltaY); DrawWholeMapView(); gTotalCameraPixelOffsetX -= deltaX * 16; gTotalCameraPixelOffsetY -= deltaY * 16; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 41b7a4dbf9..2326ec1014 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -38,14 +38,14 @@ static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; -u8 gSelectedEventObject; +u8 gSelectedObjectEvent; static void GetPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *); static u16 GetPlayerCurMetatileBehavior(int); static bool8 TryStartInteractionScript(struct MapPosition*, u16, u8); static const u8 *GetInteractionScript(struct MapPosition*, u8, u8); -static const u8 *GetInteractedEventObjectScript(struct MapPosition *, u8, u8); +static const u8 *GetInteractedObjectEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedBackgroundEventScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedMetatileScript(struct MapPosition *, u8, u8); static const u8 *GetInteractedWaterScript(struct MapPosition *, u8, u8); @@ -138,7 +138,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) u16 metatileBehavior; gSpecialVar_LastTalked = 0; - gSelectedEventObject = 0; + gSelectedObjectEvent = 0; playerDirection = GetPlayerFacingDirection(); GetPlayerPosition(&position); @@ -239,7 +239,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; @@ -260,54 +260,54 @@ static const u8 *GetInteractionScript(struct MapPosition *position, u8 metatileB const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; s32 i; if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y))) - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); else - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) return NULL; for (i = 0; i < 4; i++) { - if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == eventObjectId) + if (gLinkPlayerObjectEvents[i].active == TRUE && gLinkPlayerObjectEvents[i].objEventId == objectEventId) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; - return GetEventObjectScriptPointerByEventObjectId(eventObjectId); + return GetObjectEventScriptPointerByObjectEventId(objectEventId); } -static const u8 *GetInteractedEventObjectScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) +static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 metatileBehavior, u8 direction) { - u8 eventObjectId; + u8 objectEventId; const u8 *script; - eventObjectId = GetEventObjectIdByXYZ(position->x, position->y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); + if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; - // Look for an event object on the other side of the counter. - eventObjectId = GetEventObjectIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (eventObjectId == EVENT_OBJECTS_COUNT || gEventObjects[eventObjectId].localId == EVENT_OBJ_ID_PLAYER) + // Look for an object event on the other side of the counter. + objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); + if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) return NULL; } - gSelectedEventObject = eventObjectId; - gSpecialVar_LastTalked = gEventObjects[eventObjectId].localId; + gSelectedObjectEvent = objectEventId; + gSpecialVar_LastTalked = gObjectEvents[objectEventId].localId; gSpecialVar_Facing = direction; if (InTrainerHill() == TRUE) script = GetTrainerHillTrainerScript(); else - script = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + script = GetObjectEventScriptPointerByObjectEventId(objectEventId); script = GetRamScript(gSpecialVar_LastTalked, script); return script; @@ -982,14 +982,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 99abcdcb01..335de89b5a 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -101,11 +101,11 @@ static bool8 sub_80B72D0(struct Task *); static bool8 sub_80B72F4(struct Task *); static void sub_80B7384(u8); -static bool8 sub_80B73D0(struct Task *, struct EventObject *); -static bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *); -static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *); -static bool8 sub_80B7450(struct Task *, struct EventObject *); -static bool8 sub_80B7478(struct Task *, struct EventObject *); +static bool8 sub_80B73D0(struct Task *, struct ObjectEvent *); +static bool8 waterfall_1_do_anim_probably(struct Task *, struct ObjectEvent *); +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct ObjectEvent *); +static bool8 sub_80B7450(struct Task *, struct ObjectEvent *); +static bool8 sub_80B7478(struct Task *, struct ObjectEvent *); static void Task_Dive(u8); static bool8 dive_1_lock(struct Task *); @@ -113,28 +113,28 @@ static bool8 dive_2_unknown(struct Task *); static bool8 dive_3_unknown(struct Task *); static void sub_80B75F0(u8); -static bool8 sub_80B764C(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7684(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B76B8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7704(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B77F8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7814(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B764C(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7684(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B76B8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7704(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B77F8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7814(struct Task *, struct ObjectEvent *, struct Sprite *); static void mapldr_080851BC(void); static void sub_80B7890(u8); -static bool8 sub_80B78EC(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B791C(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7968(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B79BC(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B78EC(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B791C(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7968(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B79BC(struct Task *, struct ObjectEvent *, struct Sprite *); static void sub_80B7A8C(u8); -static bool8 sub_80B7AE8(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7B18(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7B94(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7BCC(struct Task *, struct EventObject *, struct Sprite *); -static bool8 sub_80B7BF4(struct Task *, struct EventObject *, struct Sprite *); +static bool8 sub_80B7AE8(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7B18(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7B94(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7BCC(struct Task *, struct ObjectEvent *, struct Sprite *); +static bool8 sub_80B7BF4(struct Task *, struct ObjectEvent *, struct Sprite *); static void DoEscapeRopeFieldEffect(u8); static void EscapeRopeFieldEffect_Step0(struct Task *); @@ -572,7 +572,7 @@ bool8 (*const gUnknown_0855C3FC[])(struct Task *) = sub_80B72F4, }; -bool8 (*const gUnknown_0855C418[])(struct Task *, struct EventObject *) = +bool8 (*const gUnknown_0855C418[])(struct Task *, struct ObjectEvent *) = { sub_80B73D0, waterfall_1_do_anim_probably, @@ -588,7 +588,7 @@ bool8 (*const gUnknown_0855C42C[])(struct Task *) = dive_3_unknown, }; -bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C438[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B764C, sub_80B7684, @@ -598,7 +598,7 @@ bool8 (*const gUnknown_0855C438[])(struct Task *, struct EventObject *, struct S sub_80B7814, }; -bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C450[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B78EC, sub_80B791C, @@ -606,7 +606,7 @@ bool8 (*const gUnknown_0855C450[])(struct Task *, struct EventObject *, struct S sub_80B79BC, }; -bool8 (*const gUnknown_0855C460[])(struct Task *, struct EventObject *, struct Sprite *) = +bool8 (*const gUnknown_0855C460[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80B7AE8, sub_80B7B18, @@ -1375,7 +1375,7 @@ static void FieldCallback_Fly(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1412,13 +1412,13 @@ static void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; if (gPlayerAvatar.flags & 0x08) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); } ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1438,7 +1438,7 @@ static void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(taskId); } } @@ -1448,7 +1448,7 @@ void sub_80B6B68(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_80B6B94, 0); gFieldCallback = NULL; } @@ -1462,14 +1462,14 @@ static void sub_80B6B94(u8 taskId) static bool8 sub_80B6BCC(struct Task *task) // gUnknown_0855C3C8[0] { - struct EventObject *playerObject; + struct ObjectEvent *playerObject; struct Sprite *playerSprite; - playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; gPlayerAvatar.preventStep = TRUE; - EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1496,7 +1496,7 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1504,10 +1504,10 @@ static bool8 sub_80B6C90(struct Task *task) // gUnknown_0855C3C8[2] static bool8 sub_80B6D04(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->pos2.y += task->data[1]; if (task->data[1] < 8) @@ -1521,15 +1521,15 @@ static bool8 sub_80B6D04(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - eventObject->fixedPriority = 0; + objectEvent->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - eventObject->triggerGroundEffectsOnStop = 1; - eventObject->landingJump = 1; + objectEvent->triggerGroundEffectsOnStop = 1; + objectEvent->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1566,7 +1566,7 @@ static bool8 sub_80B6E18(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_80B6B94)); return FALSE; @@ -1592,7 +1592,7 @@ static void sub_80B6E88(u8 taskId) static bool8 sub_80B6EC0(struct Task *task) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); sub_80E1558(task->data[1]); task->data[0]++; @@ -1601,11 +1601,11 @@ static bool8 sub_80B6EC0(struct Task *task) static bool8 sub_80B6EE0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1716,13 +1716,13 @@ static void sub_80B70DC(u8 taskId) static bool8 sub_80B7114(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; s16 x; s16 y; u8 behavior; CameraObjectReset2(); - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1812,13 +1812,13 @@ static bool8 sub_80B72D0(struct Task *task) static bool8 sub_80B72F4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { CameraObjectReset1(); ScriptContext2_Disable(); - EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_80B70DC)); } return FALSE; @@ -1835,10 +1835,10 @@ bool8 FldEff_UseWaterfall(void) static void sub_80B7384(u8 taskId) { - while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); + while (gUnknown_0855C418[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])); } -static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B73D0(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1846,12 +1846,12 @@ static bool8 sub_80B73D0(struct Task *task, struct EventObject *eventObject) return FALSE; } -static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) +static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); - if (!EventObjectIsMovementOverridden(eventObject)) + if (!ObjectEventIsMovementOverridden(objectEvent)) { - EventObjectClearHeldMovementIfFinished(eventObject); + ObjectEventClearHeldMovementIfFinished(objectEvent); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1859,7 +1859,7 @@ static bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject return FALSE; } -static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1869,20 +1869,20 @@ static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct Eve return TRUE; } -static bool8 sub_80B7450(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B7450(struct Task *task, struct ObjectEvent *objectEvent) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -static bool8 sub_80B7478(struct Task *task, struct EventObject *eventObject) +static bool8 sub_80B7478(struct Task *task, struct ObjectEvent *objectEvent) { - if (!EventObjectClearHeldMovementIfFinished(eventObject)) + if (!ObjectEventClearHeldMovementIfFinished(objectEvent)) { return FALSE; } - if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior)) + if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1931,7 +1931,7 @@ static bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior); + dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1945,22 +1945,22 @@ void sub_80B75D8(u8 priority) static void sub_80B75F0(u8 taskId) { - while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C438[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B764C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B764C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; } -static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7684(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1973,12 +1973,12 @@ static bool8 sub_80B7684(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B76B8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1987,7 +1987,7 @@ static bool8 sub_80B76B8(struct Task *task, struct EventObject *eventObject, str return TRUE; } -static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7704(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -2019,7 +2019,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -2030,7 +2030,7 @@ static bool8 sub_80B7704(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B77F8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeScreen(); @@ -2038,7 +2038,7 @@ static bool8 sub_80B77F8(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7814(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7814(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2061,25 +2061,25 @@ static void mapldr_080851BC(void) static void sub_80B7890(u8 taskId) { - while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0855C450[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B78EC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B78EC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { CameraObjectReset2(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; task->data[0]++; return FALSE; } -static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B791C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -2088,27 +2088,27 @@ static bool8 sub_80B791C(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7968(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7968(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; } -static bool8 sub_80B79BC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B79BC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B7890)); } return FALSE; @@ -2139,27 +2139,27 @@ void sub_80B7A74(u8 priority) static void sub_80B7A8C(u8 taskId) { - while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0855C460[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 sub_80B7AE8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7AE8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[0]++; return FALSE; } -static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7B18(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[1] > 3) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -2167,24 +2167,24 @@ static bool8 sub_80B7B18(struct Task *task, struct EventObject *eventObject, str } else { task->data[1]++; - EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -static bool8 sub_80B7B94(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7B94(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - eventObject->invisible = TRUE; + objectEvent->invisible = TRUE; task->data[0]++; } return FALSE; } -static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7BCC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -2195,7 +2195,7 @@ static bool8 sub_80B7BCC(struct Task *task, struct EventObject *eventObject, str return FALSE; } -static bool8 sub_80B7BF4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +static bool8 sub_80B7BF4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2228,7 +2228,7 @@ void sub_80B7CAC(struct Sprite *sprite) void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(DoEscapeRopeFieldEffect, 0x50); } @@ -2246,19 +2246,19 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task) static void EscapeRopeFieldEffect_Step1(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; if (task->data[14] != 0 && (--task->data[14]) == 0) { TryFadeOutOldMapMusic(); WarpFadeScreen(); } - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { - SetEventObjectDirection(eventObject, task->data[15]); + SetObjectEventDirection(objectEvent, task->data[15]); SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; @@ -2266,7 +2266,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) DestroyTask(FindTaskIdByFunc(DoEscapeRopeFieldEffect)); } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 12) { task->data[2]++; @@ -2286,9 +2286,9 @@ static void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CreateTask(sub_80B7E94, 0); } @@ -2309,29 +2309,29 @@ static void sub_80B7EC4(struct Task *task) static void sub_80B7EE8(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent)) { return; } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - eventObject->invisible = FALSE; + objectEvent->invisible = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B7E94)); return; } - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - eventObject->invisible ^= 1; + objectEvent->invisible ^= 1; } void CreateTeleportFieldEffectTask(void) @@ -2354,7 +2354,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; @@ -2363,14 +2363,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; @@ -2383,12 +2383,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]; @@ -2434,9 +2434,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_maplights(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; CameraObjectReset2(); CreateTask(sub_80B8250, 0); } @@ -2461,7 +2461,7 @@ static void sub_80B8280(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = FALSE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2474,14 +2474,14 @@ static void sub_80B8280(struct Task *task) static void sub_80B830C(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->pos2.y += task->data[1]) >= -8) { if (task->data[13] == 0) { task->data[13]++; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2499,7 +2499,7 @@ static void sub_80B830C(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2513,16 +2513,16 @@ static void sub_80B830C(struct Task *task) static void sub_80B8410(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if ((--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection) + if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_80B8250)); } } @@ -2952,31 +2952,31 @@ static void sub_80B8D84(u8 taskId) static void sub_80B8DB4(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]); + MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } static void sub_80B8E14(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B8E60(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectCheckHeldMovementStatus(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventCheckHeldMovementStatus(objectEvent)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2986,32 +2986,32 @@ static void sub_80B8E60(struct Task *task) static void sub_80B8EA8(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(3)); - EventObjectClearHeldMovementIfFinished(eventObject); - EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(3)); + ObjectEventClearHeldMovementIfFinished(objectEvent); + ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } static void sub_80B8F24(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection)); - sub_81555AC(eventObject->fieldEffectSpriteId, 1); - UnfreezeEventObjects(); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); + sub_81555AC(objectEvent->fieldEffectSpriteId, 1); + UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_80B8D84)); @@ -3116,22 +3116,22 @@ static void sub_80B91D4(u8 taskId) static void sub_80B9204(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B925C(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -3143,11 +3143,11 @@ static void sub_80B92A0(struct Task *task) { if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[15] & 0x08) { - sub_81555AC(eventObject->fieldEffectSpriteId, 2); - sub_81555D8(eventObject->fieldEffectSpriteId, 0); + sub_81555AC(objectEvent->fieldEffectSpriteId, 2); + sub_81555D8(objectEvent->fieldEffectSpriteId, 0); } task->data[1] = sub_80B94C4(); task->data[0]++; @@ -3161,14 +3161,14 @@ static void sub_80B92F8(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT); } } static void sub_80B933C(struct Task *task) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; PlaySE(SE_W019); @@ -3180,14 +3180,14 @@ static void sub_80B9390(struct Task *task) { if ((++task->data[2]) >= 8) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x03)); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->inanimate = 1; - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x03)); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->inanimate = 1; + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); + DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3198,11 +3198,11 @@ static void sub_80B9418(struct Task *task) { if ((++task->data[2]) >= 10) { - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(eventObject); - eventObject->inanimate = 0; - eventObject->hasShadow = 0; - sub_80B9560(task->data[1], eventObject->spriteId); + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(objectEvent); + objectEvent->inanimate = 0; + objectEvent->hasShadow = 0; + sub_80B9560(task->data[1], objectEvent->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3404,9 +3404,9 @@ static void sub_80B97D4(u8 taskId) static void sub_80B9804(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; task->data[2] = 17; @@ -3415,27 +3415,27 @@ static void sub_80B9804(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_81555AC(eventObject->fieldEffectSpriteId, 0); + sub_81555AC(objectEvent->fieldEffectSpriteId, 0); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(0x3)); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(0x3)); CameraObjectReset2(); - EventObjectTurn(eventObject, DIR_WEST); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->invisible = FALSE; + ObjectEventTurn(objectEvent, DIR_WEST); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->invisible = FALSE; task->data[1] = sub_80B94C4(); sub_80B9524(task->data[1]); - sub_80B9560(task->data[1], eventObject->spriteId); + sub_80B9560(task->data[1], objectEvent->spriteId); } } static void sub_80B98B8(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (task->data[2] == 0 || (--task->data[2]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; sub_80B9560(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3478,26 +3478,26 @@ static void sub_80B9924(struct Task *task) static void sub_80B9978(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (sub_80B9508(task->data[1])) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->inanimate = 0; - MoveEventObjectToMapCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->inanimate = 0; + MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_808C114(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } static void sub_80B99F0(struct Task *task) { - if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { task->data[0]++; sub_80B9794(task->data[1]); @@ -3517,18 +3517,18 @@ static void sub_80B9A28(struct Task *task) static void sub_80B9A60(struct Task *task) { u8 state; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((--task->data[1]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; state = 0; if (task->data[15] & 0x08) { state = 3; - sub_81555AC(eventObject->fieldEffectSpriteId, 1); + sub_81555AC(objectEvent->fieldEffectSpriteId, 1); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state)); - EventObjectTurn(eventObject, DIR_SOUTH); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state)); + ObjectEventTurn(objectEvent, DIR_SOUTH); gPlayerAvatar.flags = task->data[15]; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); @@ -3539,11 +3539,11 @@ static void sub_80B9A60(struct Task *task) bool8 sub_80B9ADC(void) { u8 taskId; - u8 eventObjectIdBuffer; - if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) + u8 objectEventIdBuffer; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) { taskId = CreateTask(sub_80B9BE8, 0x50); - gTasks[taskId].data[2] = eventObjectIdBuffer; + gTasks[taskId].data[2] = objectEventIdBuffer; gTasks[taskId].data[6] = gFieldEffectArguments[0]; gTasks[taskId].data[7] = gFieldEffectArguments[1]; gTasks[taskId].data[8] = gFieldEffectArguments[2]; @@ -3622,8 +3622,8 @@ void sub_80B9C54(s16* data, u8 taskId) { if (++data[3] > 0x78) { - struct Sprite *sprite = &gSprites[gEventObjects[data[2]].spriteId]; - gEventObjects[data[2]].invisible = TRUE; + struct Sprite *sprite = &gSprites[gObjectEvents[data[2]].spriteId]; + gObjectEvents[data[2]].invisible = TRUE; BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); sub_80B9D24(sprite); @@ -3639,7 +3639,7 @@ void sub_80B9CDC(s16* a0, u8 taskId) if (!gPaletteFade.active && !FuncIsActiveTask(sub_80B9B3C)) { InstallCameraPanAheadCallback(); - RemoveEventObjectByLocalIdAndMap(a0[6], a0[7], a0[8]); + RemoveObjectEventByLocalIdAndMap(a0[6], a0[7], a0[8]); FieldEffectActiveListRemove(0x41); DestroyTask(taskId); } @@ -3734,24 +3734,24 @@ static void sub_80B9DB8(struct Sprite* sprite) bool8 Fldeff_MoveDeoxysRock(struct Sprite* sprite) { - u8 eventObjectIdBuffer; - if (!TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &eventObjectIdBuffer)) + u8 objectEventIdBuffer; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) { - struct EventObject *object; + struct ObjectEvent *object; int xPos, yPos; u8 taskId; - object = &gEventObjects[eventObjectIdBuffer]; + object = &gObjectEvents[objectEventIdBuffer]; xPos = object->currentCoords.x - 7; yPos = object->currentCoords.y - 7; xPos = (gFieldEffectArguments[3] - xPos) * 16; yPos = (gFieldEffectArguments[4] - yPos) * 16; - ShiftEventObjectCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); + ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7); taskId = CreateTask(Fldeff_MoveDeoxysRock_Step, 0x50); gTasks[taskId].data[1] = object->spriteId; gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos; gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos; gTasks[taskId].data[8] = gFieldEffectArguments[5]; - gTasks[taskId].data[9] = eventObjectIdBuffer; + gTasks[taskId].data[9] = objectEventIdBuffer; } return FALSE; } @@ -3780,10 +3780,10 @@ static void Fldeff_MoveDeoxysRock_Step(u8 taskId) } else { - struct EventObject *object = &gEventObjects[data[9]]; + struct ObjectEvent *object = &gObjectEvents[data[9]]; sprite->pos1.x = data[2]; sprite->pos1.y = data[3]; - ShiftStillEventObjectCoords(object); + ShiftStillObjectEventCoords(object); object->triggerGroundEffectsOnStop = TRUE; FieldEffectActiveListRemove(0x42); DestroyTask(taskId); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 8db58ad7af..98e9c03c13 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -16,9 +16,9 @@ #define EVENT_OBJ_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c static void UpdateObjectReflectionSprite(struct Sprite *); -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite); -static void LoadObjectHighBridgeReflectionPalette(struct EventObject *, u8); -static void LoadObjectRegularReflectionPalette(struct EventObject *, u8); +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); +static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8); +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8); static void sub_81561FC(struct Sprite *, u8, u8); static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *); @@ -26,13 +26,13 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); static void UpdateAshFieldEffect_Step0(struct Sprite *); static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Step2(struct Sprite *); -static void SynchroniseSurfAnim(struct EventObject *, struct Sprite *); -static void sub_81556E8(struct EventObject *, struct Sprite *); -static void CreateBobbingEffect(struct EventObject *, struct Sprite *, struct Sprite *); +static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); +static void sub_81556E8(struct ObjectEvent *, struct Sprite *); +static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void sub_8155850(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); -void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, bool8 stillReflection) +void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection) { struct Sprite *reflectionSprite; @@ -47,40 +47,40 @@ void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, boo reflectionSprite->affineAnimBeginning = TRUE; reflectionSprite->subspriteMode = SUBSPRITES_OFF; reflectionSprite->data[0] = sprite->data[0]; - reflectionSprite->data[1] = eventObject->localId; + reflectionSprite->data[1] = objectEvent->localId; reflectionSprite->data[7] = stillReflection; - LoadObjectReflectionPalette(eventObject, reflectionSprite); + LoadObjectReflectionPalette(objectEvent, reflectionSprite); if (!stillReflection) reflectionSprite->oam.affineMode = ST_OAM_AFFINE_NORMAL; } -static s16 GetReflectionVerticalOffset(struct EventObject *eventObject) +static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent) { - return GetEventObjectGraphicsInfo(eventObject->graphicsId)->height - 2; + return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2; } -static void LoadObjectReflectionPalette(struct EventObject *eventObject, struct Sprite *sprite) +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 bridgeType; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; sprite->data[2] = 0; - if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(eventObject->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(eventObject->currentMetatileBehavior)))) + if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) { sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1]; - LoadObjectHighBridgeReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectHighBridgeReflectionPalette(objectEvent, sprite->oam.paletteNum); } else { - LoadObjectRegularReflectionPalette(eventObject, sprite->oam.paletteNum); + LoadObjectRegularReflectionPalette(objectEvent, sprite->oam.paletteNum); } } -static void LoadObjectRegularReflectionPalette(struct EventObject *eventObject, u8 paletteIndex) +static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteIndex) { - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) { if (graphicsInfo->paletteSlot == 0) @@ -101,11 +101,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->paletteTag2 != EVENT_OBJ_PAL_TAG_NONE) { PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); @@ -115,12 +115,12 @@ static void LoadObjectHighBridgeReflectionPalette(struct EventObject *eventObjec static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *mainSprite; - eventObject = &gEventObjects[reflectionSprite->data[0]]; - mainSprite = &gSprites[eventObject->spriteId]; - if (!eventObject->active || !eventObject->hasReflection || eventObject->localId != reflectionSprite->data[1]) + objectEvent = &gObjectEvents[reflectionSprite->data[0]]; + mainSprite = &gSprites[objectEvent->spriteId]; + if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1]) { reflectionSprite->inUse = FALSE; } @@ -136,14 +136,14 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->invisible = mainSprite->invisible; reflectionSprite->pos1.x = mainSprite->pos1.x; // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 - reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(eventObject) + reflectionSprite->data[2]; + reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; reflectionSprite->pos2.x = mainSprite->pos2.x; reflectionSprite->pos2.y = -mainSprite->pos2.y; reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled; - if (eventObject->hideReflection == TRUE) + if (objectEvent->hideReflection == TRUE) reflectionSprite->invisible = TRUE; // Check if the reflection is not still. @@ -218,12 +218,12 @@ const u16 gShadowVerticalOffsets[] = { u32 FldEff_Shadow(void) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; u8 spriteId; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gShadowEffectTemplateIds[graphicsInfo->shadowSize]], 0, 0, 0x94); if (spriteId != MAX_SPRITES) { @@ -238,27 +238,27 @@ u32 FldEff_Shadow(void) void UpdateShadowFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3]; - if (!eventObject->active || !eventObject->hasShadow - || MetatileBehavior_IsPokeGrass(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->previousMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->currentMetatileBehavior) - || MetatileBehavior_IsReflective(eventObject->previousMetatileBehavior)) + if (!objectEvent->active || !objectEvent->hasShadow + || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->previousMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->currentMetatileBehavior) + || MetatileBehavior_IsReflective(objectEvent->previousMetatileBehavior)) { FieldEffectStop(sprite, FLDEFF_SHADOW); } @@ -301,8 +301,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -316,21 +316,21 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) sprite->data[7] = TRUE; metatileBehavior = 0; if (sprite->animCmdIndex == 0) metatileBehavior = 4; - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_81561FC(sprite, sprite->data[0], metatileBehavior); } } @@ -407,8 +407,8 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) u8 mapGroup; u8 metatileBehavior; u8 localId; - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; mapNum = sprite->data[5] >> 8; mapGroup = sprite->data[5]; @@ -422,18 +422,18 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_LONG_GRASS); } else { - eventObject = &gEventObjects[eventObjectId]; - if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2])) + objectEvent = &gObjectEvents[objectEventId]; + if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) { sprite->data[7] = TRUE; } - UpdateEventObjectSpriteVisibility(sprite, 0); + UpdateObjectEventSpriteVisibility(sprite, 0); sub_81561FC(sprite, sprite->data[0], 0); } } @@ -458,44 +458,44 @@ u32 FldEff_JumpLongGrass(void) u32 FldEff_ShortGrass(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &(gSprites[spriteId]); sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateShortGrassFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShortGrass) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShortGrass) { FieldEffectStop(sprite, FLDEFF_SHORT_GRASS); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; y = linkedSprite->pos1.y; x = linkedSprite->pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) @@ -512,7 +512,7 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite) sprite->pos2.y = (graphicsInfo->height >> 1) - 8; sprite->subpriority = linkedSprite->subpriority - 1; sprite->oam.priority = linkedSprite->oam.priority; - UpdateEventObjectSpriteVisibility(sprite, linkedSprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible); } } @@ -586,14 +586,14 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite) if (++sprite->data[1] > 40) sprite->data[0] = 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) { sprite->invisible ^= 1; sprite->data[1]++; - UpdateEventObjectSpriteVisibility(sprite, sprite->invisible); + UpdateObjectEventSpriteVisibility(sprite, sprite->invisible); if (sprite->data[1] > 56) { FieldEffectStop(sprite, sprite->data[7]); @@ -602,22 +602,22 @@ static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) u32 FldEff_Splash(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - linkedSprite = &gSprites[eventObject->spriteId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->oam.priority = linkedSprite->oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; @@ -630,17 +630,17 @@ u32 FldEff_Splash(void) void UpdateSplashFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; - if (sprite->animEnded || TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId)) + if (sprite->animEnded || TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { FieldEffectStop(sprite, FLDEFF_SPLASH); } else { - sprite->pos1.x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; - sprite->pos1.y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; + sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -682,22 +682,22 @@ u32 FldEff_JumpBigSplash(void) u32 FldEff_FeetInFlowingWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->callback = UpdateFeetInFlowingWaterFieldEffect; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; @@ -711,26 +711,26 @@ u32 FldEff_FeetInFlowingWater(void) static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; struct Sprite *linkedSprite; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShallowFlowingWater) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShallowFlowingWater) { FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER); } else { - eventObject = &gEventObjects[eventObjectId]; - linkedSprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[objectEventId]; + linkedSprite = &gSprites[objectEvent->spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = linkedSprite->pos1.y; sprite->subpriority = linkedSprite->subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); - if (eventObject->currentCoords.x != sprite->data[3] || eventObject->currentCoords.y != sprite->data[4]) + UpdateObjectEventSpriteVisibility(sprite, FALSE); + if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4]) { - sprite->data[3] = eventObject->currentCoords.x; - sprite->data[4] = eventObject->currentCoords.y; + sprite->data[3] = objectEvent->currentCoords.x; + sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { PlaySE(SE_MIZU); @@ -757,46 +757,46 @@ u32 FldEff_Ripple(void) u32 FldEff_HotSpringsWater(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0); if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; } return 0; } void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inHotSprings) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inHotSprings) { FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER); } else { - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; sprite->subpriority = linkedSprite->subpriority - 1; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -928,13 +928,13 @@ static void UpdateAshFieldEffect_Step1(struct Sprite *sprite) sprite->animPaused = FALSE; MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); - gEventObjects[gPlayerAvatar.eventObjectId].triggerGroundEffectsOnMove = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE; sprite->data[0] = 2; } static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->animEnded) FieldEffectStop(sprite, FLDEFF_ASH); } @@ -993,18 +993,18 @@ static u8 sub_815564C(struct Sprite *sprite) void UpdateSurfBlobFieldEffect(struct Sprite *sprite) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *linkedSprite; - eventObject = &gEventObjects[sprite->data[2]]; - linkedSprite = &gSprites[eventObject->spriteId]; - SynchroniseSurfAnim(eventObject, sprite); - sub_81556E8(eventObject, sprite); - CreateBobbingEffect(eventObject, linkedSprite, sprite); + objectEvent = &gObjectEvents[sprite->data[2]]; + linkedSprite = &gSprites[objectEvent->spriteId]; + SynchroniseSurfAnim(objectEvent, sprite); + sub_81556E8(objectEvent, sprite); + CreateBobbingEffect(objectEvent, linkedSprite, sprite); sprite->oam.priority = linkedSprite->oam.priority; } -static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite) +static void SynchroniseSurfAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { [DIR_NONE] = 0, @@ -1019,14 +1019,14 @@ static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite * }; if (sub_8155640(sprite) == 0) - StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[eventObject->movementDirection]); + StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]); } -void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) +void sub_81556E8(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 i; - s16 x = eventObject->currentCoords.x; - s16 y = eventObject->currentCoords.y; + s16 x = objectEvent->currentCoords.x; + s16 y = objectEvent->currentCoords.y; s32 spriteY = sprite->pos2.y; if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7])) @@ -1046,7 +1046,7 @@ void sub_81556E8(struct EventObject *eventObject, struct Sprite *sprite) } } -static void CreateBobbingEffect(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite) +static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite) { u16 unk_085CDC6A[] = {3, 7}; u8 v0 = sub_8155638(sprite); @@ -1121,26 +1121,26 @@ u32 FldEff_Dust(void) u32 FldEff_SandPile(void) { - u8 eventObjectId; - struct EventObject *eventObject; + u8 objectEventId; + struct ObjectEvent *objectEvent; u8 spriteId; struct Sprite *sprite; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; - eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); - eventObject = &gEventObjects[eventObjectId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); + objectEvent = &gObjectEvents[objectEventId]; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0); if (spriteId != MAX_SPRITES) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; - sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority; + sprite->oam.priority = gSprites[objectEvent->spriteId].oam.priority; sprite->data[0] = gFieldEffectArguments[0]; sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = gSprites[eventObject->spriteId].pos1.x; - sprite->data[4] = gSprites[eventObject->spriteId].pos1.y; + sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x; + sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y; sprite->pos2.y = (graphicsInfo->height >> 1) - 2; SeekSpriteAnim(sprite, 2); } @@ -1149,18 +1149,18 @@ u32 FldEff_SandPile(void) void UpdateSandPileFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; + u8 objectEventId; s16 x; s16 y; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inSandPile) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inSandPile) { FieldEffectStop(sprite, FLDEFF_SAND_PILE); } else { - y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y; - x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x; + y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; + x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; if (x != sprite->data[3] || y != sprite->data[4]) { sprite->data[3] = x; @@ -1172,8 +1172,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite) } sprite->pos1.x = x; sprite->pos1.y = y; - sprite->subpriority = gSprites[gEventObjects[eventObjectId].spriteId].subpriority; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority; + UpdateObjectEventSpriteVisibility(sprite, FALSE); } } @@ -1198,7 +1198,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite) sprite->data[0] += 0x80; sprite->data[0] &= 0x100; sprite->pos1.y -= sprite->data[0] >> 8; - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->invisible || sprite->animEnded) { FieldEffectStop(sprite, FLDEFF_BUBBLES); @@ -1243,7 +1243,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) u8 spriteId; struct Sprite *sprite; - if (TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) + if (TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) { FieldEffectActiveListRemove(fldEff); return MAX_SPRITES; @@ -1264,17 +1264,17 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) void UpdateDisguiseFieldEffect(struct Sprite *sprite) { - u8 eventObjectId; - const struct EventObjectGraphicsInfo *graphicsInfo; + u8 objectEventId; + const struct ObjectEventGraphicsInfo *graphicsInfo; struct Sprite *linkedSprite; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &eventObjectId)) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &objectEventId)) { FieldEffectStop(sprite, sprite->data[1]); } - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId); - linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId); + linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->invisible = linkedSprite->invisible; sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16; @@ -1294,30 +1294,30 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite) } } -void sub_8155D78(struct EventObject *eventObject) +void sub_8155D78(struct ObjectEvent *objectEvent) { - if (eventObject->directionSequenceIndex == 1) + if (objectEvent->directionSequenceIndex == 1) { - gSprites[eventObject->fieldEffectSpriteId].data[0]++; + gSprites[objectEvent->fieldEffectSpriteId].data[0]++; } } -bool8 sub_8155DA0(struct EventObject *eventObject) +bool8 sub_8155DA0(struct ObjectEvent *objectEvent) { struct Sprite *sprite; - if (eventObject->directionSequenceIndex == 2) + if (objectEvent->directionSequenceIndex == 2) { return TRUE; } - if (eventObject->directionSequenceIndex == 0) + if (objectEvent->directionSequenceIndex == 0) { return TRUE; } - sprite = &gSprites[eventObject->fieldEffectSpriteId]; + sprite = &gSprites[objectEvent->fieldEffectSpriteId]; if (sprite->data[7]) { - eventObject->directionSequenceIndex = 2; + objectEvent->directionSequenceIndex = 2; sprite->data[0]++; return TRUE; } @@ -1532,7 +1532,7 @@ void sub_8156194(struct Sprite *sprite) } else { - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); } } @@ -1542,24 +1542,24 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite) if (sprite->animEnded) FieldEffectStop(sprite, sprite->data[0]); else - UpdateEventObjectSpriteVisibility(sprite, FALSE); + UpdateObjectEventSpriteVisibility(sprite, FALSE); } static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) { u8 i; s16 var, xhi, lyhi, yhi, ylo; - const struct EventObjectGraphicsInfo *graphicsInfo; // Unused Variable + const struct ObjectEventGraphicsInfo *graphicsInfo; // Unused Variable struct Sprite *linkedSprite; SetObjectSubpriorityByZCoord(z, sprite, offset); for (i = 0; i < EVENT_OBJECTS_COUNT; i ++) { - struct EventObject *eventObject = &gEventObjects[i]; - if (eventObject->active) + struct ObjectEvent *objectEvent = &gObjectEvents[i]; + if (objectEvent->active) { - graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId); - linkedSprite = &gSprites[eventObject->spriteId]; + graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); + linkedSprite = &gSprites[objectEvent->spriteId]; xhi = sprite->pos1.x + sprite->centerToCornerVecX; var = sprite->pos1.x - sprite->centerToCornerVecX; if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 229e5aedb7..f4f5f82bc3 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -32,14 +32,14 @@ #include "constants/species.h" static EWRAM_DATA u8 gUnknown_0203734C = 0; -EWRAM_DATA struct EventObject gEventObjects[EVENT_OBJECTS_COUNT] = {}; +EWRAM_DATA struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT] = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; // static declarations -static u8 EventObjectCB2_NoMovement2(); -static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *, u8); -static void npc_clear_strange_bits(struct EventObject *); +static u8 ObjectEventCB2_NoMovement2(); +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *, u8); +static void npc_clear_strange_bits(struct ObjectEvent *); static void MovePlayerAvatarUsingKeypadInput(u8, u16, u16); static void PlayerAllowForcedMovementIfMovingSameDirection(); static bool8 TryDoMetatileBehaviorForcedMovement(); @@ -70,20 +70,20 @@ static void PlayerNotOnBikeTurningInPlace(u8, u16); static void PlayerNotOnBikeMoving(u8, u16); static u8 CheckForPlayerAvatarCollision(u8); static u8 sub_808B028(u8); -static u8 sub_808B164(struct EventObject *, s16, s16, u8, u8); +static u8 sub_808B164(struct ObjectEvent *, s16, s16, u8, u8); static bool8 CanStopSurfing(s16, s16, u8); static bool8 ShouldJumpLedge(s16, s16, u8); static bool8 TryPushBoulder(s16, s16, u8); static void CheckAcroBikeCollision(s16, s16, u8, u8 *); static void DoPlayerAvatarTransition(void); -static void PlayerAvatarTransition_Dummy(struct EventObject *a); -static void PlayerAvatarTransition_Normal(struct EventObject *a); -static void PlayerAvatarTransition_MachBike(struct EventObject *a); -static void PlayerAvatarTransition_AcroBike(struct EventObject *a); -static void PlayerAvatarTransition_Surfing(struct EventObject *a); -static void PlayerAvatarTransition_Underwater(struct EventObject *a); -static void PlayerAvatarTransition_ReturnToField(struct EventObject *a); +static void PlayerAvatarTransition_Dummy(struct ObjectEvent *a); +static void PlayerAvatarTransition_Normal(struct ObjectEvent *a); +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *a); +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *a); +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *a); +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *a); static bool8 player_is_anim_in_certain_ranges(void); static bool8 sub_808B618(void); @@ -96,24 +96,24 @@ static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8); static void PlayCollisionSoundIfNotFacingWarp(u8 a); -static void sub_808C280(struct EventObject *); +static void sub_808C280(struct ObjectEvent *); static void StartStrengthAnim(u8, u8); static void Task_BumpBoulder(u8 taskId); -static u8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); -static u8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); -static u8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject); +static u8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); +static u8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); +static u8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject); static void DoPlayerMatJump(void); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject); +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent); static void DoPlayerMatSpin(void); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject); -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject); +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent); +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent); static void CreateStopSurfingTask(u8); static void Task_StopSurfingInit(u8 taskId); @@ -138,7 +138,7 @@ static u8 Fishing15(struct Task *task); static u8 Fishing16(struct Task *task); static void AlignFishingAnimationFrames(void); -static u8 sub_808D38C(struct EventObject *object, s16 *a1); +static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1); // .rodata @@ -211,7 +211,7 @@ static const u8 sAcroBikeTrickCollisionTypes[] = { COLLISION_HORIZONTAL_RAIL, }; -static void (*const gUnknown_084974B8[])(struct EventObject *) = +static void (*const gUnknown_084974B8[])(struct ObjectEvent *) = { PlayerAvatarTransition_Normal, PlayerAvatarTransition_MachBike, @@ -287,19 +287,19 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of MetatileBehavior_IsEastArrowWarp, }; -static bool8 (*const gUnknown_08497530[])(struct Task *, struct EventObject *, struct EventObject *) = +static bool8 (*const gUnknown_08497530[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) = { sub_808C3A4, do_boulder_dust, sub_808C484, }; -static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) = +static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_DoSecretBaseMatJump, }; -static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct EventObject *) = +static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct ObjectEvent *) = { PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep1, @@ -311,23 +311,23 @@ static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *, struct Eve void MovementType_Player(struct Sprite *sprite) { - UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, EventObjectCB2_NoMovement2); + UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2); } -static u8 EventObjectCB2_NoMovement2(void) +static u8 ObjectEventCB2_NoMovement2(void) { return 0; } void player_step(u8 direction, u16 newKeys, u16 heldKeys) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; sub_808C280(playerEventObj); if (gPlayerAvatar.preventStep == FALSE) { Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys); - if (TryInterruptEventObjectSpecialAnim(playerEventObj, direction) == 0) + if (TryInterruptObjectEventSpecialAnim(playerEventObj, direction) == 0) { npc_clear_strange_bits(playerEventObj); DoPlayerAvatarTransition(); @@ -340,16 +340,16 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys) } } -static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventObj, u8 direction) +static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent *playerEventObj, u8 direction) { u8 r5 = direction; u8 r6 = direction; r6++; r6--; - if (EventObjectIsMovementOverridden(playerEventObj) - && !EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerEventObj) + && !ObjectEventClearHeldMovementIfFinished(playerEventObj)) { - u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj); + u8 heldMovementActionId = ObjectEventGetHeldMovementActionId(playerEventObj); if (heldMovementActionId > MOVEMENT_ACTION_WALK_FAST_RIGHT && heldMovementActionId < MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN) { if (direction == DIR_NONE) @@ -359,13 +359,13 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO if (playerEventObj->movementDirection != r5) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerEventObj); return FALSE; } if (!sub_808B028(r6)) { - EventObjectClearHeldMovement(playerEventObj); + ObjectEventClearHeldMovement(playerEventObj); return FALSE; } } @@ -376,11 +376,11 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO return FALSE; } -static void npc_clear_strange_bits(struct EventObject *eventObj) +static void npc_clear_strange_bits(struct ObjectEvent *objEvent) { - eventObj->inanimate = 0; - eventObj->disableAnim = 0; - eventObj->facingDirectionLocked = 0; + objEvent->inanimate = 0; + objEvent->disableAnim = 0; + objEvent->facingDirectionLocked = 0; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH; } @@ -410,7 +410,7 @@ static u8 GetForcedMovementByMetatileBehavior(void) if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5)) { - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; for (i = 0; i < 18; i++) { @@ -425,11 +425,11 @@ static bool8 ForcedMovement_None(void) { if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->facingDirectionLocked = 0; playerEventObj->enableAnim = 1; - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6; } return FALSE; @@ -467,7 +467,7 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8)) static u8 DoForcedMovementInCurrentDirection(void (*a)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->disableAnim = 1; return DoForcedMovement(playerEventObj->movementDirection, a); @@ -520,7 +520,7 @@ static bool8 ForcedMovement_PushedEastByCurrent(void) u8 ForcedMovement_Slide(u8 direction, void (*b)(u8)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; playerEventObj->disableAnim = 1; playerEventObj->facingDirectionLocked = 1; @@ -561,7 +561,7 @@ static bool8 ForcedMovement_0xBC(void) static bool8 ForcedMovement_MuddySlope(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3) { @@ -642,7 +642,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) } if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) - && IsRunningDisallowed(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) == 0) + && IsRunningDisallowed(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) == 0) { PlayerRun(direction); gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH; @@ -657,18 +657,18 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys) static u8 CheckForPlayerAvatarCollision(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; x = playerEventObj->currentCoords.x; y = playerEventObj->currentCoords.y; MoveCoords(direction, &x, &y); - return CheckForEventObjectCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); + return CheckForObjectEventCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } static u8 sub_808B028(u8 direction) { s16 x, y; - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; x = playerEventObj->currentCoords.x; y = playerEventObj->currentCoords.y; @@ -676,9 +676,9 @@ static u8 sub_808B028(u8 direction) return sub_808B164(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y)); } -u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) +u8 CheckForObjectEventCollision(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); + u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); if (collision == COLLISION_ELEVATION_MISMATCH && CanStopSurfing(x, y, direction)) return COLLISION_STOP_SURFING; @@ -699,9 +699,9 @@ u8 CheckForEventObjectCollision(struct EventObject *eventObject, s16 x, s16 y, u return collision; } -static u8 sub_808B164(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatileBehavior) +static u8 sub_808B164(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction, u8 metatileBehavior) { - u8 collision = GetCollisionAtCoords(eventObject, x, y, direction); + u8 collision = GetCollisionAtCoords(objectEvent, x, y, direction); if (collision == COLLISION_NONE) { @@ -716,7 +716,7 @@ static bool8 CanStopSurfing(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) + && GetObjectEventIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) { CreateStopSurfingTask(direction); return TRUE; @@ -739,17 +739,17 @@ static bool8 TryPushBoulder(s16 x, s16 y, u8 direction) { if (FlagGet(FLAG_SYS_USE_STRENGTH)) { - u8 eventObjectId = GetEventObjectIdByXY(x, y); + u8 objectEventId = GetObjectEventIdByXY(x, y); - if (eventObjectId != 16 && gEventObjects[eventObjectId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) + if (objectEventId != 16 && gObjectEvents[objectEventId].graphicsId == EVENT_OBJ_GFX_PUSHABLE_BOULDER) { - x = gEventObjects[eventObjectId].currentCoords.x; - y = gEventObjects[eventObjectId].currentCoords.y; + x = gObjectEvents[objectEventId].currentCoords.x; + y = gObjectEvents[objectEventId].currentCoords.y; MoveCoords(direction, &x, &y); - if (GetCollisionAtCoords(&gEventObjects[eventObjectId], x, y, direction) == COLLISION_NONE + if (GetCollisionAtCoords(&gObjectEvents[objectEventId], x, y, direction) == COLLISION_NONE && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(x, y)) == 0) { - StartStrengthAnim(eventObjectId, direction); + StartStrengthAnim(objectEventId, direction); return TRUE; } } @@ -774,21 +774,21 @@ static void CheckAcroBikeCollision(s16 x, s16 y, u8 metatileBehavior, u8 *collis bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) { u8 mewObjectId; - struct EventObject *object; + struct ObjectEvent *object; s16 playerX; s16 playerY; s16 mewPrevX; - object = &gEventObjects[gPlayerAvatar.eventObjectId]; + object = &gObjectEvents[gPlayerAvatar.objectEventId]; playerX = object->currentCoords.x; playerY = object->currentCoords.y; MoveCoords(direction, &playerX, &playerY); - mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); + mewObjectId = GetObjectEventIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); if (mewObjectId == EVENT_OBJECTS_COUNT) return FALSE; - object = &gEventObjects[mewObjectId]; + object = &gObjectEvents[mewObjectId]; mewPrevX = object->previousCoords.x; if (mewPrevX == playerX) @@ -821,65 +821,65 @@ static void DoPlayerAvatarTransition(void) for (i = 0; i < 8; i++, flags >>= 1) { if (flags & 1) - gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]); + gUnknown_084974B8[i](&gObjectEvents[gPlayerAvatar.objectEventId]); } gPlayerAvatar.unk1 = 0; } } -static void PlayerAvatarTransition_Dummy(struct EventObject *eventObj) +static void PlayerAvatarTransition_Dummy(struct ObjectEvent *objEvent) { } -static void PlayerAvatarTransition_Normal(struct EventObject *eventObj) +static void PlayerAvatarTransition_Normal(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); } -static void PlayerAvatarTransition_MachBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_MachBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE); BikeClearState(0, 0); } -static void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj) +static void PlayerAvatarTransition_AcroBike(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE); BikeClearState(0, 0); Bike_HandleBumpySlopeJump(); } -static void PlayerAvatarTransition_Surfing(struct EventObject *eventObj) +static void PlayerAvatarTransition_Surfing(struct ObjectEvent *objEvent) { u8 spriteId; - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING); - gFieldEffectArguments[0] = eventObj->currentCoords.x; - gFieldEffectArguments[1] = eventObj->currentCoords.y; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; + gFieldEffectArguments[0] = objEvent->currentCoords.x; + gFieldEffectArguments[1] = objEvent->currentCoords.y; + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; spriteId = FieldEffectStart(FLDEFF_SURF_BLOB); - eventObj->fieldEffectSpriteId = spriteId; + objEvent->fieldEffectSpriteId = spriteId; sub_81555AC(spriteId, 1); } -static void PlayerAvatarTransition_Underwater(struct EventObject *eventObj) +static void PlayerAvatarTransition_Underwater(struct ObjectEvent *objEvent) { - EventObjectSetGraphicsId(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); - EventObjectTurn(eventObj, eventObj->movementDirection); + ObjectEventSetGraphicsId(objEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER)); + ObjectEventTurn(objEvent, objEvent->movementDirection); SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER); - eventObj->fieldEffectSpriteId = sub_8155800(eventObj->spriteId); + objEvent->fieldEffectSpriteId = sub_8155800(objEvent->spriteId); } -static void PlayerAvatarTransition_ReturnToField(struct EventObject *eventObj) +static void PlayerAvatarTransition_ReturnToField(struct ObjectEvent *objEvent) { gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5; } @@ -904,7 +904,7 @@ void sub_808B578(void) static bool8 player_is_anim_in_certain_ranges(void) { - u8 movementActionId = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId; + u8 movementActionId = gObjectEvents[gPlayerAvatar.objectEventId].movementActionId; if (movementActionId <= MOVEMENT_ACTION_FACE_RIGHT || (movementActionId >= MOVEMENT_ACTION_DELAY_1 && movementActionId <= MOVEMENT_ACTION_DELAY_16) @@ -926,27 +926,27 @@ static bool8 sub_808B618(void) static bool8 PlayerIsAnimActive(void) { - return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventIsMovementOverridden(&gObjectEvents[gPlayerAvatar.objectEventId]); } static bool8 PlayerCheckIfAnimFinishedOrInactive(void) { - return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]); + return ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]); } static void PlayerSetCopyableMovement(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a; + gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement = a; } u8 PlayerGetCopyableMovement(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement; + return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement; } static void sub_808B6BC(u8 a) { - EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a); + ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a); } void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) @@ -954,7 +954,7 @@ void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement) if (!PlayerIsAnimActive()) { PlayerSetCopyableMovement(copyableMovement); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId); } } @@ -1029,7 +1029,7 @@ void sub_808B864(void) if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING) { if (player_should_look_direction_be_enforced_upon_movement()) - sub_808B6BC(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection)); + sub_808B6BC(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection)); } } @@ -1103,7 +1103,7 @@ void sub_808B9D4(u8 direction) static void PlayCollisionSoundIfNotFacingWarp(u8 a) { s16 x, y; - u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior; + u8 metatileBehavior = gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior; if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior)) { @@ -1120,20 +1120,20 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a) void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; MoveCoords(GetPlayerFacingDirection(), x, y); } void PlayerGetDestCoords(s16 *x, s16 *y) { - *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + *x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + *y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; } u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2]) { @@ -1168,22 +1168,22 @@ u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) u8 GetPlayerFacingDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].facingDirection; } u8 GetPlayerMovementDirection(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection; + return gObjectEvents[gPlayerAvatar.objectEventId].movementDirection; } u8 PlayerGetZCoord(void) { - return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation; + return gObjectEvents[gPlayerAvatar.objectEventId].previousElevation; } void sub_808BC90(s16 x, s16 y) { - MoveEventObjectToMapCoords(&gEventObjects[gPlayerAvatar.eventObjectId], x, y); + MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y); } u8 TestPlayerAvatarFlags(u8 a) @@ -1208,10 +1208,10 @@ void sub_808BCE8(void) void sub_808BCF4(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; npc_clear_strange_bits(playerEventObj); - SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection); + SetObjectEventDirection(playerEventObj, playerEventObj->facingDirection); if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) { Bike_HandleBumpySlopeJump(); @@ -1307,7 +1307,7 @@ bool8 IsPlayerSurfingNorth(void) bool8 IsPlayerFacingSurfableFishableWater(void) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; s16 x = playerEventObj->currentCoords.x; s16 y = playerEventObj->currentCoords.y; @@ -1366,9 +1366,9 @@ void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b) void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) { - struct EventObjectTemplate playerEventObjTemplate; - u8 eventObjectId; - struct EventObject *eventObject; + struct ObjectEventTemplate playerEventObjTemplate; + u8 objectEventId; + struct ObjectEvent *objectEvent; playerEventObjTemplate.localId = EVENT_OBJ_ID_PLAYER; playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender); @@ -1382,71 +1382,71 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender) 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); + objectEventId = SpawnSpecialObjectEvent(&playerEventObjTemplate); + objectEvent = &gObjectEvents[objectEventId]; + objectEvent->isPlayer = 1; + objectEvent->warpArrowSpriteId = CreateWarpArrowSprite(); + ObjectEventTurn(objectEvent, direction); ClearPlayerAvatarInfo(); gPlayerAvatar.runningState = NOT_MOVING; gPlayerAvatar.tileTransitionState = T_NOT_MOVING; - gPlayerAvatar.eventObjectId = eventObjectId; - gPlayerAvatar.spriteId = eventObject->spriteId; + gPlayerAvatar.objectEventId = objectEventId; + gPlayerAvatar.spriteId = objectEvent->spriteId; gPlayerAvatar.gender = gender; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT); } void sub_808C0A8(u8 a) { - gEventObjects[gPlayerAvatar.eventObjectId].invisible = a; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = a; if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) - gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a; + gSprites[gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId].invisible = a; } void sub_808C114(void) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); } void sub_808C15C(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction)); } void sub_808C1B4(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction)); SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1); } void sub_808C228(u8 direction) { - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING)); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction)); } -static void sub_808C280(struct EventObject *eventObject) +static void sub_808C280(struct ObjectEvent *objectEvent) { s16 x; s16 y; u8 direction; - u8 metatileBehavior = eventObject->currentMetatileBehavior; + u8 metatileBehavior = objectEvent->currentMetatileBehavior; for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++) { - if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection) + if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection) { - x = eventObject->currentCoords.x; - y = eventObject->currentCoords.y; + x = objectEvent->currentCoords.x; + y = objectEvent->currentCoords.y; MoveCoords(direction, &x, &y); - ShowWarpArrowSprite(eventObject->warpArrowSpriteId, direction, x, y); + ShowWarpArrowSprite(objectEvent->warpArrowSpriteId, direction, x, y); return; } } - SetSpriteInvisible(eventObject->warpArrowSpriteId); + SetSpriteInvisible(objectEvent->warpArrowSpriteId); } /* Strength */ @@ -1463,12 +1463,12 @@ static void StartStrengthAnim(u8 a, u8 b) static void Task_BumpBoulder(u8 taskId) { while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId], - &gEventObjects[gPlayerAvatar.eventObjectId], - &gEventObjects[gTasks[taskId].data[1]])) + &gObjectEvents[gPlayerAvatar.objectEventId], + &gObjectEvents[gTasks[taskId].data[1]])) ; } -static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1476,25 +1476,25 @@ static bool8 sub_808C3A4(struct Task *task, struct EventObject *playerObject, st return FALSE; } -static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectIsHeldMovementActive(playerObject)) + if (ObjectEventIsHeldMovementActive(playerObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(playerObject); } - if (EventObjectIsHeldMovementActive(strengthObject)) + if (ObjectEventIsHeldMovementActive(strengthObject)) { - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); } - if (!EventObjectIsMovementOverridden(playerObject) - && !EventObjectIsMovementOverridden(strengthObject)) + if (!ObjectEventIsMovementOverridden(playerObject) + && !ObjectEventIsMovementOverridden(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); - EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); - EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); + ObjectEventSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2])); + ObjectEventSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2])); gFieldEffectArguments[0] = strengthObject->currentCoords.x; gFieldEffectArguments[1] = strengthObject->currentCoords.y; gFieldEffectArguments[2] = strengthObject->previousElevation; @@ -1506,13 +1506,13 @@ static bool8 do_boulder_dust(struct Task *task, struct EventObject *playerObject return FALSE; } -static bool8 sub_808C484(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject) +static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject) { - if (EventObjectCheckHeldMovementStatus(playerObject) - && EventObjectCheckHeldMovementStatus(strengthObject)) + if (ObjectEventCheckHeldMovementStatus(playerObject) + && ObjectEventCheckHeldMovementStatus(strengthObject)) { - EventObjectClearHeldMovementIfFinished(playerObject); - EventObjectClearHeldMovementIfFinished(strengthObject); + ObjectEventClearHeldMovementIfFinished(playerObject); + ObjectEventClearHeldMovementIfFinished(strengthObject); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroyTask(FindTaskIdByFunc(Task_BumpBoulder)); @@ -1529,18 +1529,18 @@ static void DoPlayerMatJump(void) static void DoPlayerAvatarSecretBaseMatJump(u8 taskId) { - while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } // because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump. -static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject) +static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent *objectEvent) { gPlayerAvatar.preventStep = TRUE; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { PlaySE(SE_DANSA); - EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) { @@ -1563,29 +1563,29 @@ static void DoPlayerMatSpin(void) static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId) { - while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])) + while (sPlayerAvatarSecretBaseMatSpin[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])) ; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent *objectEvent) { task->data[0]++; - task->data[1] = eventObject->movementDirection; + task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); return TRUE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent *objectEvent) { u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { u8 direction; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(direction = directions[objectEvent->movementDirection - 1])); if (direction == (u8)task->data[1]) task->data[2]++; task->data[0]++; @@ -1595,7 +1595,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct Event return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent *objectEvent) { const u8 actions[] = { MOVEMENT_ACTION_DELAY_1, @@ -1605,19 +1605,19 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct Event MOVEMENT_ACTION_DELAY_8, }; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, actions[task->data[2]]); + ObjectEventSetHeldMovement(objectEvent, actions[task->data[2]]); task->data[0] = 1; } return FALSE; } -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct EventObject *eventObject) +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent *objectEvent) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1]))); ScriptContext2_Disable(); gPlayerAvatar.preventStep = FALSE; DestroyTask(FindTaskIdByFunc(PlayerAvatar_DoSecretBaseMatSpin)); @@ -1642,26 +1642,26 @@ static void CreateStopSurfingTask(u8 direction) static void Task_StopSurfingInit(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectIsMovementOverridden(playerEventObj)) + if (ObjectEventIsMovementOverridden(playerEventObj)) { - if (!EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventClearHeldMovementIfFinished(playerEventObj)) return; } sub_81555AC(playerEventObj->fieldEffectSpriteId, 2); - EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); + ObjectEventSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = Task_WaitStopSurfing; } static void Task_WaitStopSurfing(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) { - EventObjectSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); - EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); + ObjectEventSetGraphicsId(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL)); + ObjectEventSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection)); gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]); @@ -1729,15 +1729,15 @@ static bool8 Fishing1(struct Task *task) static bool8 Fishing2(struct Task *task) { - struct EventObject *playerEventObj; + struct ObjectEvent *playerEventObj; 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); + task->tPlayerGfxId = gObjectEvents[gPlayerAvatar.objectEventId].graphicsId; + playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(playerEventObj); playerEventObj->enableAnim = 1; sub_808C15C(playerEventObj->facingDirection); task->tStep++; @@ -1928,12 +1928,12 @@ static bool8 Fishing11(struct Task *task) { if (!IsTextPrinterActive(0)) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId); + ObjectEventTurn(playerEventObj, playerEventObj->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; ClearDialogWindowAndFrame(0, TRUE); @@ -1988,12 +1988,12 @@ static bool8 Fishing15(struct Task *task) AlignFishingAnimationFrames(); if (gSprites[gPlayerAvatar.spriteId].animEnded) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - EventObjectSetGraphicsId(playerEventObj, task->tPlayerGfxId); - EventObjectTurn(playerEventObj, playerEventObj->movementDirection); + ObjectEventSetGraphicsId(playerEventObj, task->tPlayerGfxId); + ObjectEventTurn(playerEventObj, playerEventObj->movementDirection); if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 0, 0); gSprites[gPlayerAvatar.spriteId].pos2.x = 0; gSprites[gPlayerAvatar.spriteId].pos2.y = 0; task->tStep++; @@ -2008,7 +2008,7 @@ static bool8 Fishing16(struct Task *task) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ClearDialogWindowAndFrame(0, TRUE); sub_80ED950(0); DestroyTask(FindTaskIdByFunc(Task_Fishing)); @@ -2052,7 +2052,7 @@ static void AlignFishingAnimationFrames(void) if (animType == 10 || animType == 11) playerSprite->pos2.y = 8; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - sub_8155604(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y); + sub_8155604(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } void sub_808D074(u8 a0) @@ -2071,14 +2071,14 @@ static u8 sub_808D080(void) static void sub_808D094(u8 taskId) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; switch (data[0]) { case 0: - if (!EventObjectClearHeldMovementIfFinished(object)) + if (!ObjectEventClearHeldMovementIfFinished(object)) { return; } @@ -2136,7 +2136,7 @@ static const u8 gUnknown_084975BC[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, static void sub_808D1FC(u8 taskId) { - struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; @@ -2144,7 +2144,7 @@ static void sub_808D1FC(u8 taskId) { case 0: data[5] = sub_808D080(); - EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); data[1] = 0; data[2] = 116; data[4] = sprite->pos1.y; @@ -2195,19 +2195,19 @@ static void sub_808D1FC(u8 taskId) } } -static u8 sub_808D38C(struct EventObject *object, s16 *a1) +static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1) { if (*a1 < 8 && ++(*a1) < 8) { return object->facingDirection; } - if (!EventObjectCheckHeldMovementStatus(object)) + if (!ObjectEventCheckHeldMovementStatus(object)) { return object->facingDirection; } - EventObjectForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); *a1 = 0; return gUnknown_084975BC[object->facingDirection]; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 076859c285..05922e98cd 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -327,7 +327,7 @@ static void sub_80AF438(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); task->data[0] = 1; @@ -335,27 +335,27 @@ static void sub_80AF438(u8 taskId) case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); task->data[0] = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 4; } break; @@ -376,24 +376,24 @@ static void task_map_chg_seq_0807E20C(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); task->data[0] = 1; break; case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 3; } break; @@ -409,14 +409,14 @@ static void task_map_chg_seq_0807E2CC(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); gTasks[taskId].data[0]++; break; case 1: if (WaitForWeatherFadeIn()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -452,7 +452,7 @@ static void task_mpl_807E3C8(u8 taskId) { ScriptContext2_Disable(); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); } } @@ -560,7 +560,7 @@ void DoMossdeepGymWarp(void) { sub_8085540(1); ScriptContext2_Enable(); - SaveEventObjects(); + SaveObjectEvents(); TryFadeOutOldMapMusic(); WarpFadeScreen(); PlaySE(SE_TK_WARPIN); @@ -650,7 +650,7 @@ static void sub_80AFA0C(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -683,7 +683,7 @@ static void sub_80AFA88(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); @@ -692,21 +692,21 @@ static void sub_80AFA88(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + u8 objEventId; + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); sub_80AF0F4(0); task->data[0] = 3; } @@ -734,7 +734,7 @@ static void task0A_fade_n_map_maybe(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -1001,7 +1001,7 @@ static void task0A_mpl_807E31C(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); sub_808D194(); gTasks[taskId].data[0]++; @@ -1009,7 +1009,7 @@ static void task0A_mpl_807E31C(u8 taskId) case 1: if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -1024,7 +1024,7 @@ static void sub_80B01BC(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); sub_808D1C8(); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 439b1855a5..7e092d7484 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -326,7 +326,7 @@ void Task_HandlePorthole(u8 taskId) static void ShowSSTidalWhileSailing(void) { - u8 spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); + u8 spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_SS_TIDAL, SpriteCallbackDummy, 112, 80, 0); gSprites[spriteId].coordOffsetEnabled = FALSE; @@ -339,7 +339,7 @@ static void ShowSSTidalWhileSailing(void) void sub_80FB768(void) { ShowSSTidalWhileSailing(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; pal_fill_black(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); diff --git a/src/field_specials.c b/src/field_specials.c index 830c2246d8..37479b111f 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -87,17 +87,17 @@ static EWRAM_DATA u32 sUnknown_0203AB70 = 0; struct ListMenuTemplate gScrollableMultichoice_ListMenuTemplate; -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; void TryLoseFansFromPlayTime(void); void SetPlayerGotFirstFans(void); u16 GetNumFansOfPlayerInTrainerFanClub(void); static void RecordCyclingRoadResults(u32, u8); -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum); static void Task_PetalburgGymSlideOpenRoomDoors(u8 taskId); static void PetalburgGymSetDoorMetatiles(u8 roomNumber, u16 metatileId); static void Task_PCTurnOnEffect(u8); @@ -521,7 +521,7 @@ u8 GetLinkPartnerNames(void) return nLinkPlayers; } -void SpawnLinkPartnerEventObject(void) +void SpawnLinkPartnerObjectEvent(void) { u8 j = 0; s16 x = 0; @@ -592,8 +592,8 @@ void SpawnLinkPartnerEventObject(void) linkSpriteId = EVENT_OBJ_GFX_RIVAL_MAY_NORMAL; break; } - SpawnSpecialEventObjectParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); - LoadLinkPartnerEventObjectSpritePalette(linkSpriteId, 240 - i, i); + SpawnSpecialObjectEventParameterized(linkSpriteId, movementTypes[j], 240 - i, coordOffsets[j][0] + x + 7, coordOffsets[j][1] + y + 7, 0); + LoadLinkPartnerObjectEventSpritePalette(linkSpriteId, 240 - i, i); j++; if (j == MAX_LINK_PLAYERS) { @@ -603,7 +603,7 @@ void SpawnLinkPartnerEventObject(void) } } -static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) +static void LoadLinkPartnerObjectEventSpritePalette(u8 graphicsId, u8 localEventId, u8 paletteNum) { u8 adjustedPaletteNum; // Note: This temp var is necessary; paletteNum += 6 doesn't match. @@ -613,26 +613,26 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent graphicsId == EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL || graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) { - u8 obj = GetEventObjectIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + u8 obj = GetObjectEventIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); if (obj != EVENT_OBJECTS_COUNT) { - u8 spriteId = gEventObjects[obj].spriteId; + u8 spriteId = gObjectEvents[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; sprite->oam.paletteNum = adjustedPaletteNum; switch (graphicsId) { case EVENT_OBJ_GFX_LINK_RS_BRENDAN: - LoadPalette(gEventObjectPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette33, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_LINK_RS_MAY: - LoadPalette(gEventObjectPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette34, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL: - LoadPalette(gEventObjectPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette8, 0x100 + (adjustedPaletteNum << 4), 0x20); break; case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL: - LoadPalette(gEventObjectPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); + LoadPalette(gObjectEventPalette17, 0x100 + (adjustedPaletteNum << 4), 0x20); break; } } @@ -1304,15 +1304,15 @@ void IsGrassTypeInParty(void) void SpawnCameraObject(void) { - u8 obj = SpawnSpecialEventObjectParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); - gEventObjects[obj].invisible = TRUE; - CameraObjectSetFollowedObjectId(gEventObjects[obj].spriteId); + u8 obj = SpawnSpecialObjectEventParameterized(EVENT_OBJ_GFX_BOY_1, MOVEMENT_TYPE_FACE_DOWN, EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3); + gObjectEvents[obj].invisible = TRUE; + CameraObjectSetFollowedObjectId(gObjectEvents[obj].spriteId); } void RemoveCameraObject(void) { CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); - RemoveEventObjectByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(EVENT_OBJ_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } u8 GetPokeblockNameByMonNature(void) @@ -1585,9 +1585,9 @@ u16 ScriptGetPartyMonSpecies(void) } // Removed for Emerald -void TryInitBattleTowerAwardManEventObject(void) +void TryInitBattleTowerAwardManObjectEvent(void) { - //TryInitLocalEventObject(6); + //TryInitLocalObjectEvent(6); } u16 GetDaysUntilPacifidlogTMAvailable(void) @@ -3433,9 +3433,9 @@ static void Task_DeoxysRockInteraction(u8 taskId) static void ChangeDeoxysRockLevel(u8 rockLevel) { - u8 eventObjectId; + u8 objectEventId; LoadPalette(&sDeoxysRockPalettes[rockLevel], 0x1A0, 8); - TryGetEventObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); + TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); if (rockLevel == 0) PlaySE(SE_W109); diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index fe21ff060b..f0d4e46b35 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -580,7 +580,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite) FieldEffectStop(&gSprites[sCutGrassSpriteArrayPtr[0]], FLDEFF_CUT_GRASS); FREE_AND_SET_NULL(sCutGrassSpriteArrayPtr); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); if (IsMewPlayingHideAndSeek() == TRUE) diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 591f61eb70..8bb10685e9 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -317,7 +317,7 @@ static const struct SpriteTemplate gUnknown_0858E880 = { .tileTag = 0xFFFF, .paletteTag = 0x1000, - .oam = &gEventObjectBaseOam_32x8, + .oam = &gObjectEventBaseOam_32x8, .anims = gSpriteAnimTable_858E87C, .images = gUnknown_0858E84C, .affineAnims = gDummySpriteAffineAnimTable, @@ -1002,8 +1002,8 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite) void DoSecretBaseGlitterMatSparkle(void) { - s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x; - s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y; + s16 x = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.x; + s16 y = gObjectEvents[gPlayerAvatar.objectEventId].currentCoords.y; u8 spriteId; sub_80930E0(&x, &y, 8, 4); @@ -1229,27 +1229,27 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId) static void Task_WateringBerryTreeAnim_1(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerEventObj) - || EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (!ObjectEventIsMovementOverridden(playerEventObj) + || ObjectEventClearHeldMovementIfFinished(playerEventObj)) { sub_808C228(GetPlayerFacingDirection()); - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); gTasks[taskId].func = Task_WateringBerryTreeAnim_2; } } static void Task_WateringBerryTreeAnim_2(u8 taskId) { - struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerEventObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (EventObjectClearHeldMovementIfFinished(playerEventObj)) + if (ObjectEventClearHeldMovementIfFinished(playerEventObj)) { s16 value = gTasks[taskId].data[1]++; if (value < 10) - EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); else gTasks[taskId].func = Task_WateringBerryTreeAnim_3; diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 18cebdf112..cf806b55ee 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -30,18 +30,18 @@ static void sub_8135714(void); // text bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) { - u8 eventObjId; + u8 objEventId; GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); gPlayerFacingPosition.height = PlayerGetZCoord(); - eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); - if (gEventObjects[eventObjId].graphicsId != graphicsId) + objEventId = GetObjectEventIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height); + if (gObjectEvents[objEventId].graphicsId != graphicsId) { return FALSE; } else { - gSpecialVar_LastTalked = gEventObjects[eventObjId].localId; + gSpecialVar_LastTalked = gObjectEvents[objEventId].localId; return TRUE; } } @@ -54,13 +54,13 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { - u8 eventObjId; + u8 objEventId; ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; - eventObjId = gPlayerAvatar.eventObjectId; - if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId]) - || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + objEventId = gPlayerAvatar.objectEventId; + if (!ObjectEventIsMovementOverridden(&gObjectEvents[objEventId]) + || ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) { if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) { @@ -70,7 +70,7 @@ static void task08_080C9820(u8 taskId) else { sub_808C114(); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); gTasks[taskId].func = sub_813552C; } } @@ -78,7 +78,7 @@ static void task08_080C9820(u8 taskId) static void sub_813552C(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE) { FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); gTasks[taskId].func = sub_8135578; @@ -98,7 +98,7 @@ static void sub_8135578(u8 taskId) gFieldEffectArguments[2] = 2; if (gFieldEffectArguments[1] == 4) gFieldEffectArguments[2] = 3; - EventObjectSetGraphicsId(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState()); + ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState()); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]); FieldEffectActiveListRemove(6); gTasks[taskId].func = sub_813561C; diff --git a/src/frontier_util.c b/src/frontier_util.c index baf830af99..032bce198c 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -71,7 +71,7 @@ static void sub_81A43A8(void); static void sub_81A4410(void); static void BufferFrontierTrainerName(void); static void sub_81A447C(void); -static void SetFacilityBrainEventObject(void); +static void SetFacilityBrainObjectEvent(void); static void ShowTowerResultsWindow(u8); static void ShowDomeResultsWindow(u8); static void ShowPalaceResultsWindow(u8); @@ -626,7 +626,7 @@ static void (* const sFrontierUtilFuncs[])(void) = [FRONTIER_UTIL_FUNC_19] = sub_81A4410, [FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME] = BufferFrontierTrainerName, [FRONTIER_UTIL_FUNC_21] = sub_81A447C, - [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainEventObject, + [FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT] = SetFacilityBrainObjectEvent, }; static const struct WindowTemplate gUnknown_08611C74 = @@ -2199,7 +2199,7 @@ static void sub_81A447C(void) } } -static void SetFacilityBrainEventObject(void) +static void SetFacilityBrainObjectEvent(void) { SetFrontierBrainEventObjGfx(VarGet(VAR_FRONTIER_FACILITY)); } diff --git a/src/item_menu.c b/src/item_menu.c index 40a0f0439f..9d8010f85f 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1891,7 +1891,7 @@ bool8 UseRegisteredKeyItemOnField(void) if (CheckBagHasItem(gSaveBlock1Ptr->registeredItem, 1) == TRUE) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem; diff --git a/src/item_use.c b/src/item_use.c index a777bb2ec9..e0917b8099 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -176,7 +176,7 @@ void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId) { ClearDialogWindowAndFrame(0, 1); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } @@ -231,7 +231,7 @@ void ItemUseOnFieldCB_Bike(u8 taskId) GetOnOffBike(2); else GetOnOffBike(4); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -337,7 +337,7 @@ void sub_80FD504(u8 taskId) void sub_80FD5CC(u8 taskId) { ClearDialogWindowAndFrame(0, 1); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -558,15 +558,15 @@ u8 sub_80FD9B0(s16 itemX, s16 itemY) void sub_80FDA24(u8 direction) { - EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); - UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + ObjectEventClearHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); + UnfreezeObjectEvent(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]); PlayerTurnInPlace(direction); } void sub_80FDA94(u8 taskId) { - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE) DisplayItemMessageOnField(taskId, gText_ItemFinderNearby, sub_80FD5CC); } @@ -574,7 +574,7 @@ void sub_80FDADC(u8 taskId) { s16 *data = gTasks[taskId].data; - if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE + if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0)]) == TRUE || data[2] == FALSE) { sub_80FDA24(gUnknown_085920E4[data[5]]); @@ -706,8 +706,8 @@ bool8 TryToWaterSudowoodo(void) u8 objId; GetXYCoordsOneStepInFrontOfPlayer(&x, &y); z = PlayerGetZCoord(); - objId = GetEventObjectIdByXYZ(x, y, z); - if (objId == EVENT_OBJECTS_COUNT || gEventObjects[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) + objId = GetObjectEventIdByXYZ(x, y, z); + if (objId == EVENT_OBJECTS_COUNT || gObjectEvents[objId].graphicsId != EVENT_OBJ_GFX_SUDOWOODO) return FALSE; else return TRUE; diff --git a/src/load_save.c b/src/load_save.c index 24dfda20cb..5b02e4cc54 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -181,32 +181,32 @@ void LoadPlayerParty(void) gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i]; } -void SaveEventObjects(void) +void SaveObjectEvents(void) { int i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gSaveBlock1Ptr->eventObjects[i] = gEventObjects[i]; + gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i]; } -void LoadEventObjects(void) +void LoadObjectEvents(void) { int i; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) - gEventObjects[i] = gSaveBlock1Ptr->eventObjects[i]; + gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i]; } void SaveSerializedGame(void) { SavePlayerParty(); - SaveEventObjects(); + SaveObjectEvents(); } void LoadSerializedGame(void) { LoadPlayerParty(); - LoadEventObjects(); + LoadObjectEvents(); } void LoadPlayerBag(void) diff --git a/src/match_call.c b/src/match_call.c index 646b14cea7..1fc5520d95 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1114,7 +1114,7 @@ static void StartMatchCall(void) if (!gMatchCallState.triggeredFromScript) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -1288,10 +1288,10 @@ static bool32 sub_81963F0(u8 taskId) if (!gMatchCallState.triggeredFromScript) { sub_81973A4(); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/mevent_client.c b/src/mevent_client.c index 659b772df4..9a62bf18ed 100644 --- a/src/mevent_client.c +++ b/src/mevent_client.c @@ -216,7 +216,7 @@ static u32 mainseq_4(struct mevent_client * svr) sub_801B508(svr->recvBuffer); break; case 17: - InitRamScript_NoEventObject(svr->recvBuffer, 1000); + InitRamScript_NoObjectEvent(svr->recvBuffer, 1000); break; case 18: memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, svr->recvBuffer, 0xbc); diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 0c2b8ce744..66a7990052 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -346,16 +346,16 @@ void StartPlayerDescendMirageTower(void) static void PlayerDescendMirageTower(u8 taskId) { - u8 eventObjectId; - struct EventObject *fakePlayerEventObject; - struct EventObject *playerEventObject; + u8 objectEventId; + struct ObjectEvent *fakePlayerObjectEvent; + struct ObjectEvent *playerObjectEvent; - TryGetEventObjectIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - fakePlayerEventObject = &gEventObjects[eventObjectId]; - gSprites[fakePlayerEventObject->spriteId].pos2.y += 4; - playerEventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((gSprites[fakePlayerEventObject->spriteId].pos1.y + gSprites[fakePlayerEventObject->spriteId].pos2.y) >= - (gSprites[playerEventObject->spriteId].pos1.y + gSprites[playerEventObject->spriteId].pos2.y)) + TryGetObjectEventIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + fakePlayerObjectEvent = &gObjectEvents[objectEventId]; + gSprites[fakePlayerObjectEvent->spriteId].pos2.y += 4; + playerObjectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((gSprites[fakePlayerObjectEvent->spriteId].pos1.y + gSprites[fakePlayerObjectEvent->spriteId].pos2.y) >= + (gSprites[playerObjectEvent->spriteId].pos1.y + gSprites[playerObjectEvent->spriteId].pos2.y)) { DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/naming_screen.c b/src/naming_screen.c index 73eda32c83..c140e328e0 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1172,7 +1172,7 @@ static void NamingScreen_CreatePlayerIcon(void) u8 spriteId; rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gNamingScreenData->monSpecies); - spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(rivalGfxId, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } @@ -1199,7 +1199,7 @@ static void NamingScreen_CreateWandaDadIcon(void) { u8 spriteId; - spriteId = AddPseudoEventObject(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); + spriteId = AddPseudoObjectEvent(EVENT_OBJ_GFX_MAN_1, SpriteCallbackDummy, 0x38, 0x25, 0); gSprites[spriteId].oam.priority = 3; StartSpriteAnim(&gSprites[spriteId], 4); } diff --git a/src/overworld.c b/src/overworld.c index c2e3d27892..65a4a4c721 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -149,15 +149,15 @@ static u8 GetLinkPlayerElevation(u8 linkPlayerId); static s32 sub_80878E4(u8 linkPlayerId); static u8 GetLinkPlayerIdAt(s16 x, s16 y); static void SetPlayerFacingDirection(u8 linkPlayerId, u8 a2); -static void ZeroEventObject(struct EventObject *eventObj); -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4); -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y); +static void ZeroObjectEvent(struct ObjectEvent *objEvent); +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4); +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y); static void sub_80877DC(u8 linkPlayerId, u8 a2); static void sub_808780C(u8 linkPlayerId); static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId); static void sub_8087584(void); static u32 GetLinkSendQueueLength(void); -static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj); +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj); static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *a1); static u16 GetDirectionForEventScript(const u8 *script); static void sub_8087510(void); @@ -217,7 +217,7 @@ EWRAM_DATA static u16 sLastMapSectionId = 0; EWRAM_DATA static struct InitialPlayerAvatarState gInitialPlayerAvatarState = {0}; EWRAM_DATA static u16 sAmbientCrySpecies = 0; EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE; -EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0}; +EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {0}; // const rom data static const struct WarpData sDummyWarpData = @@ -338,23 +338,23 @@ static const struct ScanlineEffectParams sFlashEffectParams = 0, }; -static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); -static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static u8 (*const gLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED }; -static u8 FacingHandler_DoNothing(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *, struct EventObject *, u8); -static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *, struct EventObject *, u8); +static u8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); +static u8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8); // These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. -static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject *, struct EventObject *, u8) = +static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { FacingHandler_DoNothing, FacingHandler_DpadMovement, @@ -369,11 +369,11 @@ static bool8 (*const gLinkPlayerFacingHandlers[])(struct LinkPlayerEventObject * FacingHandler_ForcedFacingChange, }; -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *, struct EventObject *); -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *, struct EventObject *); +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *, struct ObjectEvent *); +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *, struct ObjectEvent *); // These handlers are run after an attempted movement. -static void (*const gMovementStatusHandler[])(struct LinkPlayerEventObject *, struct EventObject *) = +static void (*const gMovementStatusHandler[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) = { // FALSE: MovementStatusHandler_EnterFreeMode, @@ -496,18 +496,18 @@ void ApplyNewEncryptionKeyToGameStats(u32 newKey) void LoadEventObjTemplatesFromHeader(void) { // Clear map object templates - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); // Copy map header events to save block - CpuCopy32(gMapHeader.events->eventObjects, - gSaveBlock1Ptr->eventObjectTemplates, - gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate)); + CpuCopy32(gMapHeader.events->objectEvents, + gSaveBlock1Ptr->objectEventTemplates, + gMapHeader.events->objectEventCount * sizeof(struct ObjectEventTemplate)); } void LoadSaveblockEventObjScripts(void) { - struct EventObjectTemplate *mapHeaderObjTemplates = gMapHeader.events->eventObjects; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *mapHeaderObjTemplates = gMapHeader.events->objectEvents; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; s32 i; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) @@ -517,15 +517,15 @@ void LoadSaveblockEventObjScripts(void) void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y) { s32 i; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { - struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->x = x; - eventObjectTemplate->y = y; + objectEventTemplate->x = x; + objectEventTemplate->y = y; return; } } @@ -535,13 +535,13 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) { s32 i; - struct EventObjectTemplate *savObjTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *savObjTemplates = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { - struct EventObjectTemplate *eventObjectTemplate = &savObjTemplates[i]; - if (eventObjectTemplate->localId == localId) + struct ObjectEventTemplate *objectEventTemplate = &savObjTemplates[i]; + if (objectEventTemplate->localId == localId) { - eventObjectTemplate->movementType = movementType; + objectEventTemplate->movementType = movementType; return; } } @@ -853,9 +853,9 @@ static void mli0_load_map(u32 a1) if (!(sUnknown_020322D8 & 1)) { if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - LoadBattlePyramidEventObjectTemplates(); + LoadBattlePyramidObjectEventTemplates(); else if (InTrainerHill()) - LoadTrainerHillEventObjectTemplates(); + LoadTrainerHillObjectEventTemplates(); else LoadEventObjTemplatesFromHeader(); } @@ -1721,13 +1721,13 @@ void CB2_ContinueSavedGame(void) ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) - LoadBattlePyramidFloorEventObjectScripts(); + LoadBattlePyramidFloorObjectEventScripts(); else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) - LoadTrainerHillFloorEventObjectScripts(); + LoadTrainerHillFloorObjectEventScripts(); else LoadSaveblockEventObjScripts(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DoTimeBasedEvents(); sub_8084788(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) @@ -2143,9 +2143,9 @@ static void sub_8086988(u32 a1) ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); if (!a1) - InitEventObjectPalettes(0); + InitObjectEventPalettes(0); else - InitEventObjectPalettes(1); + InitObjectEventPalettes(1); FieldEffectActiveListClear(); StartWeather(); @@ -2160,8 +2160,8 @@ static void sub_80869DC(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); - TrySpawnEventObjects(0, 0); + ResetObjectEvents(); + TrySpawnObjectEvents(0, 0); TryRunOnWarpIntoMapScript(); } @@ -2172,13 +2172,13 @@ static void mli4_mapscripts_and_other(void) gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; - ResetEventObjects(); + ResetObjectEvents(); GetCameraFocusCoords(&x, &y); player = GetInitialPlayerAvatarState(); InitPlayerAvatar(x, y, player->direction, gSaveBlock2Ptr->playerGender); SetPlayerAvatarTransitionFlags(player->transitionFlags); ResetInitialPlayerAvatarState(); - TrySpawnEventObjects(0, 0); + TrySpawnObjectEvents(0, 0); TryRunOnWarpIntoMapScript(); } @@ -2191,7 +2191,7 @@ static void sub_8086A68(void) static void sub_8086A80(void) { - gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1; + gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = 1; InitCameraUpdateCallback(gPlayerAvatar.spriteId); } @@ -2226,7 +2226,7 @@ static void sub_8086B14(void) for (i = 0; i < gFieldLinkPlayerCount; i++) { - SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender); + SpawnLinkPlayerObjectEvent(i, i + x, y, gLinkPlayers[i].gender); CreateLinkPlayerSprite(i, gLinkPlayers[i].version); } @@ -2702,7 +2702,7 @@ static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRo trainer->playerId = linkPlayerId; trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? 1 : 0; - trainer->c = gLinkPlayerEventObjects[linkPlayerId].movementMode; + trainer->c = gLinkPlayerObjectEvents[linkPlayerId].movementMode; trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); GetLinkPlayerCoords(linkPlayerId, &x, &y); trainer->pos.x = x; @@ -2918,110 +2918,110 @@ static u32 GetLinkSendQueueLength(void) return gLink.sendQueue.count; } -static void ZeroLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj) +static void ZeroLinkPlayerObjectEvent(struct LinkPlayerObjectEvent *linkPlayerEventObj) { - memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject)); + memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerObjectEvent)); } -void ClearLinkPlayerEventObjects(void) +void ClearLinkPlayerObjectEvents(void) { - memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects)); + memset(gLinkPlayerObjectEvents, 0, sizeof(gLinkPlayerObjectEvents)); } -static void ZeroEventObject(struct EventObject *eventObj) +static void ZeroObjectEvent(struct ObjectEvent *objEvent) { - memset(eventObj, 0, sizeof(struct EventObject)); + memset(objEvent, 0, sizeof(struct ObjectEvent)); } -static void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4) +static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 a4) { - u8 eventObjId = GetFirstInactiveEventObjectId(); - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + u8 objEventId = GetFirstInactiveObjectEventId(); + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; - ZeroLinkPlayerEventObject(linkPlayerEventObj); - ZeroEventObject(eventObj); + ZeroLinkPlayerObjectEvent(linkPlayerEventObj); + ZeroObjectEvent(objEvent); linkPlayerEventObj->active = 1; linkPlayerEventObj->linkPlayerId = linkPlayerId; - linkPlayerEventObj->eventObjId = eventObjId; + linkPlayerEventObj->objEventId = objEventId; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; - eventObj->active = 1; - eventObj->singleMovementActive = a4; - eventObj->range.as_byte = 2; - eventObj->spriteId = 64; + objEvent->active = 1; + objEvent->singleMovementActive = a4; + objEvent->range.as_byte = 2; + objEvent->spriteId = 64; - InitLinkPlayerEventObjectPos(eventObj, x, y); + InitLinkPlayerObjectEventPos(objEvent, x, y); } -static void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y) +static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y) { - eventObj->currentCoords.x = x; - eventObj->currentCoords.y = y; - eventObj->previousCoords.x = x; - eventObj->previousCoords.y = y; - SetSpritePosToMapCoords(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - eventObj->initialCoords.x += 8; - EventObjectUpdateZCoord(eventObj); + objEvent->currentCoords.x = x; + objEvent->currentCoords.y = y; + objEvent->previousCoords.x = x; + objEvent->previousCoords.y = y; + SetSpritePosToMapCoords(x, y, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + objEvent->initialCoords.x += 8; + ObjectEventUpdateZCoord(objEvent); } static void sub_80877DC(u8 linkPlayerId, u8 a2) { - if (gLinkPlayerEventObjects[linkPlayerId].active) + if (gLinkPlayerObjectEvents[linkPlayerId].active) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - eventObj->range.as_byte = a2; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + objEvent->range.as_byte = a2; } } static void sub_808780C(u8 linkPlayerId) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - if (eventObj->spriteId != MAX_SPRITES) - DestroySprite(&gSprites[eventObj->spriteId]); + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerEventObj->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + if (objEvent->spriteId != MAX_SPRITES) + DestroySprite(&gSprites[objEvent->spriteId]); linkPlayerEventObj->active = 0; - eventObj->active = 0; + objEvent->active = 0; } // Returns the spriteId corresponding to this player. static u8 GetSpriteForLinkedPlayer(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->spriteId; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->spriteId; } static void GetLinkPlayerCoords(u8 linkPlayerId, u16 *x, u16 *y) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - *x = eventObj->currentCoords.x; - *y = eventObj->currentCoords.y; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + *x = objEvent->currentCoords.x; + *y = objEvent->currentCoords.y; } static u8 GetLinkPlayerFacingDirection(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->range.as_byte; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->range.as_byte; } static u8 GetLinkPlayerElevation(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return eventObj->currentElevation; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return objEvent->currentElevation; } static s32 sub_80878E4(u8 linkPlayerId) { - u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; - return 16 - (s8)eventObj->directionSequenceIndex; + u8 objEventId = gLinkPlayerObjectEvents[linkPlayerId].objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; + return 16 - (s8)objEvent->directionSequenceIndex; } static u8 GetLinkPlayerIdAt(s16 x, s16 y) @@ -3029,11 +3029,11 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) u8 i; for (i = 0; i < MAX_LINK_PLAYERS; i++) { - if (gLinkPlayerEventObjects[i].active - && (gLinkPlayerEventObjects[i].movementMode == 0 || gLinkPlayerEventObjects[i].movementMode == 2)) + if (gLinkPlayerObjectEvents[i].active + && (gLinkPlayerObjectEvents[i].movementMode == 0 || gLinkPlayerObjectEvents[i].movementMode == 2)) { - struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId]; - if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y) + struct ObjectEvent *objEvent = &gObjectEvents[gLinkPlayerObjectEvents[i].objEventId]; + if (objEvent->currentCoords.x == x && objEvent->currentCoords.y == y) return i; } } @@ -3042,23 +3042,23 @@ static u8 GetLinkPlayerIdAt(s16 x, s16 y) static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerEventObj->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; if (linkPlayerEventObj->active) { if (facing > FACING_FORCED_RIGHT) { - eventObj->triggerGroundEffectsOnMove = 1; + objEvent->triggerGroundEffectsOnMove = 1; } else { // This is a hack to split this code onto two separate lines, without declaring a local variable. // C++ style inline variables would be nice here. - #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, eventObj, facing) + #define TEMP gLinkPlayerMovementModes[linkPlayerEventObj->movementMode](linkPlayerEventObj, objEvent, facing) - gMovementStatusHandler[TEMP](linkPlayerEventObj, eventObj); + gMovementStatusHandler[TEMP](linkPlayerEventObj, objEvent); // Clean up the hack. #undef TEMP @@ -3067,67 +3067,67 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing) } -static u8 MovementEventModeCB_Normal(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Normal(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3); } -static u8 MovementEventModeCB_Ignored(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Ignored(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { return FACING_UP; } // Duplicate Function -static u8 MovementEventModeCB_Normal_2(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static u8 MovementEventModeCB_Normal_2(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { - return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, eventObj, a3); + return gLinkPlayerFacingHandlers[a3](linkPlayerEventObj, objEvent, a3); } -static bool8 FacingHandler_DoNothing(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DoNothing(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { return FALSE; } -static bool8 FacingHandler_DpadMovement(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_DpadMovement(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { s16 x, y; - eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); - EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y); + objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); + ObjectEventMoveDestCoords(objEvent, objEvent->range.as_byte, &x, &y); - if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y)) + if (LinkPlayerDetectCollision(linkPlayerEventObj->objEventId, objEvent->range.as_byte, x, y)) { return FALSE; } else { - eventObj->directionSequenceIndex = 16; - ShiftEventObjectCoords(eventObj, x, y); - EventObjectUpdateZCoord(eventObj); + objEvent->directionSequenceIndex = 16; + ShiftObjectEventCoords(objEvent, x, y); + ObjectEventUpdateZCoord(objEvent); return TRUE; } } -static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3) +static bool8 FacingHandler_ForcedFacingChange(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent, u8 a3) { - eventObj->range.as_byte = FlipVerticalAndClearForced(a3, eventObj->range.as_byte); + objEvent->range.as_byte = FlipVerticalAndClearForced(a3, objEvent->range.as_byte); return FALSE; } // This is called every time a free movement happens. Most of the time it's a No-Op. -static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent) { linkPlayerEventObj->movementMode = MOVEMENT_MODE_FREE; } -static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj) +static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *linkPlayerEventObj, struct ObjectEvent *objEvent) { - eventObj->directionSequenceIndex--; + objEvent->directionSequenceIndex--; linkPlayerEventObj->movementMode = MOVEMENT_MODE_FROZEN; - MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y); - if (!eventObj->directionSequenceIndex) + MoveCoords(objEvent->range.as_byte, &objEvent->initialCoords.x, &objEvent->initialCoords.y); + if (!objEvent->directionSequenceIndex) { - ShiftStillEventObjectCoords(eventObj); + ShiftStillObjectEventCoords(objEvent); linkPlayerEventObj->movementMode = MOVEMENT_MODE_SCRIPTED; } } @@ -3162,8 +3162,8 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) { if (i != selfEventObjId) { - if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y) - || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y)) + if ((gObjectEvents[i].currentCoords.x == x && gObjectEvents[i].currentCoords.y == y) + || (gObjectEvents[i].previousCoords.x == x && gObjectEvents[i].previousCoords.y == y)) { return 1; } @@ -3174,9 +3174,9 @@ static u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y) static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId]; - u8 eventObjId = linkPlayerEventObj->eventObjId; - struct EventObject *eventObj = &gEventObjects[eventObjId]; + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[linkPlayerId]; + u8 objEventId = linkPlayerEventObj->objEventId; + struct ObjectEvent *objEvent = &gObjectEvents[objEventId]; struct Sprite *sprite; if (linkPlayerEventObj->active) @@ -3185,40 +3185,40 @@ static void CreateLinkPlayerSprite(u8 linkPlayerId, u8 gameVersion) { case VERSION_FIRE_RED: case VERSION_LEAF_GREEN: - eventObj->spriteId = AddPseudoEventObject(GetFRLGAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetFRLGAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_RUBY: case VERSION_SAPPHIRE: - eventObj->spriteId = AddPseudoEventObject(GetRSAvatarGraphicsIdByGender(eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetRSAvatarGraphicsIdByGender(objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; case VERSION_EMERALD: - eventObj->spriteId = AddPseudoEventObject(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); + objEvent->spriteId = AddPseudoObjectEvent(GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, objEvent->singleMovementActive), SpriteCB_LinkPlayer, 0, 0, 0); break; } - sprite = &gSprites[eventObj->spriteId]; + sprite = &gSprites[objEvent->spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->data[0] = linkPlayerId; - eventObj->triggerGroundEffectsOnMove = 0; + objEvent->triggerGroundEffectsOnMove = 0; } } static void SpriteCB_LinkPlayer(struct Sprite *sprite) { - struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]]; - struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId]; - sprite->pos1.x = eventObj->initialCoords.x; - sprite->pos1.y = eventObj->initialCoords.y; - SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1); - sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation); + struct LinkPlayerObjectEvent *linkPlayerEventObj = &gLinkPlayerObjectEvents[sprite->data[0]]; + struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerEventObj->objEventId]; + sprite->pos1.x = objEvent->initialCoords.x; + sprite->pos1.y = objEvent->initialCoords.y; + SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1); + sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation); if (!linkPlayerEventObj->movementMode != MOVEMENT_MODE_FREE) - StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte)); + StartSpriteAnim(sprite, GetFaceDirectionAnimNum(objEvent->range.as_byte)); else - StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte)); + StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(objEvent->range.as_byte)); - UpdateEventObjectSpriteVisibility(sprite, 0); - if (eventObj->triggerGroundEffectsOnMove) + UpdateObjectEventSpriteVisibility(sprite, 0); + if (objEvent->triggerGroundEffectsOnMove) { sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->data[7]++; diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c index 7238ec751b..48bedc0572 100644 --- a/src/rotating_tile_puzzle.c +++ b/src/rotating_tile_puzzle.c @@ -57,23 +57,23 @@ void FreeRotatingTilePuzzle(void) if (sRotatingTilePuzzle != NULL) FREE_AND_SET_NULL(sRotatingTilePuzzle); - id = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[id]); - ScriptMovement_UnfreezeEventObjects(); + id = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[id]); + ScriptMovement_UnfreezeObjectEvents(); } u16 MoveRotatingTileObjects(u8 puzzleNumber) { u8 i; - struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; u16 localId = 0; for (i = 0; i < EVENT_OBJECT_TEMPLATES_COUNT; i++) { s32 puzzleTileStart; u8 puzzleTileNum; - s16 x = eventObjects[i].x + 7; - s16 y = eventObjects[i].y + 7; + s16 x = objectEvents[i].x + 7; + s16 y = objectEvents[i].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); if (!sRotatingTilePuzzle->isTrickHouse) @@ -125,12 +125,12 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber) continue; } - eventObjects[i].x += x; - eventObjects[i].y += y; - if (GetEventObjectIdByLocalIdAndMap(eventObjects[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) + objectEvents[i].x += x; + objectEvents[i].y += y; + if (GetObjectEventIdByLocalIdAndMap(objectEvents[i].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup) != EVENT_OBJECTS_COUNT) { SaveRotatingTileObject(i, puzzleTileNum); - localId = eventObjects[i].localId; + localId = objectEvents[i].localId; ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); } // Never reached in normal gameplay @@ -148,7 +148,7 @@ void TurnRotatingTileObjects(void) { u8 i; s32 puzzleTileStart; - struct EventObjectTemplate *eventObjects; + struct ObjectEventTemplate *objectEvents; if (sRotatingTilePuzzle == NULL) return; @@ -158,14 +158,14 @@ void TurnRotatingTileObjects(void) else puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; - eventObjects = gSaveBlock1Ptr->eventObjectTemplates; + objectEvents = gSaveBlock1Ptr->objectEventTemplates; for (i = 0; i < sRotatingTilePuzzle->numObjects; i++) { s32 rotation; s8 tileDifference; - u8 eventObjectId; - s16 x = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; - s16 y = eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; + u8 objectEventId; + s16 x = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].x + 7; + s16 y = objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); // NOTE: The following 2 assignments and if else could all be replaced with rotation = ROTATE_COUNTERCLOCKWISE @@ -194,35 +194,35 @@ void TurnRotatingTileObjects(void) rotation = ROTATE_NONE; } - eventObjectId = GetEventObjectIdByLocalIdAndMap(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (eventObjectId != EVENT_OBJECTS_COUNT) + objectEventId = GetObjectEventIdByLocalIdAndMap(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + if (objectEventId != EVENT_OBJECTS_COUNT) { const u8 *movementScript; - u8 direction = gEventObjects[eventObjectId].facingDirection; + u8 direction = gObjectEvents[objectEventId].facingDirection; if (rotation == ROTATE_COUNTERCLOCKWISE) { switch (direction) { case DIR_EAST: movementScript = RotatingTilePuzzle_Movement_FaceUp; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case DIR_SOUTH: movementScript = RotatingTilePuzzle_Movement_FaceRight; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; case DIR_WEST: movementScript = RotatingTilePuzzle_Movement_FaceDown; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case DIR_NORTH: movementScript = RotatingTilePuzzle_Movement_FaceLeft; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; default: continue; } - ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); @@ -234,24 +234,24 @@ void TurnRotatingTileObjects(void) { case DIR_EAST: movementScript = RotatingTilePuzzle_Movement_FaceDown; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case DIR_SOUTH: movementScript = RotatingTilePuzzle_Movement_FaceLeft; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; case DIR_WEST: movementScript = RotatingTilePuzzle_Movement_FaceUp; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case DIR_NORTH: movementScript = RotatingTilePuzzle_Movement_FaceRight; - eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; default: continue; } - ScriptMovement_StartObjectMovementScript(eventObjects[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, + ScriptMovement_StartObjectMovementScript(objectEvents[sRotatingTilePuzzle->objects[i].eventTemplateId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); @@ -274,9 +274,9 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) s32 rotation; s32 puzzleTileStart; u16 movementType; - struct EventObjectTemplate *eventObjects = gSaveBlock1Ptr->eventObjectTemplates; - s16 x = eventObjects[eventTemplateId].x + 7; - s16 y = eventObjects[eventTemplateId].y + 7; + struct ObjectEventTemplate *objectEvents = gSaveBlock1Ptr->objectEventTemplates; + s16 x = objectEvents[eventTemplateId].x + 7; + s16 y = objectEvents[eventTemplateId].y + 7; u16 metatile = MapGridGetMetatileIdAt(x, y); if (!sRotatingTilePuzzle->isTrickHouse) @@ -294,22 +294,22 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) else rotation = ROTATE_NONE; - movementType = eventObjects[eventTemplateId].movementType; + movementType = objectEvents[eventTemplateId].movementType; if (rotation == ROTATE_COUNTERCLOCKWISE) { switch (movementType) { case MOVEMENT_TYPE_FACE_RIGHT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case MOVEMENT_TYPE_FACE_DOWN: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; case MOVEMENT_TYPE_FACE_LEFT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case MOVEMENT_TYPE_FACE_UP: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; default: break; @@ -320,16 +320,16 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) switch (movementType) { case MOVEMENT_TYPE_FACE_RIGHT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_DOWN; break; case MOVEMENT_TYPE_FACE_DOWN: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_LEFT; break; case MOVEMENT_TYPE_FACE_LEFT: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_UP; break; case MOVEMENT_TYPE_FACE_UP: - eventObjects[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; + objectEvents[eventTemplateId].movementType = MOVEMENT_TYPE_FACE_RIGHT; break; default: break; diff --git a/src/scrcmd.c b/src/scrcmd.c index a9be5c3ef9..f712d6f44c 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1052,7 +1052,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1062,7 +1062,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup); + RemoveObjectEventByLocalIdAndMap(objectId, mapNum, mapGroup); return FALSE; } @@ -1070,7 +1070,7 @@ bool8 ScrCmd_addobject(struct ScriptContext *ctx) { u16 objectId = VarGet(ScriptReadHalfword(ctx)); - TrySpawnEventObject(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(objectId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1080,7 +1080,7 @@ bool8 ScrCmd_addobject_at(struct ScriptContext *ctx) u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); - TrySpawnEventObject(objectId, mapNum, mapGroup); + TrySpawnObjectEvent(objectId, mapNum, mapGroup); return FALSE; } @@ -1090,7 +1090,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx) u16 x = VarGet(ScriptReadHalfword(ctx)); u16 y = VarGet(ScriptReadHalfword(ctx)); - TryMoveEventObjectToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); + TryMoveObjectEventToMapCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, x, y); return FALSE; } @@ -1108,7 +1108,7 @@ bool8 ScrCmd_copyobjectxytoperm(struct ScriptContext *ctx) { u16 localId = VarGet(ScriptReadHalfword(ctx)); - TryOverrideEventObjectTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryOverrideObjectEventTemplateCoords(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); return FALSE; } @@ -1155,9 +1155,9 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx) bool8 ScrCmd_faceplayer(struct ScriptContext *ctx) { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], + ObjectEventFaceOppositeDirection(&gObjectEvents[gSelectedObjectEvent], GetPlayerFacingDirection()); } return FALSE; @@ -1168,7 +1168,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx) u16 localId = VarGet(ScriptReadHalfword(ctx)); u8 direction = ScriptReadByte(ctx); - EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); + ObjectEventTurnByLocalIdAndMap(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, direction); return FALSE; } @@ -1211,7 +1211,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_80983C4); return TRUE; } @@ -1225,14 +1225,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { - LockSelectedEventObject(); + LockSelectedObjectEvent(); SetupNativeScript(ctx, sub_809847C); } else { - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); SetupNativeScript(ctx, sub_80983C4); } return TRUE; @@ -1244,10 +1244,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); return FALSE; } @@ -1256,12 +1256,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx) u8 playerObjectId; HideFieldMessageBox(); - if (gEventObjects[gSelectedEventObject].active) - EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]); - playerObjectId = GetEventObjectIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[playerObjectId]); - ScriptMovement_UnfreezeEventObjects(); - UnfreezeEventObjects(); + if (gObjectEvents[gSelectedObjectEvent].active) + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]); + playerObjectId = GetObjectEventIdByLocalIdAndMap(EVENT_OBJ_ID_PLAYER, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]); + ScriptMovement_UnfreezeObjectEvents(); + UnfreezeObjectEvents(); return FALSE; } @@ -2178,7 +2178,7 @@ bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) { - gSelectedEventObject = GetCurrentApproachingTrainerEventObjectId(); + gSelectedObjectEvent = GetCurrentApproachingTrainerObjectEventId(); return FALSE; } @@ -2190,7 +2190,7 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx) } else { - if (gEventObjects[gSelectedEventObject].active) + if (gObjectEvents[gSelectedObjectEvent].active) { sub_8098630(); SetupNativeScript(ctx, sub_8098734); diff --git a/src/script.c b/src/script.c index 34484561cc..9ba1a74297 100644 --- a/src/script.c +++ b/src/script.c @@ -426,7 +426,7 @@ u8 *GetSavedRamScriptIfValid(void) } } -void InitRamScript_NoEventObject(u8 *script, u16 scriptSize) +void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize) { if (scriptSize > sizeof(gSaveBlock1Ptr->ramScript.data.script)) scriptSize = sizeof(gSaveBlock1Ptr->ramScript.data.script); diff --git a/src/script_movement.c b/src/script_movement.c index 03d6b10e89..21f0661097 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -9,13 +9,13 @@ // static functions static void ScriptMovement_StartMoveObjects(u8 priority); static u8 GetMoveObjectsTaskId(void); -static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript); -static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId); +static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript); +static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId); static bool8 IsMovementScriptFinished(u8 taskId, u8 moveScrId); -static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); +static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); static void ScriptMovement_UnfreezeActiveObjects(u8 taskId); static void ScriptMovement_MoveObjects(u8 taskId); -static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript); +static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript); // EWRAM_DATA static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; @@ -23,31 +23,31 @@ static EWRAM_DATA const u8 *gMovementScripts[EVENT_OBJECTS_COUNT] = {0}; // text bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; if (!FuncIsActiveTask(ScriptMovement_MoveObjects)) ScriptMovement_StartMoveObjects(50); - return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), eventObjId, movementScript); + return ScriptMovement_TryAddNewMovement(GetMoveObjectsTaskId(), objEventId, movementScript); } bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup) { - u8 eventObjId; + u8 objEventId; u8 taskId; u8 moveScrId; - if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objEventId)) return TRUE; taskId = GetMoveObjectsTaskId(); - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); if (moveScrId == EVENT_OBJECTS_COUNT) return TRUE; return IsMovementScriptFinished(taskId, moveScrId); } -void ScriptMovement_UnfreezeEventObjects(void) +void ScriptMovement_UnfreezeObjectEvents(void) { u8 taskId; @@ -75,11 +75,11 @@ static u8 GetMoveObjectsTaskId(void) return FindTaskIdByFunc(ScriptMovement_MoveObjects); } -static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 *movementScript) +static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movementScript) { u8 moveScrId; - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, eventObjId); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, objEventId); if (moveScrId != EVENT_OBJECTS_COUNT) { if (IsMovementScriptFinished(taskId, moveScrId) == 0) @@ -88,23 +88,23 @@ static bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 eventObjId, const u8 } else { - ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); + ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript); return FALSE; } } - moveScrId = GetMovementScriptIdFromEventObjectId(taskId, EVENT_OBJ_ID_PLAYER); + moveScrId = GetMovementScriptIdFromObjectEventId(taskId, EVENT_OBJ_ID_PLAYER); if (moveScrId == EVENT_OBJECTS_COUNT) { return TRUE; } else { - ScriptMovement_AddNewMovement(taskId, moveScrId, eventObjId, movementScript); + ScriptMovement_AddNewMovement(taskId, moveScrId, objEventId, movementScript); return FALSE; } } -static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId) +static u8 GetMovementScriptIdFromObjectEventId(u8 taskId, u8 objEventId) { u8 *moveScriptId; u8 i; @@ -112,13 +112,13 @@ static u8 GetMovementScriptIdFromEventObjectId(u8 taskId, u8 eventObjId) moveScriptId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < EVENT_OBJECTS_COUNT; i++, moveScriptId++) { - if (*moveScriptId == eventObjId) + if (*moveScriptId == objEventId) return i; } return EVENT_OBJECTS_COUNT; } -static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) +static void LoadObjectEventIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 **pEventObjId) { u8 i; @@ -127,20 +127,20 @@ static void LoadEventObjectIdPtrFromMovementScript(u8 taskId, u8 moveScrId, u8 * ; } -static void SetEventObjectIdAtMovementScript(u8 taskId, u8 moveScrId, u8 eventObjId) +static void SetObjectEventIdAtMovementScript(u8 taskId, u8 moveScrId, u8 objEventId) { u8 *ptr; - LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); - *ptr = eventObjId; + LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr); + *ptr = objEventId; } -static void LoadEventObjectIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *eventObjId) +static void LoadObjectEventIdFromMovementScript(u8 taskId, u8 moveScrId, u8 *objEventId) { u8 *ptr; - LoadEventObjectIdPtrFromMovementScript(taskId, moveScrId, &ptr); - *eventObjId = *ptr; + LoadObjectEventIdPtrFromMovementScript(taskId, moveScrId, &ptr); + *objEventId = *ptr; } static void ClearMovementScriptFinished(u8 taskId, u8 moveScrId) @@ -175,11 +175,11 @@ static const u8 *GetMovementScript(u8 moveScrId) return gMovementScripts[moveScrId]; } -static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) +static void ScriptMovement_AddNewMovement(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript) { ClearMovementScriptFinished(taskId, moveScrId); SetMovementScript(moveScrId, movementScript); - SetEventObjectIdAtMovementScript(taskId, moveScrId, eventObjId); + SetObjectEventIdAtMovementScript(taskId, moveScrId, objEventId); } static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) @@ -191,40 +191,40 @@ static void ScriptMovement_UnfreezeActiveObjects(u8 taskId) for (i = 0; i < EVENT_OBJECTS_COUNT; i++, pEventObjId++) { if (*pEventObjId != 0xFF) - UnfreezeEventObject(&gEventObjects[*pEventObjId]); + UnfreezeObjectEvent(&gObjectEvents[*pEventObjId]); } } static void ScriptMovement_MoveObjects(u8 taskId) { u8 i; - u8 eventObjId; + u8 objEventId; for (i = 0; i < EVENT_OBJECTS_COUNT; i++) { - LoadEventObjectIdFromMovementScript(taskId, i, &eventObjId); - if (eventObjId != 0xFF) - ScriptMovement_TakeStep(taskId, i, eventObjId, GetMovementScript(i)); + LoadObjectEventIdFromMovementScript(taskId, i, &objEventId); + if (objEventId != 0xFF) + ScriptMovement_TakeStep(taskId, i, objEventId, GetMovementScript(i)); } } -static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 eventObjId, const u8 *movementScript) +static void ScriptMovement_TakeStep(u8 taskId, u8 moveScrId, u8 objEventId, const u8 *movementScript) { u8 nextMoveActionId; - if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId]) - && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId])) + if (ObjectEventIsHeldMovementActive(&gObjectEvents[objEventId]) + && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId])) return; nextMoveActionId = *movementScript; if (nextMoveActionId == MOVEMENT_ACTION_STEP_END) { SetMovementScriptFinished(taskId, moveScrId); - FreezeEventObject(&gEventObjects[eventObjId]); + FreezeObjectEvent(&gObjectEvents[objEventId]); } else { - if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], nextMoveActionId)) + if (!ObjectEventSetHeldMovement(&gObjectEvents[objEventId], nextMoveActionId)) { movementScript++; SetMovementScript(moveScrId, movementScript); diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 8c66be30f1..a79c37d8cd 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -33,10 +33,10 @@ #include "constants/vars.h" #include "constants/battle_frontier.h" -extern const u16 gEventObjectPalette8[]; -extern const u16 gEventObjectPalette17[]; -extern const u16 gEventObjectPalette33[]; -extern const u16 gEventObjectPalette34[]; +extern const u16 gObjectEventPalette8[]; +extern const u16 gObjectEventPalette17[]; +extern const u16 gObjectEventPalette33[]; +extern const u16 gObjectEventPalette34[]; static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 }; @@ -263,7 +263,7 @@ void SetLinkContestPlayerGfx(void) void LoadLinkContestPlayerPalettes(void) { int i; - u8 eventObjectId; + u8 objectEventId; int version; struct Sprite *sprite; @@ -272,23 +272,23 @@ void LoadLinkContestPlayerPalettes(void) { for (i = 0; i < gNumLinkContestPlayers; i++) { - eventObjectId = GetEventObjectIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - sprite = &gSprites[gEventObjects[eventObjectId].spriteId]; + objectEventId = GetObjectEventIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + sprite = &gSprites[gObjectEvents[objectEventId].spriteId]; sprite->oam.paletteNum = 6 + i; version = (u8)gLinkPlayers[i].version; if (version == VERSION_RUBY || version == VERSION_SAPPHIRE) { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gEventObjectPalette33, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette33, 0x160 + i * 0x10, 0x20); else - LoadPalette(gEventObjectPalette34, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette34, 0x160 + i * 0x10, 0x20); } else { if (gLinkPlayers[i].gender == MALE) - LoadPalette(gEventObjectPalette8, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette8, 0x160 + i * 0x10, 0x20); else - LoadPalette(gEventObjectPalette17, 0x160 + i * 0x10, 0x20); + LoadPalette(gObjectEventPalette17, 0x160 + i * 0x10, 0x20); } } } diff --git a/src/secret_base.c b/src/secret_base.c index b9826a2572..3cbbab0dc4 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -437,7 +437,7 @@ bool8 SecretBaseMapPopupEnabled(void) static void EnterNewlyCreatedSecretBase_WaitFadeIn(u8 taskId) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_NORTH); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_NORTH); if (IsWeatherNotFadingIn() == TRUE) { EnableBothScriptContexts(); @@ -531,13 +531,13 @@ void InitSecretBaseDecorationSprites(void) u8 i; u8 *decorations; u8 *decorationPositions; - u8 eventObjectId; + u8 objectEventId; u8 metatileBehavior; u8 category; u8 permission; u8 numDecorations; - eventObjectId = 0; + objectEventId = 0; if (!CurMapIsSecretBase()) { decorations = gSaveBlock1Ptr->playerRoomDecor; @@ -561,13 +561,13 @@ void InitSecretBaseDecorationSprites(void) category = gDecorations[decorations[i]].category; if (permission == DECORPERM_SPRITE) { - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - if (gMapHeader.events->eventObjects[eventObjectId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) + if (gMapHeader.events->objectEvents[objectEventId].flagId == FLAG_DECORATION_1 + gSpecialVar_0x8004) break; } - if (eventObjectId == gMapHeader.events->eventObjectCount) + if (objectEventId == gMapHeader.events->objectEventCount) continue; gSpecialVar_0x8006 = decorationPositions[i] >> 4; @@ -576,13 +576,13 @@ void InitSecretBaseDecorationSprites(void) if (MetatileBehavior_HoldsSmallDecoration(metatileBehavior) == TRUE || MetatileBehavior_HoldsLargeDecoration(metatileBehavior) == TRUE) { - gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->eventObjects[eventObjectId].graphicsId - EVENT_OBJ_GFX_VAR_0); + gSpecialVar_Result = VAR_OBJ_GFX_ID_0 + (gMapHeader.events->objectEvents[objectEventId].graphicsId - EVENT_OBJ_GFX_VAR_0); VarSet(gSpecialVar_Result, gDecorations[decorations[i]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->eventObjects[eventObjectId].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[objectEventId].localId; FlagClear(FLAG_DECORATION_1 + gSpecialVar_0x8004); - TrySpawnEventObject(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - TryMoveEventObjectToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - TryOverrideEventObjectTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TryMoveObjectEventToMapCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); + TryOverrideObjectEventTemplateCoords(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); if (CurMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0) { if (category == DECORCAT_DOLL) @@ -611,16 +611,16 @@ void InitSecretBaseDecorationSprites(void) void HideSecretBaseDecorationSprites(void) { - u8 eventObjectId; + u8 objectEventId; u16 flag; - for (eventObjectId = 0; eventObjectId < gMapHeader.events->eventObjectCount; eventObjectId++) + for (objectEventId = 0; objectEventId < gMapHeader.events->objectEventCount; objectEventId++) { - flag = gMapHeader.events->eventObjects[eventObjectId].flagId; + flag = gMapHeader.events->objectEvents[objectEventId].flagId; if (flag >= FLAG_DECORATION_1 && flag <= FLAG_DECORATION_14) { - RemoveEventObjectByLocalIdAndMap( - gMapHeader.events->eventObjects[eventObjectId].localId, + RemoveObjectEventByLocalIdAndMap( + gMapHeader.events->objectEvents[objectEventId].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(flag); diff --git a/src/shop.c b/src/shop.c index c9cd1919a5..7a51b32b89 100755 --- a/src/shop.c +++ b/src/shop.c @@ -67,13 +67,13 @@ static void BuyMenuRemoveItemIcon(u16, u8); static void BuyMenuPrint(u8 windowId, const u8 *text, u8 x, u8 y, s8 speed, u8 colorSet); static void BuyMenuDrawMapGraphics(void); static void BuyMenuCopyMenuBgToBg1TilemapBuffer(void); -static void BuyMenuCollectEventObjectData(void); -static void BuyMenuDrawEventObjects(void); +static void BuyMenuCollectObjectEventData(void); +static void BuyMenuDrawObjectEvents(void); static void BuyMenuDrawMapBg(void); static bool8 BuyMenuCheckForOverlapWithMenuBg(int, int); static void BuyMenuDrawMapMetatile(s16, s16, const u16*, u8); static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, const u16 *src); -static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *); +static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *); static void ExitBuyMenu(u8 taskId); static void Task_ExitBuyMenu(u8 taskId); static void BuyMenuTryMakePurchase(u8 taskId); @@ -714,8 +714,8 @@ static void BuyMenuDrawGraphics(void) static void BuyMenuDrawMapGraphics(void) { - BuyMenuCollectEventObjectData(); - BuyMenuDrawEventObjects(); + BuyMenuCollectObjectEventData(); + BuyMenuDrawObjectEvents(); BuyMenuDrawMapBg(); } @@ -787,7 +787,7 @@ static void BuyMenuDrawMapMetatileLayer(u16 *dest, s16 offset1, s16 offset2, con dest[offset1 + offset2 + 33] = src[3]; // bottom right } -static void BuyMenuCollectEventObjectData(void) +static void BuyMenuCollectObjectEventData(void) { s16 facingX; s16 facingY; @@ -802,16 +802,16 @@ static void BuyMenuCollectEventObjectData(void) { for (x = 0; x < 7; x++) { - u8 eventObjId = GetEventObjectIdByXY(facingX - 4 + x, facingY - 2 + y); + u8 objEventId = GetObjectEventIdByXY(facingX - 4 + x, facingY - 2 + y); - if (eventObjId != 16) + if (objEventId != 16) { - gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = eventObjId; + gShopDataPtr->viewportObjects[r8][EVENT_OBJ_ID] = objEventId; gShopDataPtr->viewportObjects[r8][X_COORD] = x; gShopDataPtr->viewportObjects[r8][Y_COORD] = y; gShopDataPtr->viewportObjects[r8][LAYER_TYPE] = MapGridGetMetatileLayerTypeAt(facingX - 4 + x, facingY - 2 + y); - switch (gEventObjects[eventObjId].facingDirection) + switch (gObjectEvents[objEventId].facingDirection) { case DIR_SOUTH: gShopDataPtr->viewportObjects[r8][ANIM_NUM] = 0; @@ -833,27 +833,27 @@ static void BuyMenuCollectEventObjectData(void) } } -static void BuyMenuDrawEventObjects(void) +static void BuyMenuDrawObjectEvents(void) { u8 i; u8 spriteId; - const struct EventObjectGraphicsInfo *graphicsInfo; + const struct ObjectEventGraphicsInfo *graphicsInfo; for (i = 0; i < 16; i++) // max objects? { if (gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID] == 16) continue; - graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); + graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId); - spriteId = AddPseudoEventObject( - gEventObjects[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, + spriteId = AddPseudoObjectEvent( + gObjectEvents[gShopDataPtr->viewportObjects[i][EVENT_OBJ_ID]].graphicsId, SpriteCallbackDummy, (u16)gShopDataPtr->viewportObjects[i][X_COORD] * 16 + 8, (u16)gShopDataPtr->viewportObjects[i][Y_COORD] * 16 + 48 - graphicsInfo->height / 2, 2); - if (BuyMenuCheckIfEventObjectOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) + if (BuyMenuCheckIfObjectEventOverlapsMenuBg(gShopDataPtr->viewportObjects[i]) == TRUE) { gSprites[spriteId].subspriteTableNum = 4; gSprites[spriteId].subspriteMode = 1; @@ -863,7 +863,7 @@ static void BuyMenuDrawEventObjects(void) } } -static bool8 BuyMenuCheckIfEventObjectOverlapsMenuBg(s16 *object) +static bool8 BuyMenuCheckIfObjectEventOverlapsMenuBg(s16 *object) { if (!BuyMenuCheckForOverlapWithMenuBg(object[X_COORD], object[Y_COORD] + 2) && object[LAYER_TYPE] != MB_SECRET_BASE_WALL) { diff --git a/src/start_menu.c b/src/start_menu.c index c24497d74f..ae26f99b37 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -543,7 +543,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s { if (!IsUpdateLinkStateCBActive()) { - FreezeEventObjects(); + FreezeObjectEvents(); sub_808B864(); sub_808BCF4(); } @@ -746,7 +746,7 @@ static bool8 StartMenuBattlePyramidRetireCallback(void) void sub_809FDD4(void) { ClearDialogWindowAndFrameToTransparent(0, FALSE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); CreateStartMenuTask(sub_809FA34); ScriptContext2_Enable(); } @@ -788,7 +788,7 @@ static bool8 SaveCallback(void) case SAVE_SUCCESS: case SAVE_ERROR: // Close start menu ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); SoftResetInBattlePyramid(); return TRUE; @@ -825,7 +825,7 @@ static bool8 BattlePyramidRetireCallback(void) return FALSE; case SAVE_CANCELED: // Yes (Retire from battle pyramid) ClearDialogWindowAndFrameToTransparent(0, TRUE); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88); return TRUE; @@ -1382,7 +1382,7 @@ static void HideStartMenuWindow(void) { ClearStdWindowAndFrame(GetStartMenuWindowId(), TRUE); RemoveStartMenuWindow(); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); } diff --git a/src/trainer_hill.c b/src/trainer_hill.c index b84920a62e..f7b08f350b 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -251,7 +251,7 @@ static const u8 *const sTagMatchStrings[] = gText_ExpertTagMatch, }; -static const struct EventObjectTemplate sTrainerEventObjectTemplate = +static const struct ObjectEventTemplate sTrainerObjectEventTemplate = { .graphicsId = EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, .elevation = 3, @@ -629,25 +629,25 @@ static void SetTimerValue(u32 *dst, u32 val) *dst = val; } -void LoadTrainerHillEventObjectTemplates(void) +void LoadTrainerHillObjectEventTemplates(void) { u8 i, floorId; - struct EventObjectTemplate *eventTemplates = gSaveBlock1Ptr->eventObjectTemplates; + struct ObjectEventTemplate *eventTemplates = gSaveBlock1Ptr->objectEventTemplates; - if (!LoadTrainerHillFloorEventObjectScripts()) + if (!LoadTrainerHillFloorObjectEventScripts()) return; SetUpDataStruct(); for (i = 0; i < 2; i++) gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; - CpuFill32(0, gSaveBlock1Ptr->eventObjectTemplates, sizeof(gSaveBlock1Ptr->eventObjectTemplates)); + CpuFill32(0, gSaveBlock1Ptr->objectEventTemplates, sizeof(gSaveBlock1Ptr->objectEventTemplates)); floorId = GetFloorId(); for (i = 0; i < 2; i++) { u8 bits; - eventTemplates[i] = sTrainerEventObjectTemplate; + eventTemplates[i] = sTrainerObjectEventTemplate; eventTemplates[i].localId = i + 1; eventTemplates[i].graphicsId = FacilityClassToGraphicsId(sHillData->floors[floorId].trainers[i].facilityClass); eventTemplates[i].x = sHillData->floors[floorId].display.coords[i] & 0xF; @@ -662,7 +662,7 @@ void LoadTrainerHillEventObjectTemplates(void) FreeDataStruct(); } -bool32 LoadTrainerHillFloorEventObjectScripts(void) +bool32 LoadTrainerHillFloorObjectEventScripts(void) { SetUpDataStruct(); // Something may have been dummied here @@ -860,10 +860,10 @@ u16 LocalIdToHillTrainerId(u8 localId) return gSaveBlock2Ptr->frontier.trainerIds[localId - 1]; } -bool8 GetHillTrainerFlag(u8 eventObjectId) +bool8 GetHillTrainerFlag(u8 objectEventId) { u32 floorId = GetFloorId() * 2; - u8 bitId = gEventObjects[eventObjectId].localId - 1 + floorId; + u8 bitId = gObjectEvents[objectEventId].localId - 1 + floorId; return gSaveBlock2Ptr->frontier.trainerFlags & gBitTable[bitId]; } diff --git a/src/trainer_see.c b/src/trainer_see.c index 72e9037285..8b5e74d137 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -19,31 +19,31 @@ #include "constants/field_effects.h" // this file's functions -static u8 CheckTrainer(u8 eventObjectId); -static u8 GetTrainerApproachDistance(struct EventObject *trainerObj); -static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction); -static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range); +static u8 CheckTrainer(u8 objectEventId); +static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj); +static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction); +static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range); static void Task_RunTrainerSeeFuncList(u8 taskId); static void Task_DestroyTrainerApproachTask(u8 taskId); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y); -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y); -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj); static void SpriteCB_TrainerIcons(struct Sprite *sprite); @@ -62,7 +62,7 @@ static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); -static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *trainerObj, s16 range, s16 x, s16 y) = +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) = { GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceNorth, @@ -70,7 +70,7 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train GetTrainerApproachDistanceEast, }; -static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { sub_80B4178, TrainerExclamationMark, @@ -86,7 +86,7 @@ static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct WaitRevealHiddenTrainer, }; -static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = +static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) = { RevealHiddenTrainer, PopOutOfAshHiddenTrainer, @@ -183,9 +183,9 @@ bool8 CheckForTrainersWantingBattle(void) { u8 retVal; - if (!gEventObjects[i].active) + if (!gObjectEvents[i].active) continue; - if (gEventObjects[i].trainerType != 1 && gEventObjects[i].trainerType != 3) + if (gObjectEvents[i].trainerType != 1 && gObjectEvents[i].trainerType != 3) continue; retVal = CheckTrainer(i); @@ -204,7 +204,7 @@ bool8 CheckForTrainersWantingBattle(void) if (gNoOfApproachingTrainers == 1) { ResetTrainerOpponentIds(); - ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId, + ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].objectEventId, gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); gTrainerApproachedPlayer = TRUE; return TRUE; @@ -214,7 +214,7 @@ bool8 CheckForTrainersWantingBattle(void) ResetTrainerOpponentIds(); for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++) { - ConfigureTwoTrainersBattle(gApproachingTrainers[i].eventObjectId, + ConfigureTwoTrainersBattle(gApproachingTrainers[i].objectEventId, gApproachingTrainers[i].trainerScriptPtr); } SetUpTwoTrainersBattle(); @@ -229,7 +229,7 @@ bool8 CheckForTrainersWantingBattle(void) } } -static u8 CheckTrainer(u8 eventObjectId) +static u8 CheckTrainer(u8 objectEventId) { const u8 *scriptPtr; u8 ret = 1; @@ -238,16 +238,16 @@ static u8 CheckTrainer(u8 eventObjectId) if (InTrainerHill() == TRUE) scriptPtr = GetTrainerHillTrainerScript(); else - scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjectId); + scriptPtr = GetObjectEventScriptPointerByObjectEventId(objectEventId); if (InBattlePyramid()) { - if (GetBattlePyramidTrainerFlag(eventObjectId)) + if (GetBattlePyramidTrainerFlag(objectEventId)) return 0; } else if (InTrainerHill() == TRUE) { - if (GetHillTrainerFlag(eventObjectId)) + if (GetHillTrainerFlag(objectEventId)) return 0; } else @@ -256,7 +256,7 @@ static u8 CheckTrainer(u8 eventObjectId) return 0; } - approachDistance = GetTrainerApproachDistance(&gEventObjects[eventObjectId]); + approachDistance = GetTrainerApproachDistance(&gObjectEvents[objectEventId]); if (approachDistance != 0) { @@ -270,10 +270,10 @@ static u8 CheckTrainer(u8 eventObjectId) ret = 2; } - gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId = eventObjectId; + gApproachingTrainers[gNoOfApproachingTrainers].objectEventId = objectEventId; gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr; gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance; - TrainerApproachPlayer(&gEventObjects[eventObjectId], approachDistance - 1); + TrainerApproachPlayer(&gObjectEvents[objectEventId], approachDistance - 1); gNoOfApproachingTrainers++; return ret; @@ -282,7 +282,7 @@ static u8 CheckTrainer(u8 eventObjectId) return 0; } -static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) +static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj) { s16 x, y; u8 i; @@ -308,7 +308,7 @@ static u8 GetTrainerApproachDistance(struct EventObject *trainerObj) } // Returns how far south the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y > trainerObj->currentCoords.y @@ -319,7 +319,7 @@ static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 ra } // Returns how far north the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.x == x && y < trainerObj->currentCoords.y @@ -330,7 +330,7 @@ static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 ra } // Returns how far west the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x < trainerObj->currentCoords.x @@ -341,7 +341,7 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran } // Returns how far east the player is from trainer. 0 if out of trainer's sight. -static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y) +static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y) { if (trainerObj->currentCoords.y == y && x > trainerObj->currentCoords.x @@ -353,7 +353,7 @@ static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 ran #define COLLISION_MASK (~1) -static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction) +static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction) { s16 x, y; u8 unk19_temp; @@ -394,16 +394,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 ap #define tFuncId data[0] #define tTrainerRange data[3] #define tOutOfAshSpriteId data[4] -#define tTrainerEventObjectId data[7] +#define tTrainerObjectEventId data[7] -static void TrainerApproachPlayer(struct EventObject *trainerObj, u8 range) +static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range) { struct Task *task; gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50); task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId]; task->tTrainerRange = range; - task->tTrainerEventObjectId = gApproachingTrainers[gNoOfApproachingTrainers].eventObjectId; + task->tTrainerObjectEventId = gApproachingTrainers[gNoOfApproachingTrainers].objectEventId; } static void sub_80B40C8(TaskFunc followupFunc) @@ -425,7 +425,7 @@ static void sub_80B40C8(TaskFunc followupFunc) static void Task_RunTrainerSeeFuncList(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *trainerObj = &gEventObjects[task->tTrainerEventObjectId]; + struct ObjectEvent *trainerObj = &gObjectEvents[task->tTrainerObjectEventId]; if (!trainerObj->active) { @@ -437,24 +437,24 @@ static void Task_RunTrainerSeeFuncList(u8 taskId) } } -static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { return FALSE; } -static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { u8 direction; - EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + ObjectEventGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON); direction = GetFaceDirectionMovementAction(trainerObj->facingDirection); - EventObjectSetHeldMovement(trainerObj, direction); + ObjectEventSetHeldMovement(trainerObj, direction); task->tFuncId++; return TRUE; } -static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -471,88 +471,88 @@ static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct Eve } } -static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) { if (task->tTrainerRange) { - EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); + ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection)); task->tTrainerRange--; } else { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } } return FALSE; } -static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj; + struct ObjectEvent *playerObj; - if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj)) return FALSE; SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - TryOverrideTemplateCoordsForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - OverrideTemplateCoordsForEventObject(trainerObj); + TryOverrideTemplateCoordsForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + OverrideTemplateCoordsForObjectEvent(trainerObj); - playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj)) + playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; sub_808BCE8(); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection))); task->tFuncId++; return FALSE; } -static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!EventObjectIsMovementOverridden(playerObj) - || EventObjectClearHeldMovementIfFinished(playerObj)) + if (!ObjectEventIsMovementOverridden(playerObj) + || ObjectEventClearHeldMovementIfFinished(playerObj)) SwitchTaskToFollowupFunc(taskId); return FALSE; } -static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); task->tFuncId++; } return FALSE; } -static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectClearHeldMovementIfFinished(trainerObj)) + if (ObjectEventClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; return FALSE; } -static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (!EventObjectIsMovementOverridden(trainerObj) - || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!ObjectEventIsMovementOverridden(trainerObj) + || ObjectEventClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); + ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } return FALSE; } -static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { - if (EventObjectCheckHeldMovementStatus(trainerObj)) + if (ObjectEventCheckHeldMovementStatus(trainerObj)) { gFieldEffectArguments[0] = trainerObj->currentCoords.x; gFieldEffectArguments[1] = trainerObj->currentCoords.y; @@ -564,7 +564,7 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Event return FALSE; } -static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { struct Sprite *sprite; @@ -575,15 +575,15 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Event sprite = &gSprites[trainerObj->spriteId]; sprite->oam.priority = 2; - EventObjectClearHeldMovementIfFinished(trainerObj); - EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); + ObjectEventClearHeldMovementIfFinished(trainerObj); + ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection)); task->tFuncId++; } return FALSE; } -static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->tFuncId = 3; @@ -594,34 +594,34 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventO #undef tFuncId #undef tTrainerRange #undef tOutOfAshSpriteId -#undef tTrainerEventObjectId +#undef tTrainerObjectEventId static void sub_80B44C8(u8 taskId) { struct Task *task = &gTasks[taskId]; - struct EventObject *eventObj; + struct ObjectEvent *objEvent; - // another eventObj loaded into by loadword? - LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj); + // another objEvent loaded into by loadword? + LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent); if (!task->data[7]) { - EventObjectClearHeldMovement(eventObj); + ObjectEventClearHeldMovement(objEvent); task->data[7]++; } - sTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj); + sTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent); if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { - SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); - TryOverrideTemplateCoordsForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection)); + SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); + TryOverrideTemplateCoordsForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection)); DestroyTask(taskId); } else { - eventObj->heldMovementFinished = 0; + objEvent->heldMovementFinished = 0; } } -void sub_80B4578(struct EventObject *var) +void sub_80B4578(struct ObjectEvent *var) { StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); } @@ -645,8 +645,8 @@ void TryPrepareSecondApproachingTrainer(void) { gApproachingTrainerId++; gSpecialVar_Result = TRUE; - UnfreezeEventObjects(); - FreezeEventObjectsExceptOne(gApproachingTrainers[1].eventObjectId); + UnfreezeObjectEvents(); + FreezeObjectEventsExceptOne(gApproachingTrainers[1].objectEventId); } else { @@ -718,21 +718,21 @@ static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnim static void SpriteCB_TrainerIcons(struct Sprite *sprite) { - u8 eventObjId; + u8 objEventId; - if (TryGetEventObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &eventObjId) + if (TryGetObjectEventIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &objEventId) || sprite->animEnded) { FieldEffectStop(sprite, sprite->sFldEffId); } else { - struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId]; + struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId]; sprite->sData4 += sprite->sData3; - sprite->pos1.x = eventObjSprite->pos1.x; - sprite->pos1.y = eventObjSprite->pos1.y - 16; - sprite->pos2.x = eventObjSprite->pos2.x; - sprite->pos2.y = eventObjSprite->pos2.y + sprite->sData4; + sprite->pos1.x = objEventSprite->pos1.x; + sprite->pos1.y = objEventSprite->pos1.y - 16; + sprite->pos2.x = objEventSprite->pos2.x; + sprite->pos2.y = objEventSprite->pos2.y + sprite->sData4; if (sprite->sData4) sprite->sData3++; else @@ -747,39 +747,39 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite) #undef sData4 #undef sFldEffId -u8 GetCurrentApproachingTrainerEventObjectId(void) +u8 GetCurrentApproachingTrainerObjectEventId(void) { if (gApproachingTrainerId == 0) - return gApproachingTrainers[0].eventObjectId; + return gApproachingTrainers[0].objectEventId; else - return gApproachingTrainers[1].eventObjectId; + return gApproachingTrainers[1].objectEventId; } -u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId) +u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId) { if (arrayId >= ARRAY_COUNT(gApproachingTrainers)) return 0; else if (arrayId == 0) - return gApproachingTrainers[0].eventObjectId; + return gApproachingTrainers[0].objectEventId; else - return gApproachingTrainers[1].eventObjectId; + return gApproachingTrainers[1].objectEventId; } void PlayerFaceTrainerAfterBattle(void) { - struct EventObject *eventObj; + struct ObjectEvent *objEvent; if (gTrainerApproachedPlayer == TRUE) { - eventObj = &gEventObjects[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].eventObjectId]; - gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(eventObj->facingDirection)); + objEvent = &gObjectEvents[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].objectEventId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(objEvent->facingDirection)); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } else { - eventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(eventObj->facingDirection); + objEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(objEvent->facingDirection); gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } diff --git a/src/tv.c b/src/tv.c index c810855518..a77f42a759 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1034,7 +1034,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void) return 0; } -void GabbyAndTySetScriptVarsToEventObjectLocalIds(void) +void GabbyAndTySetScriptVarsToObjectEventLocalIds(void) { switch (GabbyAndTyGetBattleNum()) { @@ -3593,7 +3593,7 @@ void GetMomOrDadStringForTVMessage(void) void sub_80F01B8(void) { VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0); - RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER); } diff --git a/src/union_room.c b/src/union_room.c index d6b7125581..f71120e598 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -4249,7 +4249,7 @@ void sub_801818C(bool32 arg0) void sub_80181CC(void) { ScriptContext2_Enable(); - ScriptFreezeEventObjects(); + ScriptFreezeObjectEvents(); } u8 sub_80181DC(struct UnkStruct_URoom *arg0) diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c index 0b7324366c..2fadad6bd4 100644 --- a/src/union_room_player_avatar.c +++ b/src/union_room_player_avatar.c @@ -124,30 +124,30 @@ static void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId) VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId); } -static void CreateUnionRoomPlayerEventObject(u32 playerIdx) +static void CreateUnionRoomPlayerObjectEvent(u32 playerIdx) { - TrySpawnEventObject(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + TrySpawnObjectEvent(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } -static void RemoveUnionRoomPlayerEventObject(u32 playerIdx) +static void RemoveUnionRoomPlayerObjectEvent(u32 playerIdx) { - RemoveEventObjectByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + RemoveObjectEventByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); } static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement) { u8 objectId; - struct EventObject * object; - if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) + struct ObjectEvent * object; + if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) { return FALSE; } - object = &gEventObjects[objectId]; - if (EventObjectIsMovementOverridden(object)) + object = &gObjectEvents[objectId]; + if (ObjectEventIsMovementOverridden(object)) { return FALSE; } - if (EventObjectSetHeldMovement(object, *movement)) + if (ObjectEventSetHeldMovement(object, *movement)) { return FALSE; } @@ -157,23 +157,23 @@ static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * move static bool32 sub_8019B3C(u32 playerIdx) { u8 objectId; - struct EventObject * object; - if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) + struct ObjectEvent * object; + if (TryGetObjectEventIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId)) { return TRUE; } - object = &gEventObjects[objectId]; - if (!EventObjectClearHeldMovementIfFinished(object)) + object = &gObjectEvents[objectId]; + if (!ObjectEventClearHeldMovementIfFinished(object)) { return FALSE; } if (!ScriptContext2_IsEnabled()) { - UnfreezeEventObject(object); + UnfreezeObjectEvent(object); } else { - FreezeEventObject(object); + FreezeObjectEvent(object); } return TRUE; } @@ -208,7 +208,7 @@ static bool32 sub_8019BDC(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr case 1: if (sub_8019B3C(playerIdx)) { - RemoveUnionRoomPlayerEventObject(playerIdx); + RemoveUnionRoomPlayerObjectEvent(playerIdx); HideUnionRoomPlayer(playerIdx); *a0 = 0; return TRUE; @@ -240,7 +240,7 @@ static bool32 sub_8019C38(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr break; } SetUnionRoomPlayerGfx(playerIdx, ptr->field_1); - CreateUnionRoomPlayerEventObject(playerIdx); + CreateUnionRoomPlayerObjectEvent(playerIdx); ShowUnionRoomPlayer(playerIdx); (*a0)++; // fallthrough @@ -310,7 +310,7 @@ static void sub_8019D44(u32 playerIdx, struct UnkStruct_8019BA8 * ptr) { ptr->field_0 = 0; ptr->field_2 = 0; - RemoveUnionRoomPlayerEventObject(playerIdx); + RemoveUnionRoomPlayerObjectEvent(playerIdx); HideUnionRoomPlayer(playerIdx); } else if (sub_8019C38(&ptr->field_2, playerIdx, ptr) == 1) @@ -376,7 +376,7 @@ void sub_8019E3C(void) { if (!IsUnionRoomPlayerHidden(i)) { - RemoveUnionRoomPlayerEventObject(i); + RemoveUnionRoomPlayerObjectEvent(i); HideUnionRoomPlayer(i); } } diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 1cf196fda6..baa93233b7 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -149,7 +149,7 @@ string generate_map_events_text(Json map_data) { string objects_label, warps_label, coords_label, bgs_label; if (map_data["object_events"].array_items().size() > 0) { - objects_label = map_data["name"].string_value() + "_EventObjects"; + objects_label = map_data["name"].string_value() + "_ObjectEvents"; text << objects_label << ":\n"; for (unsigned int i = 0; i < map_data["object_events"].array_items().size(); i++) { auto obj_event = map_data["object_events"].array_items()[i];