From 54d5a7ad9781ffc890775ed510cebf0687102466 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Fri, 7 Sep 2018 14:14:52 +0100 Subject: [PATCH] Format event object pic tables --- include/sprite.h | 2 + .../berry_tree_graphics_tables.h | 540 ++-- .../field_event_obj/event_object_graphics.h | 8 +- .../field_event_obj/event_object_pic_tables.h | 2840 ++++++++--------- .../field_event_obj/field_effect_objects.h | 282 +- 5 files changed, 1837 insertions(+), 1835 deletions(-) diff --git a/include/sprite.h b/include/sprite.h index f972d09cc..6270511c9 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -26,6 +26,8 @@ struct SpriteFrameImage #define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} +#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame)/2, .size = (width * height)/2} + struct SpritePalette { const u16 *data; // Raw uncompressed palette data diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h index 31d515a82..679a0e5a5 100755 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -2,421 +2,421 @@ #define GUARD_BERRY_TREE_GRAPHICS_TABLES_H const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_0), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_1), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_2), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_3), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_4), - obj_frame_tiles(gEventObjectPic_PechaBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4), - obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_0), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_1), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_2), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_3), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_4), - obj_frame_tiles(gEventObjectPic_WepearBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4), - obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_0), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_1), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_2), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_3), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_4), - obj_frame_tiles(gEventObjectPic_CheriBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_0), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_1), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_2), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_3), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_4), - obj_frame_tiles(gEventObjectPic_FigyBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_0), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_1), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_2), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_3), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_4), - obj_frame_tiles(gEventObjectPic_MagoBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LumBerryTree_0), - obj_frame_tiles(gEventObjectPic_LumBerryTree_1), - obj_frame_tiles(gEventObjectPic_LumBerryTree_2), - obj_frame_tiles(gEventObjectPic_LumBerryTree_3), - obj_frame_tiles(gEventObjectPic_LumBerryTree_4), - obj_frame_tiles(gEventObjectPic_LumBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_0), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_1), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_2), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_3), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_4), - obj_frame_tiles(gEventObjectPic_RazzBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4), - obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4), - obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_0), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_1), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_2), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_3), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_4), - obj_frame_tiles(gEventObjectPic_NomelBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4), - obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4), - obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_0), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_1), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_2), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_3), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_4), - obj_frame_tiles(gEventObjectPic_HondewBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_0), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_1), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_2), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_3), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_4), - obj_frame_tiles(gEventObjectPic_AguavBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_0), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_1), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_2), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_3), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_4), - obj_frame_tiles(gEventObjectPic_WikiBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_0), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_1), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_2), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_3), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_4), - obj_frame_tiles(gEventObjectPic_PomegBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_0), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_1), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_2), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_3), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_4), - obj_frame_tiles(gEventObjectPic_RawstBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4), - obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4), - obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_OranBerryTree_0), - obj_frame_tiles(gEventObjectPic_OranBerryTree_1), - obj_frame_tiles(gEventObjectPic_OranBerryTree_2), - obj_frame_tiles(gEventObjectPic_OranBerryTree_3), - obj_frame_tiles(gEventObjectPic_OranBerryTree_4), - obj_frame_tiles(gEventObjectPic_OranBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_0), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_1), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_2), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_3), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_4), - obj_frame_tiles(gEventObjectPic_PersimBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4), - obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_0), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_1), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_2), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_3), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_4), - obj_frame_tiles(gEventObjectPic_AspearBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4), - obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_0), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_1), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_2), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_3), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_4), - obj_frame_tiles(gEventObjectPic_CornnBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_0), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_1), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_2), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_3), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_4), - obj_frame_tiles(gEventObjectPic_LansatBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_0), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_1), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_2), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_3), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_4), - obj_frame_tiles(gEventObjectPic_DurinBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0), - obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4), - obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 0), + overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 2), + overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 3), + overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 4), + overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 5), }; const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 2fd1380ee..522f14db4 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -100,8 +100,8 @@ const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/ const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/wwoman_7.4bpp"); -const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp"); +const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp"); +const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp"); @@ -156,7 +156,7 @@ const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/peo 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/wallace.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"); @@ -307,7 +307,7 @@ const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/event_objects/p const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal"); const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple.4bpp"); const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/event_objects/pics/effects/ash.4bpp"); -const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/0.4bpp"); +const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow.4bpp"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/0.4bpp"); diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index 892af7e9b..53f5976f1 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -2,748 +2,748 @@ #define GUARD_EVENT_OBJECT_PIC_TABLES_H const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = { - obj_frame_tiles(gEventObjectPic_BrendanNormal_0), - obj_frame_tiles(gEventObjectPic_BrendanNormal_1), - obj_frame_tiles(gEventObjectPic_BrendanNormal_2), - obj_frame_tiles(gEventObjectPic_BrendanNormal_3), - obj_frame_tiles(gEventObjectPic_BrendanNormal_4), - obj_frame_tiles(gEventObjectPic_BrendanNormal_5), - obj_frame_tiles(gEventObjectPic_BrendanNormal_6), - obj_frame_tiles(gEventObjectPic_BrendanNormal_7), - obj_frame_tiles(gEventObjectPic_BrendanNormal_8), - obj_frame_tiles(gEventObjectPic_BrendanNormal_9), - obj_frame_tiles(gEventObjectPic_BrendanNormal_10), - obj_frame_tiles(gEventObjectPic_BrendanNormal_11), - obj_frame_tiles(gEventObjectPic_BrendanNormal_12), - obj_frame_tiles(gEventObjectPic_BrendanNormal_13), - obj_frame_tiles(gEventObjectPic_BrendanNormal_14), - obj_frame_tiles(gEventObjectPic_BrendanNormal_15), - obj_frame_tiles(gEventObjectPic_BrendanNormal_16), - obj_frame_tiles(gEventObjectPic_BrendanNormal_17), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 0), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 1), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 2), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 3), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 4), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 5), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 6), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 7), + overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 8), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 0), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 1), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 2), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 3), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 4), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 5), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 6), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 7), + overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - obj_frame_tiles(gEventObjectPic_BrendanMachBike_0), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_1), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_2), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_3), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_4), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_5), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_6), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_7), - obj_frame_tiles(gEventObjectPic_BrendanMachBike_8), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 4), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 5), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 6), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 7), + overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25), - obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 4), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 5), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 6), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 7), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 8), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 9), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 10), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 11), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 12), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 13), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 14), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 15), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 16), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 17), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 18), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 19), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 20), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 21), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 22), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 23), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 24), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 25), + overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 26), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_0), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_1), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_2), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_3), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_4), - obj_frame_tiles(gEventObjectPic_BrendanSurfing_5), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 5), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), - obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3), - obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4), + overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 4), }; const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - obj_frame_tiles(gEventObjectPic_QuintyPlump_0), - obj_frame_tiles(gEventObjectPic_QuintyPlump_1), - obj_frame_tiles(gEventObjectPic_QuintyPlump_2), - obj_frame_tiles(gEventObjectPic_QuintyPlump_3), - obj_frame_tiles(gEventObjectPic_QuintyPlump_4), - obj_frame_tiles(gEventObjectPic_QuintyPlump_5), - obj_frame_tiles(gEventObjectPic_QuintyPlump_6), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 0), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 1), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 2), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 3), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 4), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 5), + overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 6), }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy1_0), - obj_frame_tiles(gEventObjectPic_LittleBoy1_1), - obj_frame_tiles(gEventObjectPic_LittleBoy1_2), - obj_frame_tiles(gEventObjectPic_LittleBoy1_3), - obj_frame_tiles(gEventObjectPic_LittleBoy1_4), - obj_frame_tiles(gEventObjectPic_LittleBoy1_5), - obj_frame_tiles(gEventObjectPic_LittleBoy1_6), - obj_frame_tiles(gEventObjectPic_LittleBoy1_7), - obj_frame_tiles(gEventObjectPic_LittleBoy1_8), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 0), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 1), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 2), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 3), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 4), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 5), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 6), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 7), + overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - obj_frame_tiles(gEventObjectPic_LittleGirl1_0), - obj_frame_tiles(gEventObjectPic_LittleGirl1_1), - obj_frame_tiles(gEventObjectPic_LittleGirl1_2), - obj_frame_tiles(gEventObjectPic_LittleGirl1_3), - obj_frame_tiles(gEventObjectPic_LittleGirl1_4), - obj_frame_tiles(gEventObjectPic_LittleGirl1_5), - obj_frame_tiles(gEventObjectPic_LittleGirl1_6), - obj_frame_tiles(gEventObjectPic_LittleGirl1_7), - obj_frame_tiles(gEventObjectPic_LittleGirl1_8), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 0), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 1), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 2), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 3), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 4), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 5), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 6), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 7), + overworld_frame(gEventObjectPic_LittleGirl1, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - obj_frame_tiles(gEventObjectPic_Boy1_0), - obj_frame_tiles(gEventObjectPic_Boy1_1), - obj_frame_tiles(gEventObjectPic_Boy1_2), - obj_frame_tiles(gEventObjectPic_Boy1_3), - obj_frame_tiles(gEventObjectPic_Boy1_4), - obj_frame_tiles(gEventObjectPic_Boy1_5), - obj_frame_tiles(gEventObjectPic_Boy1_6), - obj_frame_tiles(gEventObjectPic_Boy1_7), - obj_frame_tiles(gEventObjectPic_Boy1_8), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 2), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 3), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 4), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 5), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 6), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 7), + overworld_frame(gEventObjectPic_Boy1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - obj_frame_tiles(gEventObjectPic_Girl1_0), - obj_frame_tiles(gEventObjectPic_Girl1_1), - obj_frame_tiles(gEventObjectPic_Girl1_2), - obj_frame_tiles(gEventObjectPic_Girl1_3), - obj_frame_tiles(gEventObjectPic_Girl1_4), - obj_frame_tiles(gEventObjectPic_Girl1_5), - obj_frame_tiles(gEventObjectPic_Girl1_6), - obj_frame_tiles(gEventObjectPic_Girl1_7), - obj_frame_tiles(gEventObjectPic_Girl1_8), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 0), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 1), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 2), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 3), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 4), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 5), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 6), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 7), + overworld_frame(gEventObjectPic_Girl1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - obj_frame_tiles(gEventObjectPic_Boy2_0), - obj_frame_tiles(gEventObjectPic_Boy2_1), - obj_frame_tiles(gEventObjectPic_Boy2_2), - obj_frame_tiles(gEventObjectPic_Boy2_3), - obj_frame_tiles(gEventObjectPic_Boy2_4), - obj_frame_tiles(gEventObjectPic_Boy2_5), - obj_frame_tiles(gEventObjectPic_Boy2_6), - obj_frame_tiles(gEventObjectPic_Boy2_7), - obj_frame_tiles(gEventObjectPic_Boy2_8), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 2), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 3), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 4), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 5), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 6), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 7), + overworld_frame(gEventObjectPic_Boy2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - obj_frame_tiles(gEventObjectPic_Girl2_0), - obj_frame_tiles(gEventObjectPic_Girl2_1), - obj_frame_tiles(gEventObjectPic_Girl2_2), - obj_frame_tiles(gEventObjectPic_Girl2_3), - obj_frame_tiles(gEventObjectPic_Girl2_4), - obj_frame_tiles(gEventObjectPic_Girl2_5), - obj_frame_tiles(gEventObjectPic_Girl2_6), - obj_frame_tiles(gEventObjectPic_Girl2_7), - obj_frame_tiles(gEventObjectPic_Girl2_8), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 0), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 1), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 2), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 3), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 4), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 5), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 6), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 7), + overworld_frame(gEventObjectPic_Girl2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { - obj_frame_tiles(gEventObjectPic_LittleBoy2_0), - obj_frame_tiles(gEventObjectPic_LittleBoy2_1), - obj_frame_tiles(gEventObjectPic_LittleBoy2_2), - obj_frame_tiles(gEventObjectPic_LittleBoy2_3), - obj_frame_tiles(gEventObjectPic_LittleBoy2_4), - obj_frame_tiles(gEventObjectPic_LittleBoy2_5), - obj_frame_tiles(gEventObjectPic_LittleBoy2_6), - obj_frame_tiles(gEventObjectPic_LittleBoy2_7), - obj_frame_tiles(gEventObjectPic_LittleBoy2_8), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 0), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 1), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 2), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 3), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 4), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 5), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 6), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 7), + overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - obj_frame_tiles(gEventObjectPic_LittleGirl2_0), - obj_frame_tiles(gEventObjectPic_LittleGirl2_1), - obj_frame_tiles(gEventObjectPic_LittleGirl2_2), - obj_frame_tiles(gEventObjectPic_LittleGirl2_3), - obj_frame_tiles(gEventObjectPic_LittleGirl2_4), - obj_frame_tiles(gEventObjectPic_LittleGirl2_5), - obj_frame_tiles(gEventObjectPic_LittleGirl2_6), - obj_frame_tiles(gEventObjectPic_LittleGirl2_7), - obj_frame_tiles(gEventObjectPic_LittleGirl2_8), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 0), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 1), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 2), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 3), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 4), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 5), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 6), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 7), + overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - obj_frame_tiles(gEventObjectPic_Boy3_0), - obj_frame_tiles(gEventObjectPic_Boy3_1), - obj_frame_tiles(gEventObjectPic_Boy3_2), - obj_frame_tiles(gEventObjectPic_Boy3_3), - obj_frame_tiles(gEventObjectPic_Boy3_4), - obj_frame_tiles(gEventObjectPic_Boy3_5), - obj_frame_tiles(gEventObjectPic_Boy3_6), - obj_frame_tiles(gEventObjectPic_Boy3_7), - obj_frame_tiles(gEventObjectPic_Boy3_8), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 2), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 3), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 4), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 5), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 6), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 7), + overworld_frame(gEventObjectPic_Boy3, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - obj_frame_tiles(gEventObjectPic_Girl3_0), - obj_frame_tiles(gEventObjectPic_Girl3_1), - obj_frame_tiles(gEventObjectPic_Girl3_2), - obj_frame_tiles(gEventObjectPic_Girl3_3), - obj_frame_tiles(gEventObjectPic_Girl3_4), - obj_frame_tiles(gEventObjectPic_Girl3_5), - obj_frame_tiles(gEventObjectPic_Girl3_6), - obj_frame_tiles(gEventObjectPic_Girl3_7), - obj_frame_tiles(gEventObjectPic_Girl3_8), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 0), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 1), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 2), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 3), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 4), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 5), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 6), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 7), + overworld_frame(gEventObjectPic_Girl3, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { - obj_frame_tiles(gEventObjectPic_Boy4_0), - obj_frame_tiles(gEventObjectPic_Boy4_1), - obj_frame_tiles(gEventObjectPic_Boy4_2), - obj_frame_tiles(gEventObjectPic_Boy4_3), - obj_frame_tiles(gEventObjectPic_Boy4_4), - obj_frame_tiles(gEventObjectPic_Boy4_5), - obj_frame_tiles(gEventObjectPic_Boy4_6), - obj_frame_tiles(gEventObjectPic_Boy4_7), - obj_frame_tiles(gEventObjectPic_Boy4_8), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 2), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 3), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 4), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 5), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 6), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 7), + overworld_frame(gEventObjectPic_Boy4, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - obj_frame_tiles(gEventObjectPic_Woman1_0), - obj_frame_tiles(gEventObjectPic_Woman1_1), - obj_frame_tiles(gEventObjectPic_Woman1_2), - obj_frame_tiles(gEventObjectPic_Woman1_3), - obj_frame_tiles(gEventObjectPic_Woman1_4), - obj_frame_tiles(gEventObjectPic_Woman1_5), - obj_frame_tiles(gEventObjectPic_Woman1_6), - obj_frame_tiles(gEventObjectPic_Woman1_7), - obj_frame_tiles(gEventObjectPic_Woman1_8), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - obj_frame_tiles(gEventObjectPic_FatMan_0), - obj_frame_tiles(gEventObjectPic_FatMan_1), - obj_frame_tiles(gEventObjectPic_FatMan_2), - obj_frame_tiles(gEventObjectPic_FatMan_3), - obj_frame_tiles(gEventObjectPic_FatMan_4), - obj_frame_tiles(gEventObjectPic_FatMan_5), - obj_frame_tiles(gEventObjectPic_FatMan_6), - obj_frame_tiles(gEventObjectPic_FatMan_7), - obj_frame_tiles(gEventObjectPic_FatMan_8), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 0), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 1), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 2), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 3), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 4), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 5), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 6), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 7), + overworld_frame(gEventObjectPic_FatMan, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - obj_frame_tiles(gEventObjectPic_Woman2_0), - obj_frame_tiles(gEventObjectPic_Woman2_1), - obj_frame_tiles(gEventObjectPic_Woman2_2), - obj_frame_tiles(gEventObjectPic_Woman2_3), - obj_frame_tiles(gEventObjectPic_Woman2_4), - obj_frame_tiles(gEventObjectPic_Woman2_5), - obj_frame_tiles(gEventObjectPic_Woman2_6), - obj_frame_tiles(gEventObjectPic_Woman2_7), - obj_frame_tiles(gEventObjectPic_Woman2_8), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - obj_frame_tiles(gEventObjectPic_Man1_0), - obj_frame_tiles(gEventObjectPic_Man1_1), - obj_frame_tiles(gEventObjectPic_Man1_2), - obj_frame_tiles(gEventObjectPic_Man1_3), - obj_frame_tiles(gEventObjectPic_Man1_4), - obj_frame_tiles(gEventObjectPic_Man1_5), - obj_frame_tiles(gEventObjectPic_Man1_6), - obj_frame_tiles(gEventObjectPic_Man1_7), - obj_frame_tiles(gEventObjectPic_Man1_8), + overworld_frame(gEventObjectPic_Man1, 16, 32, 0), + overworld_frame(gEventObjectPic_Man1, 16, 32, 1), + overworld_frame(gEventObjectPic_Man1, 16, 32, 2), + overworld_frame(gEventObjectPic_Man1, 16, 32, 3), + overworld_frame(gEventObjectPic_Man1, 16, 32, 4), + overworld_frame(gEventObjectPic_Man1, 16, 32, 5), + overworld_frame(gEventObjectPic_Man1, 16, 32, 6), + overworld_frame(gEventObjectPic_Man1, 16, 32, 7), + overworld_frame(gEventObjectPic_Man1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - obj_frame_tiles(gEventObjectPic_Woman3_0), - obj_frame_tiles(gEventObjectPic_Woman3_1), - obj_frame_tiles(gEventObjectPic_Woman3_2), - obj_frame_tiles(gEventObjectPic_Woman3_3), - obj_frame_tiles(gEventObjectPic_Woman3_4), - obj_frame_tiles(gEventObjectPic_Woman3_5), - obj_frame_tiles(gEventObjectPic_Woman3_6), - obj_frame_tiles(gEventObjectPic_Woman3_7), - obj_frame_tiles(gEventObjectPic_Woman3_8), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman3, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { - obj_frame_tiles(gEventObjectPic_OldMan1_0), - obj_frame_tiles(gEventObjectPic_OldMan1_1), - obj_frame_tiles(gEventObjectPic_OldMan1_2), - obj_frame_tiles(gEventObjectPic_OldMan1_3), - obj_frame_tiles(gEventObjectPic_OldMan1_4), - obj_frame_tiles(gEventObjectPic_OldMan1_5), - obj_frame_tiles(gEventObjectPic_OldMan1_6), - obj_frame_tiles(gEventObjectPic_OldMan1_7), - obj_frame_tiles(gEventObjectPic_OldMan1_8), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 0), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 1), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 2), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 3), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 4), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 5), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 6), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 7), + overworld_frame(gEventObjectPic_OldMan1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - obj_frame_tiles(gEventObjectPic_OldWoman1_0), - obj_frame_tiles(gEventObjectPic_OldWoman1_1), - obj_frame_tiles(gEventObjectPic_OldWoman1_2), - obj_frame_tiles(gEventObjectPic_OldWoman1_3), - obj_frame_tiles(gEventObjectPic_OldWoman1_4), - obj_frame_tiles(gEventObjectPic_OldWoman1_5), - obj_frame_tiles(gEventObjectPic_OldWoman1_6), - obj_frame_tiles(gEventObjectPic_OldWoman1_7), - obj_frame_tiles(gEventObjectPic_OldWoman1_8), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 0), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 1), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 2), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 3), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 4), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 5), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 6), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 7), + overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - obj_frame_tiles(gEventObjectPic_Man2_0), - obj_frame_tiles(gEventObjectPic_Man2_1), - obj_frame_tiles(gEventObjectPic_Man2_2), - obj_frame_tiles(gEventObjectPic_Man2_3), - obj_frame_tiles(gEventObjectPic_Man2_4), - obj_frame_tiles(gEventObjectPic_Man2_5), - obj_frame_tiles(gEventObjectPic_Man2_6), - obj_frame_tiles(gEventObjectPic_Man2_7), - obj_frame_tiles(gEventObjectPic_Man2_8), + overworld_frame(gEventObjectPic_Man2, 16, 32, 0), + overworld_frame(gEventObjectPic_Man2, 16, 32, 1), + overworld_frame(gEventObjectPic_Man2, 16, 32, 2), + overworld_frame(gEventObjectPic_Man2, 16, 32, 3), + overworld_frame(gEventObjectPic_Man2, 16, 32, 4), + overworld_frame(gEventObjectPic_Man2, 16, 32, 5), + overworld_frame(gEventObjectPic_Man2, 16, 32, 6), + overworld_frame(gEventObjectPic_Man2, 16, 32, 7), + overworld_frame(gEventObjectPic_Man2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - obj_frame_tiles(gEventObjectPic_Woman4_0), - obj_frame_tiles(gEventObjectPic_Woman4_1), - obj_frame_tiles(gEventObjectPic_Woman4_2), - obj_frame_tiles(gEventObjectPic_Woman4_3), - obj_frame_tiles(gEventObjectPic_Woman4_4), - obj_frame_tiles(gEventObjectPic_Woman4_5), - obj_frame_tiles(gEventObjectPic_Woman4_6), - obj_frame_tiles(gEventObjectPic_Woman4_7), - obj_frame_tiles(gEventObjectPic_Woman4_8), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman4, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - obj_frame_tiles(gEventObjectPic_Man3_0), - obj_frame_tiles(gEventObjectPic_Man3_1), - obj_frame_tiles(gEventObjectPic_Man3_2), - obj_frame_tiles(gEventObjectPic_Man3_3), - obj_frame_tiles(gEventObjectPic_Man3_4), - obj_frame_tiles(gEventObjectPic_Man3_5), - obj_frame_tiles(gEventObjectPic_Man3_6), - obj_frame_tiles(gEventObjectPic_Man3_7), - obj_frame_tiles(gEventObjectPic_Man3_8), + overworld_frame(gEventObjectPic_Man3, 16, 32, 0), + overworld_frame(gEventObjectPic_Man3, 16, 32, 1), + overworld_frame(gEventObjectPic_Man3, 16, 32, 2), + overworld_frame(gEventObjectPic_Man3, 16, 32, 3), + overworld_frame(gEventObjectPic_Man3, 16, 32, 4), + overworld_frame(gEventObjectPic_Man3, 16, 32, 5), + overworld_frame(gEventObjectPic_Man3, 16, 32, 6), + overworld_frame(gEventObjectPic_Man3, 16, 32, 7), + overworld_frame(gEventObjectPic_Man3, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - obj_frame_tiles(gEventObjectPic_Woman5_0), - obj_frame_tiles(gEventObjectPic_Woman5_1), - obj_frame_tiles(gEventObjectPic_Woman5_2), - obj_frame_tiles(gEventObjectPic_Woman5_3), - obj_frame_tiles(gEventObjectPic_Woman5_4), - obj_frame_tiles(gEventObjectPic_Woman5_5), - obj_frame_tiles(gEventObjectPic_Woman5_6), - obj_frame_tiles(gEventObjectPic_Woman5_7), - obj_frame_tiles(gEventObjectPic_Woman5_8), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman5, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_2), - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_0), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_1), - obj_frame_tiles(gEventObjectPic_Cook_2), - obj_frame_tiles(gEventObjectPic_Cook_2), + overworld_frame(gEventObjectPic_Cook, 16, 32, 0), + overworld_frame(gEventObjectPic_Cook, 16, 32, 1), + overworld_frame(gEventObjectPic_Cook, 16, 32, 2), + overworld_frame(gEventObjectPic_Cook, 16, 32, 0), + overworld_frame(gEventObjectPic_Cook, 16, 32, 0), + overworld_frame(gEventObjectPic_Cook, 16, 32, 1), + overworld_frame(gEventObjectPic_Cook, 16, 32, 1), + overworld_frame(gEventObjectPic_Cook, 16, 32, 2), + overworld_frame(gEventObjectPic_Cook, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { - obj_frame_tiles(gEventObjectPic_Woman6_0), - obj_frame_tiles(gEventObjectPic_Woman6_1), - obj_frame_tiles(gEventObjectPic_Woman6_2), - obj_frame_tiles(gEventObjectPic_Woman6_3), - obj_frame_tiles(gEventObjectPic_Woman6_4), - obj_frame_tiles(gEventObjectPic_Woman6_5), - obj_frame_tiles(gEventObjectPic_Woman6_6), - obj_frame_tiles(gEventObjectPic_Woman6_7), - obj_frame_tiles(gEventObjectPic_Woman6_8), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman6, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_2), - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_0), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_1), - obj_frame_tiles(gEventObjectPic_OldMan2_2), - obj_frame_tiles(gEventObjectPic_OldMan2_2), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 0), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 1), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 2), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 0), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 0), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 1), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 1), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 2), + overworld_frame(gEventObjectPic_OldMan2, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - obj_frame_tiles(gEventObjectPic_OldWoman2_0), - obj_frame_tiles(gEventObjectPic_OldWoman2_1), - obj_frame_tiles(gEventObjectPic_OldWoman2_2), - obj_frame_tiles(gEventObjectPic_OldWoman2_3), - obj_frame_tiles(gEventObjectPic_OldWoman2_4), - obj_frame_tiles(gEventObjectPic_OldWoman2_5), - obj_frame_tiles(gEventObjectPic_OldWoman2_6), - obj_frame_tiles(gEventObjectPic_OldWoman2_7), - obj_frame_tiles(gEventObjectPic_OldWoman2_8), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 0), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 1), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 2), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 3), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 4), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 5), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 6), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 7), + overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - obj_frame_tiles(gEventObjectPic_Camper_0), - obj_frame_tiles(gEventObjectPic_Camper_1), - obj_frame_tiles(gEventObjectPic_Camper_2), - obj_frame_tiles(gEventObjectPic_Camper_3), - obj_frame_tiles(gEventObjectPic_Camper_4), - obj_frame_tiles(gEventObjectPic_Camper_5), - obj_frame_tiles(gEventObjectPic_Camper_6), - obj_frame_tiles(gEventObjectPic_Camper_7), - obj_frame_tiles(gEventObjectPic_Camper_8), + overworld_frame(gEventObjectPic_Camper, 16, 32, 0), + overworld_frame(gEventObjectPic_Camper, 16, 32, 1), + overworld_frame(gEventObjectPic_Camper, 16, 32, 2), + overworld_frame(gEventObjectPic_Camper, 16, 32, 3), + overworld_frame(gEventObjectPic_Camper, 16, 32, 4), + overworld_frame(gEventObjectPic_Camper, 16, 32, 5), + overworld_frame(gEventObjectPic_Camper, 16, 32, 6), + overworld_frame(gEventObjectPic_Camper, 16, 32, 7), + overworld_frame(gEventObjectPic_Camper, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - obj_frame_tiles(gEventObjectPic_Picnicker_0), - obj_frame_tiles(gEventObjectPic_Picnicker_1), - obj_frame_tiles(gEventObjectPic_Picnicker_2), - obj_frame_tiles(gEventObjectPic_Picnicker_3), - obj_frame_tiles(gEventObjectPic_Picnicker_4), - obj_frame_tiles(gEventObjectPic_Picnicker_5), - obj_frame_tiles(gEventObjectPic_Picnicker_6), - obj_frame_tiles(gEventObjectPic_Picnicker_7), - obj_frame_tiles(gEventObjectPic_Picnicker_8), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 0), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 1), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 2), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 3), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 4), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 5), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 6), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 7), + overworld_frame(gEventObjectPic_Picnicker, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - obj_frame_tiles(gEventObjectPic_Man4_0), - obj_frame_tiles(gEventObjectPic_Man4_1), - obj_frame_tiles(gEventObjectPic_Man4_2), - obj_frame_tiles(gEventObjectPic_Man4_3), - obj_frame_tiles(gEventObjectPic_Man4_4), - obj_frame_tiles(gEventObjectPic_Man4_5), - obj_frame_tiles(gEventObjectPic_Man4_6), - obj_frame_tiles(gEventObjectPic_Man4_7), - obj_frame_tiles(gEventObjectPic_Man4_8), + overworld_frame(gEventObjectPic_Man4, 16, 32, 0), + overworld_frame(gEventObjectPic_Man4, 16, 32, 1), + overworld_frame(gEventObjectPic_Man4, 16, 32, 2), + overworld_frame(gEventObjectPic_Man4, 16, 32, 3), + overworld_frame(gEventObjectPic_Man4, 16, 32, 4), + overworld_frame(gEventObjectPic_Man4, 16, 32, 5), + overworld_frame(gEventObjectPic_Man4, 16, 32, 6), + overworld_frame(gEventObjectPic_Man4, 16, 32, 7), + overworld_frame(gEventObjectPic_Man4, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { - obj_frame_tiles(gEventObjectPic_Woman7_0), - obj_frame_tiles(gEventObjectPic_Woman7_1), - obj_frame_tiles(gEventObjectPic_Woman7_2), - obj_frame_tiles(gEventObjectPic_Woman7_3), - obj_frame_tiles(gEventObjectPic_Woman7_4), - obj_frame_tiles(gEventObjectPic_Woman7_5), - obj_frame_tiles(gEventObjectPic_Woman7_6), - obj_frame_tiles(gEventObjectPic_Woman7_7), - obj_frame_tiles(gEventObjectPic_Woman7_8), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 0), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 1), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 2), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 3), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 4), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 5), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 6), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 7), + overworld_frame(gEventObjectPic_Woman7, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - obj_frame_tiles(gEventObjectPic_Youngster_0), - obj_frame_tiles(gEventObjectPic_Youngster_1), - obj_frame_tiles(gEventObjectPic_Youngster_2), - obj_frame_tiles(gEventObjectPic_Youngster_3), - obj_frame_tiles(gEventObjectPic_Youngster_4), - obj_frame_tiles(gEventObjectPic_Youngster_5), - obj_frame_tiles(gEventObjectPic_Youngster_6), - obj_frame_tiles(gEventObjectPic_Youngster_7), - obj_frame_tiles(gEventObjectPic_Youngster_8), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 0), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 1), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 2), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 3), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 4), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 5), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 6), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 7), + overworld_frame(gEventObjectPic_Youngster, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - obj_frame_tiles(gEventObjectPic_BugCatcher_0), - obj_frame_tiles(gEventObjectPic_BugCatcher_1), - obj_frame_tiles(gEventObjectPic_BugCatcher_2), - obj_frame_tiles(gEventObjectPic_BugCatcher_3), - obj_frame_tiles(gEventObjectPic_BugCatcher_4), - obj_frame_tiles(gEventObjectPic_BugCatcher_5), - obj_frame_tiles(gEventObjectPic_BugCatcher_6), - obj_frame_tiles(gEventObjectPic_BugCatcher_7), - obj_frame_tiles(gEventObjectPic_BugCatcher_8), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 0), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 1), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 2), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 3), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 4), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 5), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 6), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 7), + overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - obj_frame_tiles(gEventObjectPic_PsychicM_0), - obj_frame_tiles(gEventObjectPic_PsychicM_1), - obj_frame_tiles(gEventObjectPic_PsychicM_2), - obj_frame_tiles(gEventObjectPic_PsychicM_3), - obj_frame_tiles(gEventObjectPic_PsychicM_4), - obj_frame_tiles(gEventObjectPic_PsychicM_5), - obj_frame_tiles(gEventObjectPic_PsychicM_6), - obj_frame_tiles(gEventObjectPic_PsychicM_7), - obj_frame_tiles(gEventObjectPic_PsychicM_8), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 0), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 1), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 2), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 3), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 4), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 5), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 6), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 7), + overworld_frame(gEventObjectPic_PsychicM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - obj_frame_tiles(gEventObjectPic_SchoolKidM_0), - obj_frame_tiles(gEventObjectPic_SchoolKidM_1), - obj_frame_tiles(gEventObjectPic_SchoolKidM_2), - obj_frame_tiles(gEventObjectPic_SchoolKidM_3), - obj_frame_tiles(gEventObjectPic_SchoolKidM_4), - obj_frame_tiles(gEventObjectPic_SchoolKidM_5), - obj_frame_tiles(gEventObjectPic_SchoolKidM_6), - obj_frame_tiles(gEventObjectPic_SchoolKidM_7), - obj_frame_tiles(gEventObjectPic_SchoolKidM_8), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 0), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 1), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 2), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 3), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 4), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 5), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 6), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 7), + overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - obj_frame_tiles(gEventObjectPic_Maniac_0), - obj_frame_tiles(gEventObjectPic_Maniac_1), - obj_frame_tiles(gEventObjectPic_Maniac_2), - obj_frame_tiles(gEventObjectPic_Maniac_3), - obj_frame_tiles(gEventObjectPic_Maniac_4), - obj_frame_tiles(gEventObjectPic_Maniac_5), - obj_frame_tiles(gEventObjectPic_Maniac_6), - obj_frame_tiles(gEventObjectPic_Maniac_7), - obj_frame_tiles(gEventObjectPic_Maniac_8), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 0), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 1), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 2), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 3), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 4), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 5), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 6), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 7), + overworld_frame(gEventObjectPic_Maniac, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - obj_frame_tiles(gEventObjectPic_HexManiac_0), - obj_frame_tiles(gEventObjectPic_HexManiac_1), - obj_frame_tiles(gEventObjectPic_HexManiac_2), - obj_frame_tiles(gEventObjectPic_HexManiac_3), - obj_frame_tiles(gEventObjectPic_HexManiac_4), - obj_frame_tiles(gEventObjectPic_HexManiac_5), - obj_frame_tiles(gEventObjectPic_HexManiac_6), - obj_frame_tiles(gEventObjectPic_HexManiac_7), - obj_frame_tiles(gEventObjectPic_HexManiac_8), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 0), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 1), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 2), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 3), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 4), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 5), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 6), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 7), + overworld_frame(gEventObjectPic_HexManiac, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - obj_frame_tiles(gEventObjectPic_SwimmerM_0), - obj_frame_tiles(gEventObjectPic_SwimmerM_1), - obj_frame_tiles(gEventObjectPic_SwimmerM_2), - obj_frame_tiles(gEventObjectPic_SwimmerM_3), - obj_frame_tiles(gEventObjectPic_SwimmerM_4), - obj_frame_tiles(gEventObjectPic_SwimmerM_5), - obj_frame_tiles(gEventObjectPic_SwimmerM_6), - obj_frame_tiles(gEventObjectPic_SwimmerM_7), - obj_frame_tiles(gEventObjectPic_SwimmerM_8), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 0), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 1), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 2), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 3), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 4), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 5), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 6), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 7), + overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - obj_frame_tiles(gEventObjectPic_SwimmerF_0), - obj_frame_tiles(gEventObjectPic_SwimmerF_1), - obj_frame_tiles(gEventObjectPic_SwimmerF_2), - obj_frame_tiles(gEventObjectPic_SwimmerF_3), - obj_frame_tiles(gEventObjectPic_SwimmerF_4), - obj_frame_tiles(gEventObjectPic_SwimmerF_5), - obj_frame_tiles(gEventObjectPic_SwimmerF_6), - obj_frame_tiles(gEventObjectPic_SwimmerF_7), - obj_frame_tiles(gEventObjectPic_SwimmerF_8), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 0), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 1), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 2), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 3), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 4), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 5), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 6), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 7), + overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - obj_frame_tiles(gEventObjectPic_BlackBelt_0), - obj_frame_tiles(gEventObjectPic_BlackBelt_1), - obj_frame_tiles(gEventObjectPic_BlackBelt_2), - obj_frame_tiles(gEventObjectPic_BlackBelt_3), - obj_frame_tiles(gEventObjectPic_BlackBelt_4), - obj_frame_tiles(gEventObjectPic_BlackBelt_5), - obj_frame_tiles(gEventObjectPic_BlackBelt_6), - obj_frame_tiles(gEventObjectPic_BlackBelt_7), - obj_frame_tiles(gEventObjectPic_BlackBelt_8), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 0), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 1), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 2), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 3), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 4), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 5), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 6), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 7), + overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - obj_frame_tiles(gEventObjectPic_Beauty_0), - obj_frame_tiles(gEventObjectPic_Beauty_1), - obj_frame_tiles(gEventObjectPic_Beauty_2), - obj_frame_tiles(gEventObjectPic_Beauty_3), - obj_frame_tiles(gEventObjectPic_Beauty_4), - obj_frame_tiles(gEventObjectPic_Beauty_5), - obj_frame_tiles(gEventObjectPic_Beauty_6), - obj_frame_tiles(gEventObjectPic_Beauty_7), - obj_frame_tiles(gEventObjectPic_Beauty_8), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 0), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 1), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 2), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 3), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 4), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 5), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 6), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 7), + overworld_frame(gEventObjectPic_Beauty, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - obj_frame_tiles(gEventObjectPic_Scientist1_0), - obj_frame_tiles(gEventObjectPic_Scientist1_1), - obj_frame_tiles(gEventObjectPic_Scientist1_2), - obj_frame_tiles(gEventObjectPic_Scientist1_3), - obj_frame_tiles(gEventObjectPic_Scientist1_4), - obj_frame_tiles(gEventObjectPic_Scientist1_5), - obj_frame_tiles(gEventObjectPic_Scientist1_6), - obj_frame_tiles(gEventObjectPic_Scientist1_7), - obj_frame_tiles(gEventObjectPic_Scientist1_8), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 0), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 1), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 2), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 3), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 4), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 5), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 6), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 7), + overworld_frame(gEventObjectPic_Scientist1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - obj_frame_tiles(gEventObjectPic_Lass_0), - obj_frame_tiles(gEventObjectPic_Lass_1), - obj_frame_tiles(gEventObjectPic_Lass_2), - obj_frame_tiles(gEventObjectPic_Lass_3), - obj_frame_tiles(gEventObjectPic_Lass_4), - obj_frame_tiles(gEventObjectPic_Lass_5), - obj_frame_tiles(gEventObjectPic_Lass_6), - obj_frame_tiles(gEventObjectPic_Lass_7), - obj_frame_tiles(gEventObjectPic_Lass_8), + overworld_frame(gEventObjectPic_Lass, 16, 32, 0), + overworld_frame(gEventObjectPic_Lass, 16, 32, 1), + overworld_frame(gEventObjectPic_Lass, 16, 32, 2), + overworld_frame(gEventObjectPic_Lass, 16, 32, 3), + overworld_frame(gEventObjectPic_Lass, 16, 32, 4), + overworld_frame(gEventObjectPic_Lass, 16, 32, 5), + overworld_frame(gEventObjectPic_Lass, 16, 32, 6), + overworld_frame(gEventObjectPic_Lass, 16, 32, 7), + overworld_frame(gEventObjectPic_Lass, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - obj_frame_tiles(gEventObjectPic_Gentleman_0), - obj_frame_tiles(gEventObjectPic_Gentleman_1), - obj_frame_tiles(gEventObjectPic_Gentleman_2), - obj_frame_tiles(gEventObjectPic_Gentleman_3), - obj_frame_tiles(gEventObjectPic_Gentleman_4), - obj_frame_tiles(gEventObjectPic_Gentleman_5), - obj_frame_tiles(gEventObjectPic_Gentleman_6), - obj_frame_tiles(gEventObjectPic_Gentleman_7), - obj_frame_tiles(gEventObjectPic_Gentleman_8), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 0), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 1), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 2), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 3), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 4), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 5), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 6), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 7), + overworld_frame(gEventObjectPic_Gentleman, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - obj_frame_tiles(gEventObjectPic_Sailor_0), - obj_frame_tiles(gEventObjectPic_Sailor_1), - obj_frame_tiles(gEventObjectPic_Sailor_2), - obj_frame_tiles(gEventObjectPic_Sailor_3), - obj_frame_tiles(gEventObjectPic_Sailor_4), - obj_frame_tiles(gEventObjectPic_Sailor_5), - obj_frame_tiles(gEventObjectPic_Sailor_6), - obj_frame_tiles(gEventObjectPic_Sailor_7), - obj_frame_tiles(gEventObjectPic_Sailor_8), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 0), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 1), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 2), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 3), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 4), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 5), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 6), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 7), + overworld_frame(gEventObjectPic_Sailor, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - obj_frame_tiles(gEventObjectPic_Fisherman_0), - obj_frame_tiles(gEventObjectPic_Fisherman_1), - obj_frame_tiles(gEventObjectPic_Fisherman_2), - obj_frame_tiles(gEventObjectPic_Fisherman_3), - obj_frame_tiles(gEventObjectPic_Fisherman_4), - obj_frame_tiles(gEventObjectPic_Fisherman_5), - obj_frame_tiles(gEventObjectPic_Fisherman_6), - obj_frame_tiles(gEventObjectPic_Fisherman_7), - obj_frame_tiles(gEventObjectPic_Fisherman_8), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 0), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 1), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 2), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 3), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 4), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 5), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 6), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 7), + overworld_frame(gEventObjectPic_Fisherman, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7), - obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 0), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 1), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 2), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 3), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 4), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 5), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 6), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 7), + overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7), - obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 0), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 1), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 2), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 3), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 4), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 5), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 6), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 7), + overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - obj_frame_tiles(gEventObjectPic_TuberF_0), - obj_frame_tiles(gEventObjectPic_TuberF_1), - obj_frame_tiles(gEventObjectPic_TuberF_2), - obj_frame_tiles(gEventObjectPic_TuberF_3), - obj_frame_tiles(gEventObjectPic_TuberF_4), - obj_frame_tiles(gEventObjectPic_TuberF_5), - obj_frame_tiles(gEventObjectPic_TuberF_6), - obj_frame_tiles(gEventObjectPic_TuberF_7), - obj_frame_tiles(gEventObjectPic_TuberF_8), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 0), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 1), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 2), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 3), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 4), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 5), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 6), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 7), + overworld_frame(gEventObjectPic_TuberF, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - obj_frame_tiles(gEventObjectPic_TuberM_0), - obj_frame_tiles(gEventObjectPic_TuberM_1), - obj_frame_tiles(gEventObjectPic_TuberM_2), - obj_frame_tiles(gEventObjectPic_TuberM_3), - obj_frame_tiles(gEventObjectPic_TuberM_4), - obj_frame_tiles(gEventObjectPic_TuberM_5), - obj_frame_tiles(gEventObjectPic_TuberM_6), - obj_frame_tiles(gEventObjectPic_TuberM_7), - obj_frame_tiles(gEventObjectPic_TuberM_8), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 0), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 1), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 2), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 3), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 4), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 5), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 6), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 7), + overworld_frame(gEventObjectPic_TuberM, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - obj_frame_tiles(gEventObjectPic_Hiker_0), - obj_frame_tiles(gEventObjectPic_Hiker_1), - obj_frame_tiles(gEventObjectPic_Hiker_2), - obj_frame_tiles(gEventObjectPic_Hiker_3), - obj_frame_tiles(gEventObjectPic_Hiker_4), - obj_frame_tiles(gEventObjectPic_Hiker_5), - obj_frame_tiles(gEventObjectPic_Hiker_6), - obj_frame_tiles(gEventObjectPic_Hiker_7), - obj_frame_tiles(gEventObjectPic_Hiker_8), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 0), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 1), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 2), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 3), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 4), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 5), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 6), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 7), + overworld_frame(gEventObjectPic_Hiker, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7), - obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - obj_frame_tiles(gEventObjectPic_Nurse_0), - obj_frame_tiles(gEventObjectPic_Nurse_1), - obj_frame_tiles(gEventObjectPic_Nurse_2), - obj_frame_tiles(gEventObjectPic_Nurse_0), - obj_frame_tiles(gEventObjectPic_Nurse_0), - obj_frame_tiles(gEventObjectPic_Nurse_1), - obj_frame_tiles(gEventObjectPic_Nurse_1), - obj_frame_tiles(gEventObjectPic_Nurse_2), - obj_frame_tiles(gEventObjectPic_Nurse_2), - obj_frame_tiles(gEventObjectPic_Nurse_3), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 0), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 1), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 2), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 0), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 0), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 1), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 1), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 2), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 2), + overworld_frame(gEventObjectPic_Nurse, 16, 32, 3), }; const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { @@ -751,87 +751,87 @@ const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { }; const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - obj_frame_tiles(gEventObjectPic_ProfBirch_0), - obj_frame_tiles(gEventObjectPic_ProfBirch_1), - obj_frame_tiles(gEventObjectPic_ProfBirch_2), - obj_frame_tiles(gEventObjectPic_ProfBirch_3), - obj_frame_tiles(gEventObjectPic_ProfBirch_4), - obj_frame_tiles(gEventObjectPic_ProfBirch_5), - obj_frame_tiles(gEventObjectPic_ProfBirch_6), - obj_frame_tiles(gEventObjectPic_ProfBirch_7), - obj_frame_tiles(gEventObjectPic_ProfBirch_8), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 0), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 1), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 2), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 3), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 4), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 5), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 6), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 7), + overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - obj_frame_tiles(gEventObjectPic_Man5_0), - obj_frame_tiles(gEventObjectPic_Man5_1), - obj_frame_tiles(gEventObjectPic_Man5_2), - obj_frame_tiles(gEventObjectPic_Man5_3), - obj_frame_tiles(gEventObjectPic_Man5_4), - obj_frame_tiles(gEventObjectPic_Man5_5), - obj_frame_tiles(gEventObjectPic_Man5_6), - obj_frame_tiles(gEventObjectPic_Man5_7), - obj_frame_tiles(gEventObjectPic_Man5_8), + overworld_frame(gEventObjectPic_Man5, 16, 32, 0), + overworld_frame(gEventObjectPic_Man5, 16, 32, 1), + overworld_frame(gEventObjectPic_Man5, 16, 32, 2), + overworld_frame(gEventObjectPic_Man5, 16, 32, 3), + overworld_frame(gEventObjectPic_Man5, 16, 32, 4), + overworld_frame(gEventObjectPic_Man5, 16, 32, 5), + overworld_frame(gEventObjectPic_Man5, 16, 32, 6), + overworld_frame(gEventObjectPic_Man5, 16, 32, 7), + overworld_frame(gEventObjectPic_Man5, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { - obj_frame_tiles(gEventObjectPic_Man6_0), - obj_frame_tiles(gEventObjectPic_Man6_1), - obj_frame_tiles(gEventObjectPic_Man6_2), - obj_frame_tiles(gEventObjectPic_Man6_3), - obj_frame_tiles(gEventObjectPic_Man6_4), - obj_frame_tiles(gEventObjectPic_Man6_5), - obj_frame_tiles(gEventObjectPic_Man6_6), - obj_frame_tiles(gEventObjectPic_Man6_7), - obj_frame_tiles(gEventObjectPic_Man6_8), + overworld_frame(gEventObjectPic_Man6, 16, 32, 0), + overworld_frame(gEventObjectPic_Man6, 16, 32, 1), + overworld_frame(gEventObjectPic_Man6, 16, 32, 2), + overworld_frame(gEventObjectPic_Man6, 16, 32, 3), + overworld_frame(gEventObjectPic_Man6, 16, 32, 4), + overworld_frame(gEventObjectPic_Man6, 16, 32, 5), + overworld_frame(gEventObjectPic_Man6, 16, 32, 6), + overworld_frame(gEventObjectPic_Man6, 16, 32, 7), + overworld_frame(gEventObjectPic_Man6, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - obj_frame_tiles(gEventObjectPic_ReporterM_0), - obj_frame_tiles(gEventObjectPic_ReporterM_1), - obj_frame_tiles(gEventObjectPic_ReporterM_2), - obj_frame_tiles(gEventObjectPic_ReporterM_3), - obj_frame_tiles(gEventObjectPic_ReporterM_4), - obj_frame_tiles(gEventObjectPic_ReporterM_5), - obj_frame_tiles(gEventObjectPic_ReporterM_6), - obj_frame_tiles(gEventObjectPic_ReporterM_7), - obj_frame_tiles(gEventObjectPic_ReporterM_8), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 0), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 1), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 2), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 3), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 4), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 5), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 6), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 7), + overworld_frame(gEventObjectPic_ReporterM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - obj_frame_tiles(gEventObjectPic_ReporterF_0), - obj_frame_tiles(gEventObjectPic_ReporterF_1), - obj_frame_tiles(gEventObjectPic_ReporterF_2), - obj_frame_tiles(gEventObjectPic_ReporterF_3), - obj_frame_tiles(gEventObjectPic_ReporterF_4), - obj_frame_tiles(gEventObjectPic_ReporterF_5), - obj_frame_tiles(gEventObjectPic_ReporterF_6), - obj_frame_tiles(gEventObjectPic_ReporterF_7), - obj_frame_tiles(gEventObjectPic_ReporterF_8), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 0), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 1), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 2), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 3), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 4), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 5), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 6), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 7), + overworld_frame(gEventObjectPic_ReporterF, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7), - obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { @@ -859,53 +859,53 @@ const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { }; const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - obj_frame_tiles(gEventObjectPic_CuttableTree_0), - obj_frame_tiles(gEventObjectPic_CuttableTree_1), - obj_frame_tiles(gEventObjectPic_CuttableTree_2), - obj_frame_tiles(gEventObjectPic_CuttableTree_3), + overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 0), + overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 1), + overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 2), + overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 3), }; const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - obj_frame_tiles(gEventObjectPic_MartEmployee_0), - obj_frame_tiles(gEventObjectPic_MartEmployee_1), - obj_frame_tiles(gEventObjectPic_MartEmployee_2), - obj_frame_tiles(gEventObjectPic_MartEmployee_3), - obj_frame_tiles(gEventObjectPic_MartEmployee_4), - obj_frame_tiles(gEventObjectPic_MartEmployee_5), - obj_frame_tiles(gEventObjectPic_MartEmployee_6), - obj_frame_tiles(gEventObjectPic_MartEmployee_7), - obj_frame_tiles(gEventObjectPic_MartEmployee_8), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 0), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 1), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 2), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 3), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 4), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 5), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 6), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 7), + overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7), - obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 0), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 1), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 2), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 3), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 4), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 5), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 6), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 7), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - obj_frame_tiles(gEventObjectPic_Teala_0), - obj_frame_tiles(gEventObjectPic_Teala_1), - obj_frame_tiles(gEventObjectPic_Teala_2), - obj_frame_tiles(gEventObjectPic_Teala_3), - obj_frame_tiles(gEventObjectPic_Teala_4), - obj_frame_tiles(gEventObjectPic_Teala_5), - obj_frame_tiles(gEventObjectPic_Teala_6), - obj_frame_tiles(gEventObjectPic_Teala_7), - obj_frame_tiles(gEventObjectPic_Teala_8), + overworld_frame(gEventObjectPic_Teala, 16, 32, 0), + overworld_frame(gEventObjectPic_Teala, 16, 32, 1), + overworld_frame(gEventObjectPic_Teala, 16, 32, 2), + overworld_frame(gEventObjectPic_Teala, 16, 32, 3), + overworld_frame(gEventObjectPic_Teala, 16, 32, 4), + overworld_frame(gEventObjectPic_Teala, 16, 32, 5), + overworld_frame(gEventObjectPic_Teala, 16, 32, 6), + overworld_frame(gEventObjectPic_Teala, 16, 32, 7), + overworld_frame(gEventObjectPic_Teala, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - obj_frame_tiles(gEventObjectPic_BreakableRock_0), - obj_frame_tiles(gEventObjectPic_BreakableRock_1), - obj_frame_tiles(gEventObjectPic_BreakableRock_2), - obj_frame_tiles(gEventObjectPic_BreakableRock_3), + overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 0), + overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 1), + overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 2), + overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 3), }; const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { @@ -913,15 +913,15 @@ const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { }; const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), - obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { @@ -929,27 +929,27 @@ const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { }; const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = { - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1), - obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 0), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 0), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 0), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 1), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 2), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 1), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 2), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 1), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = { - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), - obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 3), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 3), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 3), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4), + overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4), }; const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { @@ -957,149 +957,149 @@ const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { }; const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = { - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_0), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_1), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_2), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_3), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_4), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_5), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_6), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_7), - obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_8), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 0), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 1), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 2), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 3), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 4), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 5), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 6), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 7), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - obj_frame_tiles(gEventObjectPic_Poochyena_0), - obj_frame_tiles(gEventObjectPic_Poochyena_1), - obj_frame_tiles(gEventObjectPic_Poochyena_2), - obj_frame_tiles(gEventObjectPic_Poochyena_3), - obj_frame_tiles(gEventObjectPic_Poochyena_4), - obj_frame_tiles(gEventObjectPic_Poochyena_5), - obj_frame_tiles(gEventObjectPic_Poochyena_6), - obj_frame_tiles(gEventObjectPic_Poochyena_7), - obj_frame_tiles(gEventObjectPic_Poochyena_8), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 0), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 1), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 2), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 3), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 4), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 5), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 6), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 7), + overworld_frame(gEventObjectPic_Poochyena, 32, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - obj_frame_tiles(gEventObjectPic_Artist_0), - obj_frame_tiles(gEventObjectPic_Artist_1), - obj_frame_tiles(gEventObjectPic_Artist_2), - obj_frame_tiles(gEventObjectPic_Artist_3), - obj_frame_tiles(gEventObjectPic_Artist_4), - obj_frame_tiles(gEventObjectPic_Artist_5), - obj_frame_tiles(gEventObjectPic_Artist_6), - obj_frame_tiles(gEventObjectPic_Artist_7), - obj_frame_tiles(gEventObjectPic_Artist_8), + overworld_frame(gEventObjectPic_Artist, 16, 32, 0), + overworld_frame(gEventObjectPic_Artist, 16, 32, 1), + overworld_frame(gEventObjectPic_Artist, 16, 32, 2), + overworld_frame(gEventObjectPic_Artist, 16, 32, 3), + overworld_frame(gEventObjectPic_Artist, 16, 32, 4), + overworld_frame(gEventObjectPic_Artist, 16, 32, 5), + overworld_frame(gEventObjectPic_Artist, 16, 32, 6), + overworld_frame(gEventObjectPic_Artist, 16, 32, 7), + overworld_frame(gEventObjectPic_Artist, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - obj_frame_tiles(gEventObjectPic_MayNormal_0), - obj_frame_tiles(gEventObjectPic_MayNormal_1), - obj_frame_tiles(gEventObjectPic_MayNormal_2), - obj_frame_tiles(gEventObjectPic_MayNormal_3), - obj_frame_tiles(gEventObjectPic_MayNormal_4), - obj_frame_tiles(gEventObjectPic_MayNormal_5), - obj_frame_tiles(gEventObjectPic_MayNormal_6), - obj_frame_tiles(gEventObjectPic_MayNormal_7), - obj_frame_tiles(gEventObjectPic_MayNormal_8), - obj_frame_tiles(gEventObjectPic_MayNormal_9), - obj_frame_tiles(gEventObjectPic_MayNormal_10), - obj_frame_tiles(gEventObjectPic_MayNormal_11), - obj_frame_tiles(gEventObjectPic_MayNormal_12), - obj_frame_tiles(gEventObjectPic_MayNormal_13), - obj_frame_tiles(gEventObjectPic_MayNormal_14), - obj_frame_tiles(gEventObjectPic_MayNormal_15), - obj_frame_tiles(gEventObjectPic_MayNormal_16), - obj_frame_tiles(gEventObjectPic_MayNormal_17), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 0), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 1), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 2), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 3), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 4), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 5), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 6), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 7), + overworld_frame(gEventObjectPic_MayNormal, 16, 32, 8), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 0), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 1), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 2), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 3), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 4), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 5), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 6), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 7), + overworld_frame(gEventObjectPic_MayRunning, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - obj_frame_tiles(gEventObjectPic_MayMachBike_0), - obj_frame_tiles(gEventObjectPic_MayMachBike_1), - obj_frame_tiles(gEventObjectPic_MayMachBike_2), - obj_frame_tiles(gEventObjectPic_MayMachBike_3), - obj_frame_tiles(gEventObjectPic_MayMachBike_4), - obj_frame_tiles(gEventObjectPic_MayMachBike_5), - obj_frame_tiles(gEventObjectPic_MayMachBike_6), - obj_frame_tiles(gEventObjectPic_MayMachBike_7), - obj_frame_tiles(gEventObjectPic_MayMachBike_8), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 0), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 1), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 2), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 3), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 4), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 5), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 6), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 7), + overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - obj_frame_tiles(gEventObjectPic_MayAcroBike_0), - obj_frame_tiles(gEventObjectPic_MayAcroBike_1), - obj_frame_tiles(gEventObjectPic_MayAcroBike_2), - obj_frame_tiles(gEventObjectPic_MayAcroBike_3), - obj_frame_tiles(gEventObjectPic_MayAcroBike_4), - obj_frame_tiles(gEventObjectPic_MayAcroBike_5), - obj_frame_tiles(gEventObjectPic_MayAcroBike_6), - obj_frame_tiles(gEventObjectPic_MayAcroBike_7), - obj_frame_tiles(gEventObjectPic_MayAcroBike_8), - obj_frame_tiles(gEventObjectPic_MayAcroBike_9), - obj_frame_tiles(gEventObjectPic_MayAcroBike_10), - obj_frame_tiles(gEventObjectPic_MayAcroBike_11), - obj_frame_tiles(gEventObjectPic_MayAcroBike_12), - obj_frame_tiles(gEventObjectPic_MayAcroBike_13), - obj_frame_tiles(gEventObjectPic_MayAcroBike_14), - obj_frame_tiles(gEventObjectPic_MayAcroBike_15), - obj_frame_tiles(gEventObjectPic_MayAcroBike_16), - obj_frame_tiles(gEventObjectPic_MayAcroBike_17), - obj_frame_tiles(gEventObjectPic_MayAcroBike_18), - obj_frame_tiles(gEventObjectPic_MayAcroBike_19), - obj_frame_tiles(gEventObjectPic_MayAcroBike_20), - obj_frame_tiles(gEventObjectPic_MayAcroBike_21), - obj_frame_tiles(gEventObjectPic_MayAcroBike_22), - obj_frame_tiles(gEventObjectPic_MayAcroBike_23), - obj_frame_tiles(gEventObjectPic_MayAcroBike_24), - obj_frame_tiles(gEventObjectPic_MayAcroBike_25), - obj_frame_tiles(gEventObjectPic_MayAcroBike_26), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 0), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 1), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 2), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 3), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 4), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 5), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 6), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 7), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 8), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 9), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 10), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 11), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 12), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 13), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 14), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 15), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 16), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 17), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 18), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 19), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 20), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 21), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 22), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 23), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 24), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 25), + overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 26), }; const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_0), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_1), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_2), - obj_frame_tiles(gEventObjectPic_MaySurfing_3), - obj_frame_tiles(gEventObjectPic_MaySurfing_4), - obj_frame_tiles(gEventObjectPic_MaySurfing_5), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 3), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4), + overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 5), }; const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_0), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_1), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), - obj_frame_tiles(gEventObjectPic_MayUnderwater_2), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - obj_frame_tiles(gEventObjectPic_MayFieldMove_0), - obj_frame_tiles(gEventObjectPic_MayFieldMove_1), - obj_frame_tiles(gEventObjectPic_MayFieldMove_2), - obj_frame_tiles(gEventObjectPic_MayFieldMove_3), - obj_frame_tiles(gEventObjectPic_MayFieldMove_4), + overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 0), + overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 1), + overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 2), + overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 3), + overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 4), }; const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - obj_frame_tiles(gEventObjectPic_Cameraman_0), - obj_frame_tiles(gEventObjectPic_Cameraman_1), - obj_frame_tiles(gEventObjectPic_Cameraman_2), - obj_frame_tiles(gEventObjectPic_Cameraman_3), - obj_frame_tiles(gEventObjectPic_Cameraman_4), - obj_frame_tiles(gEventObjectPic_Cameraman_5), - obj_frame_tiles(gEventObjectPic_Cameraman_6), - obj_frame_tiles(gEventObjectPic_Cameraman_7), - obj_frame_tiles(gEventObjectPic_Cameraman_8), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 0), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 1), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 2), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 3), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 4), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 5), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 6), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 7), + overworld_frame(gEventObjectPic_Cameraman, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { @@ -1111,309 +1111,309 @@ const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - obj_frame_tiles(gEventObjectPic_Scientist2_0), - obj_frame_tiles(gEventObjectPic_Scientist2_1), - obj_frame_tiles(gEventObjectPic_Scientist2_2), - obj_frame_tiles(gEventObjectPic_Scientist2_3), - obj_frame_tiles(gEventObjectPic_Scientist2_4), - obj_frame_tiles(gEventObjectPic_Scientist2_5), - obj_frame_tiles(gEventObjectPic_Scientist2_6), - obj_frame_tiles(gEventObjectPic_Scientist2_7), - obj_frame_tiles(gEventObjectPic_Scientist2_8), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 0), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 1), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 2), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 3), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 4), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 5), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 6), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 7), + overworld_frame(gEventObjectPic_Scientist2, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { - obj_frame_tiles(gEventObjectPic_Man7_0), - obj_frame_tiles(gEventObjectPic_Man7_1), - obj_frame_tiles(gEventObjectPic_Man7_2), - obj_frame_tiles(gEventObjectPic_Man7_3), - obj_frame_tiles(gEventObjectPic_Man7_4), - obj_frame_tiles(gEventObjectPic_Man7_5), - obj_frame_tiles(gEventObjectPic_Man7_6), - obj_frame_tiles(gEventObjectPic_Man7_7), - obj_frame_tiles(gEventObjectPic_Man7_8), + overworld_frame(gEventObjectPic_Man7, 16, 32, 0), + overworld_frame(gEventObjectPic_Man7, 16, 32, 1), + overworld_frame(gEventObjectPic_Man7, 16, 32, 2), + overworld_frame(gEventObjectPic_Man7, 16, 32, 3), + overworld_frame(gEventObjectPic_Man7, 16, 32, 4), + overworld_frame(gEventObjectPic_Man7, 16, 32, 5), + overworld_frame(gEventObjectPic_Man7, 16, 32, 6), + overworld_frame(gEventObjectPic_Man7, 16, 32, 7), + overworld_frame(gEventObjectPic_Man7, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - obj_frame_tiles(gEventObjectPic_AquaMemberM_0), - obj_frame_tiles(gEventObjectPic_AquaMemberM_1), - obj_frame_tiles(gEventObjectPic_AquaMemberM_2), - obj_frame_tiles(gEventObjectPic_AquaMemberM_3), - obj_frame_tiles(gEventObjectPic_AquaMemberM_4), - obj_frame_tiles(gEventObjectPic_AquaMemberM_5), - obj_frame_tiles(gEventObjectPic_AquaMemberM_6), - obj_frame_tiles(gEventObjectPic_AquaMemberM_7), - obj_frame_tiles(gEventObjectPic_AquaMemberM_8), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 0), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 1), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 2), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 3), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 4), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 5), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 6), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 7), + overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - obj_frame_tiles(gEventObjectPic_AquaMemberF_0), - obj_frame_tiles(gEventObjectPic_AquaMemberF_1), - obj_frame_tiles(gEventObjectPic_AquaMemberF_2), - obj_frame_tiles(gEventObjectPic_AquaMemberF_3), - obj_frame_tiles(gEventObjectPic_AquaMemberF_4), - obj_frame_tiles(gEventObjectPic_AquaMemberF_5), - obj_frame_tiles(gEventObjectPic_AquaMemberF_6), - obj_frame_tiles(gEventObjectPic_AquaMemberF_7), - obj_frame_tiles(gEventObjectPic_AquaMemberF_8), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 0), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 1), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 2), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 3), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 4), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 5), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 6), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 7), + overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - obj_frame_tiles(gEventObjectPic_MagmaMemberM_0), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_1), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_2), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_3), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_4), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_5), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_6), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_7), - obj_frame_tiles(gEventObjectPic_MagmaMemberM_8), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 0), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 1), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 2), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 3), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 4), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 5), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 6), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 7), + overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - obj_frame_tiles(gEventObjectPic_MagmaMemberF_0), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_1), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_2), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_3), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_4), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_5), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_6), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_7), - obj_frame_tiles(gEventObjectPic_MagmaMemberF_8), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 0), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 1), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 2), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 3), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 4), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 5), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 6), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 7), + overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_2), - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_0), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_1), - obj_frame_tiles(gEventObjectPic_Sidney_2), - obj_frame_tiles(gEventObjectPic_Sidney_2), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 0), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 1), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 2), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 0), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 0), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 1), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 1), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 2), + overworld_frame(gEventObjectPic_Sidney, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_2), - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_0), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_1), - obj_frame_tiles(gEventObjectPic_Phoebe_2), - obj_frame_tiles(gEventObjectPic_Phoebe_2), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 0), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 1), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 2), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 0), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 0), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 1), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 1), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 2), + overworld_frame(gEventObjectPic_Phoebe, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_2), - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_0), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_1), - obj_frame_tiles(gEventObjectPic_Glacia_2), - obj_frame_tiles(gEventObjectPic_Glacia_2), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 0), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 1), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 2), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 0), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 0), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 1), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 1), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 2), + overworld_frame(gEventObjectPic_Glacia, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_2), - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_0), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_1), - obj_frame_tiles(gEventObjectPic_Drake_2), - obj_frame_tiles(gEventObjectPic_Drake_2), + overworld_frame(gEventObjectPic_Drake, 16, 32, 0), + overworld_frame(gEventObjectPic_Drake, 16, 32, 1), + overworld_frame(gEventObjectPic_Drake, 16, 32, 2), + overworld_frame(gEventObjectPic_Drake, 16, 32, 0), + overworld_frame(gEventObjectPic_Drake, 16, 32, 0), + overworld_frame(gEventObjectPic_Drake, 16, 32, 1), + overworld_frame(gEventObjectPic_Drake, 16, 32, 1), + overworld_frame(gEventObjectPic_Drake, 16, 32, 2), + overworld_frame(gEventObjectPic_Drake, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_2), - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_0), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_1), - obj_frame_tiles(gEventObjectPic_Roxanne_2), - obj_frame_tiles(gEventObjectPic_Roxanne_2), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 0), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 1), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 2), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 0), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 0), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 1), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 1), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 2), + overworld_frame(gEventObjectPic_Roxanne, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_2), - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_0), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_1), - obj_frame_tiles(gEventObjectPic_Brawly_2), - obj_frame_tiles(gEventObjectPic_Brawly_2), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 0), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 1), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 2), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 0), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 0), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 1), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 1), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 2), + overworld_frame(gEventObjectPic_Brawly, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_2), - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_0), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_1), - obj_frame_tiles(gEventObjectPic_Wattson_2), - obj_frame_tiles(gEventObjectPic_Wattson_2), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 0), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 1), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 2), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 0), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 0), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 1), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 1), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 2), + overworld_frame(gEventObjectPic_Wattson, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_2), - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_0), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_1), - obj_frame_tiles(gEventObjectPic_Flannery_2), - obj_frame_tiles(gEventObjectPic_Flannery_2), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 0), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 1), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 2), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 0), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 0), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 1), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 1), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 2), + overworld_frame(gEventObjectPic_Flannery, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - obj_frame_tiles(gEventObjectPic_Norman_0), - obj_frame_tiles(gEventObjectPic_Norman_1), - obj_frame_tiles(gEventObjectPic_Norman_2), - obj_frame_tiles(gEventObjectPic_Norman_3), - obj_frame_tiles(gEventObjectPic_Norman_4), - obj_frame_tiles(gEventObjectPic_Norman_5), - obj_frame_tiles(gEventObjectPic_Norman_6), - obj_frame_tiles(gEventObjectPic_Norman_7), - obj_frame_tiles(gEventObjectPic_Norman_8), + overworld_frame(gEventObjectPic_Norman, 16, 32, 0), + overworld_frame(gEventObjectPic_Norman, 16, 32, 1), + overworld_frame(gEventObjectPic_Norman, 16, 32, 2), + overworld_frame(gEventObjectPic_Norman, 16, 32, 3), + overworld_frame(gEventObjectPic_Norman, 16, 32, 4), + overworld_frame(gEventObjectPic_Norman, 16, 32, 5), + overworld_frame(gEventObjectPic_Norman, 16, 32, 6), + overworld_frame(gEventObjectPic_Norman, 16, 32, 7), + overworld_frame(gEventObjectPic_Norman, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_2), - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_0), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_1), - obj_frame_tiles(gEventObjectPic_Winona_2), - obj_frame_tiles(gEventObjectPic_Winona_2), + overworld_frame(gEventObjectPic_Winona, 16, 32, 0), + overworld_frame(gEventObjectPic_Winona, 16, 32, 1), + overworld_frame(gEventObjectPic_Winona, 16, 32, 2), + overworld_frame(gEventObjectPic_Winona, 16, 32, 0), + overworld_frame(gEventObjectPic_Winona, 16, 32, 0), + overworld_frame(gEventObjectPic_Winona, 16, 32, 1), + overworld_frame(gEventObjectPic_Winona, 16, 32, 1), + overworld_frame(gEventObjectPic_Winona, 16, 32, 2), + overworld_frame(gEventObjectPic_Winona, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_2), - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_0), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_1), - obj_frame_tiles(gEventObjectPic_Liza_2), - obj_frame_tiles(gEventObjectPic_Liza_2), + overworld_frame(gEventObjectPic_Liza, 16, 32, 0), + overworld_frame(gEventObjectPic_Liza, 16, 32, 1), + overworld_frame(gEventObjectPic_Liza, 16, 32, 2), + overworld_frame(gEventObjectPic_Liza, 16, 32, 0), + overworld_frame(gEventObjectPic_Liza, 16, 32, 0), + overworld_frame(gEventObjectPic_Liza, 16, 32, 1), + overworld_frame(gEventObjectPic_Liza, 16, 32, 1), + overworld_frame(gEventObjectPic_Liza, 16, 32, 2), + overworld_frame(gEventObjectPic_Liza, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_2), - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_0), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_1), - obj_frame_tiles(gEventObjectPic_Tate_2), - obj_frame_tiles(gEventObjectPic_Tate_2), + overworld_frame(gEventObjectPic_Tate, 16, 32, 0), + overworld_frame(gEventObjectPic_Tate, 16, 32, 1), + overworld_frame(gEventObjectPic_Tate, 16, 32, 2), + overworld_frame(gEventObjectPic_Tate, 16, 32, 0), + overworld_frame(gEventObjectPic_Tate, 16, 32, 0), + overworld_frame(gEventObjectPic_Tate, 16, 32, 1), + overworld_frame(gEventObjectPic_Tate, 16, 32, 1), + overworld_frame(gEventObjectPic_Tate, 16, 32, 2), + overworld_frame(gEventObjectPic_Tate, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - obj_frame_tiles(gEventObjectPic_Wallace_0), - obj_frame_tiles(gEventObjectPic_Wallace_1), - obj_frame_tiles(gEventObjectPic_Wallace_2), - obj_frame_tiles(gEventObjectPic_Wallace_3), - obj_frame_tiles(gEventObjectPic_Wallace_4), - obj_frame_tiles(gEventObjectPic_Wallace_5), - obj_frame_tiles(gEventObjectPic_Wallace_6), - obj_frame_tiles(gEventObjectPic_Wallace_7), - obj_frame_tiles(gEventObjectPic_Wallace_8), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 0), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 1), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 2), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 3), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 4), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 5), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 6), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 7), + overworld_frame(gEventObjectPic_Wallace, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - obj_frame_tiles(gEventObjectPic_Steven_0), - obj_frame_tiles(gEventObjectPic_Steven_1), - obj_frame_tiles(gEventObjectPic_Steven_2), - obj_frame_tiles(gEventObjectPic_Steven_3), - obj_frame_tiles(gEventObjectPic_Steven_4), - obj_frame_tiles(gEventObjectPic_Steven_5), - obj_frame_tiles(gEventObjectPic_Steven_6), - obj_frame_tiles(gEventObjectPic_Steven_7), - obj_frame_tiles(gEventObjectPic_Steven_8), + overworld_frame(gEventObjectPic_Steven, 16, 32, 0), + overworld_frame(gEventObjectPic_Steven, 16, 32, 1), + overworld_frame(gEventObjectPic_Steven, 16, 32, 2), + overworld_frame(gEventObjectPic_Steven, 16, 32, 3), + overworld_frame(gEventObjectPic_Steven, 16, 32, 4), + overworld_frame(gEventObjectPic_Steven, 16, 32, 5), + overworld_frame(gEventObjectPic_Steven, 16, 32, 6), + overworld_frame(gEventObjectPic_Steven, 16, 32, 7), + overworld_frame(gEventObjectPic_Steven, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - obj_frame_tiles(gEventObjectPic_Wally_0), - obj_frame_tiles(gEventObjectPic_Wally_1), - obj_frame_tiles(gEventObjectPic_Wally_2), - obj_frame_tiles(gEventObjectPic_Wally_3), - obj_frame_tiles(gEventObjectPic_Wally_4), - obj_frame_tiles(gEventObjectPic_Wally_5), - obj_frame_tiles(gEventObjectPic_Wally_6), - obj_frame_tiles(gEventObjectPic_Wally_7), - obj_frame_tiles(gEventObjectPic_Wally_8), + overworld_frame(gEventObjectPic_Wally, 16, 32, 0), + overworld_frame(gEventObjectPic_Wally, 16, 32, 1), + overworld_frame(gEventObjectPic_Wally, 16, 32, 2), + overworld_frame(gEventObjectPic_Wally, 16, 32, 3), + overworld_frame(gEventObjectPic_Wally, 16, 32, 4), + overworld_frame(gEventObjectPic_Wally, 16, 32, 5), + overworld_frame(gEventObjectPic_Wally, 16, 32, 6), + overworld_frame(gEventObjectPic_Wally, 16, 32, 7), + overworld_frame(gEventObjectPic_Wally, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = { - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_0), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_1), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_2), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_3), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_4), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_5), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_6), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_7), - obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_8), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 0), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 1), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 2), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 3), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 4), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 5), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 6), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 7), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - obj_frame_tiles(gEventObjectPic_BrendanFishing_0), - obj_frame_tiles(gEventObjectPic_BrendanFishing_1), - obj_frame_tiles(gEventObjectPic_BrendanFishing_2), - obj_frame_tiles(gEventObjectPic_BrendanFishing_3), - obj_frame_tiles(gEventObjectPic_BrendanFishing_4), - obj_frame_tiles(gEventObjectPic_BrendanFishing_5), - obj_frame_tiles(gEventObjectPic_BrendanFishing_6), - obj_frame_tiles(gEventObjectPic_BrendanFishing_7), - obj_frame_tiles(gEventObjectPic_BrendanFishing_8), - obj_frame_tiles(gEventObjectPic_BrendanFishing_9), - obj_frame_tiles(gEventObjectPic_BrendanFishing_10), - obj_frame_tiles(gEventObjectPic_BrendanFishing_11), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 4), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 5), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 6), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 7), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 8), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 9), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 10), + overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 11), }; const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - obj_frame_tiles(gEventObjectPic_MayFishing_0), - obj_frame_tiles(gEventObjectPic_MayFishing_1), - obj_frame_tiles(gEventObjectPic_MayFishing_2), - obj_frame_tiles(gEventObjectPic_MayFishing_3), - obj_frame_tiles(gEventObjectPic_MayFishing_4), - obj_frame_tiles(gEventObjectPic_MayFishing_5), - obj_frame_tiles(gEventObjectPic_MayFishing_6), - obj_frame_tiles(gEventObjectPic_MayFishing_7), - obj_frame_tiles(gEventObjectPic_MayFishing_8), - obj_frame_tiles(gEventObjectPic_MayFishing_9), - obj_frame_tiles(gEventObjectPic_MayFishing_10), - obj_frame_tiles(gEventObjectPic_MayFishing_11), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 0), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 1), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 2), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 3), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 4), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 5), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 6), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 7), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 8), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 9), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 10), + overworld_frame(gEventObjectPic_MayFishing, 32, 32, 11), }; const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7), - obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 0), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 1), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 2), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 3), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 4), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 5), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 6), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 7), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { @@ -1621,63 +1621,63 @@ const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { }; const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_0), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), - obj_frame_tiles(gEventObjectPic_LatiasLatios_1), - obj_frame_tiles(gEventObjectPic_LatiasLatios_2), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_2), - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_0), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_1), - obj_frame_tiles(gEventObjectPic_Boy5_2), - obj_frame_tiles(gEventObjectPic_Boy5_2), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 2), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 0), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 1), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 2), + overworld_frame(gEventObjectPic_Boy5, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = { - obj_frame_tiles(gEventObjectPic_ContestOldMan_0), - obj_frame_tiles(gEventObjectPic_ContestOldMan_1), - obj_frame_tiles(gEventObjectPic_ContestOldMan_2), - obj_frame_tiles(gEventObjectPic_ContestOldMan_3), - obj_frame_tiles(gEventObjectPic_ContestOldMan_4), - obj_frame_tiles(gEventObjectPic_ContestOldMan_5), - obj_frame_tiles(gEventObjectPic_ContestOldMan_6), - obj_frame_tiles(gEventObjectPic_ContestOldMan_7), - obj_frame_tiles(gEventObjectPic_ContestOldMan_8), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 0), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 1), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 2), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 3), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 4), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 5), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 6), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 7), + overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - obj_frame_tiles(gEventObjectPic_BrendanWatering_0), - obj_frame_tiles(gEventObjectPic_BrendanWatering_1), - obj_frame_tiles(gEventObjectPic_BrendanWatering_2), - obj_frame_tiles(gEventObjectPic_BrendanWatering_3), - obj_frame_tiles(gEventObjectPic_BrendanWatering_3), - obj_frame_tiles(gEventObjectPic_BrendanWatering_4), - obj_frame_tiles(gEventObjectPic_BrendanWatering_4), - obj_frame_tiles(gEventObjectPic_BrendanWatering_5), - obj_frame_tiles(gEventObjectPic_BrendanWatering_5), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 0), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 2), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5), + overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5), }; const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - obj_frame_tiles(gEventObjectPic_MayWatering_0), - obj_frame_tiles(gEventObjectPic_MayWatering_1), - obj_frame_tiles(gEventObjectPic_MayWatering_2), - obj_frame_tiles(gEventObjectPic_MayWatering_3), - obj_frame_tiles(gEventObjectPic_MayWatering_3), - obj_frame_tiles(gEventObjectPic_MayWatering_4), - obj_frame_tiles(gEventObjectPic_MayWatering_4), - obj_frame_tiles(gEventObjectPic_MayWatering_5), - obj_frame_tiles(gEventObjectPic_MayWatering_5), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 0), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 2), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5), + overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { @@ -1689,75 +1689,75 @@ const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - obj_frame_tiles(gEventObjectPic_Archie_0), - obj_frame_tiles(gEventObjectPic_Archie_1), - obj_frame_tiles(gEventObjectPic_Archie_2), - obj_frame_tiles(gEventObjectPic_Archie_3), - obj_frame_tiles(gEventObjectPic_Archie_4), - obj_frame_tiles(gEventObjectPic_Archie_5), - obj_frame_tiles(gEventObjectPic_Archie_6), - obj_frame_tiles(gEventObjectPic_Archie_7), - obj_frame_tiles(gEventObjectPic_Archie_8), + overworld_frame(gEventObjectPic_Archie, 16, 32, 0), + overworld_frame(gEventObjectPic_Archie, 16, 32, 1), + overworld_frame(gEventObjectPic_Archie, 16, 32, 2), + overworld_frame(gEventObjectPic_Archie, 16, 32, 3), + overworld_frame(gEventObjectPic_Archie, 16, 32, 4), + overworld_frame(gEventObjectPic_Archie, 16, 32, 5), + overworld_frame(gEventObjectPic_Archie, 16, 32, 6), + overworld_frame(gEventObjectPic_Archie, 16, 32, 7), + overworld_frame(gEventObjectPic_Archie, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - obj_frame_tiles(gEventObjectPic_Maxie_0), - obj_frame_tiles(gEventObjectPic_Maxie_1), - obj_frame_tiles(gEventObjectPic_Maxie_2), - obj_frame_tiles(gEventObjectPic_Maxie_3), - obj_frame_tiles(gEventObjectPic_Maxie_4), - obj_frame_tiles(gEventObjectPic_Maxie_5), - obj_frame_tiles(gEventObjectPic_Maxie_6), - obj_frame_tiles(gEventObjectPic_Maxie_7), - obj_frame_tiles(gEventObjectPic_Maxie_8), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 0), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 1), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 2), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 3), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 4), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 5), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 6), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 7), + overworld_frame(gEventObjectPic_Maxie, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = { - obj_frame_tiles(gEventObjectPic_KyogreFront_0), - obj_frame_tiles(gEventObjectPic_KyogreFront_0), - obj_frame_tiles(gEventObjectPic_KyogreFront_0), - obj_frame_tiles(gEventObjectPic_KyogreFront_1), - obj_frame_tiles(gEventObjectPic_KyogreFront_1), - obj_frame_tiles(gEventObjectPic_KyogreFront_1), - obj_frame_tiles(gEventObjectPic_KyogreFront_1), - obj_frame_tiles(gEventObjectPic_KyogreFront_1), - obj_frame_tiles(gEventObjectPic_KyogreFront_1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 0), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 0), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 0), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1), }; const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = { - obj_frame_tiles(gEventObjectPic_GroudonFront_0), - obj_frame_tiles(gEventObjectPic_GroudonFront_0), - obj_frame_tiles(gEventObjectPic_GroudonFront_0), - obj_frame_tiles(gEventObjectPic_GroudonFront_1), - obj_frame_tiles(gEventObjectPic_GroudonFront_1), - obj_frame_tiles(gEventObjectPic_GroudonFront_1), - obj_frame_tiles(gEventObjectPic_GroudonFront_1), - obj_frame_tiles(gEventObjectPic_GroudonFront_1), - obj_frame_tiles(gEventObjectPic_GroudonFront_1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 0), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 0), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 0), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 1), }; const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = { - obj_frame_tiles(gEventObjectPic_KyogreSide_0), - obj_frame_tiles(gEventObjectPic_KyogreSide_0), - obj_frame_tiles(gEventObjectPic_KyogreSide_0), - obj_frame_tiles(gEventObjectPic_KyogreSide_1), - obj_frame_tiles(gEventObjectPic_KyogreSide_1), - obj_frame_tiles(gEventObjectPic_KyogreSide_1), - obj_frame_tiles(gEventObjectPic_KyogreSide_1), - obj_frame_tiles(gEventObjectPic_KyogreSide_1), - obj_frame_tiles(gEventObjectPic_KyogreSide_1), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 2), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 2), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 2), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3), + overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3), }; const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = { - obj_frame_tiles(gEventObjectPic_GroudonSide_0), - obj_frame_tiles(gEventObjectPic_GroudonSide_0), - obj_frame_tiles(gEventObjectPic_GroudonSide_0), - obj_frame_tiles(gEventObjectPic_GroudonSide_1), - obj_frame_tiles(gEventObjectPic_GroudonSide_1), - obj_frame_tiles(gEventObjectPic_GroudonSide_1), - obj_frame_tiles(gEventObjectPic_GroudonSide_1), - obj_frame_tiles(gEventObjectPic_GroudonSide_1), - obj_frame_tiles(gEventObjectPic_GroudonSide_1), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 2), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 2), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 2), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 3), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 3), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 3), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 3), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 3), + overworld_frame(gEventObjectPic_Groudon, 32, 32, 3), }; const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { @@ -1777,35 +1777,35 @@ const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_2), - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_0), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_1), - obj_frame_tiles(gEventObjectPic_Skitty_2), - obj_frame_tiles(gEventObjectPic_Skitty_2), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 0), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 1), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 2), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 0), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 0), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 1), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 1), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 2), + overworld_frame(gEventObjectPic_Skitty, 16, 16, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_2), - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_0), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_1), - obj_frame_tiles(gEventObjectPic_Kecleon_2), - obj_frame_tiles(gEventObjectPic_Kecleon_2), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 0), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 1), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 2), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 0), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 0), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 1), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 1), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 2), + overworld_frame(gEventObjectPic_Kecleon, 16, 16, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - obj_frame_tiles(gEventObjectPic_Rayquaza_0), - obj_frame_tiles(gEventObjectPic_Rayquaza_1), - obj_frame_tiles(gEventObjectPic_Rayquaza_2), - obj_frame_tiles(gEventObjectPic_Rayquaza_3), - obj_frame_tiles(gEventObjectPic_Rayquaza_4), + overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 0), + overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 1), + overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 2), + overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 3), + overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 4), }; const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { @@ -1821,123 +1821,123 @@ const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_0), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_1), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), - obj_frame_tiles(gEventObjectPic_Zigzagoon_2), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_2), - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_0), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_1), - obj_frame_tiles(gEventObjectPic_Pikachu_2), - obj_frame_tiles(gEventObjectPic_Pikachu_2), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 0), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 1), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 2), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 0), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 0), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 1), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 1), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 2), + overworld_frame(gEventObjectPic_Pikachu, 16, 16, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_2), - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_0), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_1), - obj_frame_tiles(gEventObjectPic_Azumarill_2), - obj_frame_tiles(gEventObjectPic_Azumarill_2), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 0), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 1), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 2), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 0), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 0), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 1), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 1), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 2), + overworld_frame(gEventObjectPic_Azumarill, 16, 16, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - obj_frame_tiles(gEventObjectPic_Wingull_0), - obj_frame_tiles(gEventObjectPic_Wingull_1), - obj_frame_tiles(gEventObjectPic_Wingull_2), - obj_frame_tiles(gEventObjectPic_Wingull_3), - obj_frame_tiles(gEventObjectPic_Wingull_3), - obj_frame_tiles(gEventObjectPic_Wingull_4), - obj_frame_tiles(gEventObjectPic_Wingull_4), - obj_frame_tiles(gEventObjectPic_Wingull_5), - obj_frame_tiles(gEventObjectPic_Wingull_5), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 0), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 1), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 2), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 3), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 3), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 4), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 4), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 5), + overworld_frame(gEventObjectPic_Wingull, 16, 16, 5), }; const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - obj_frame_tiles(gEventObjectPic_TuberMSwimming_0), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_1), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_2), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_3), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_4), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_5), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_6), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_7), - obj_frame_tiles(gEventObjectPic_TuberMSwimming_8), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 0), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 1), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 2), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 3), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 4), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 5), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 6), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 7), + overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_2), - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_0), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_1), - obj_frame_tiles(gEventObjectPic_Azurill_2), - obj_frame_tiles(gEventObjectPic_Azurill_2), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 0), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 1), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 2), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 0), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 0), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 1), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 1), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 2), + overworld_frame(gEventObjectPic_Azurill, 16, 16, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - obj_frame_tiles(gEventObjectPic_Mom_0), - obj_frame_tiles(gEventObjectPic_Mom_1), - obj_frame_tiles(gEventObjectPic_Mom_2), - obj_frame_tiles(gEventObjectPic_Mom_3), - obj_frame_tiles(gEventObjectPic_Mom_4), - obj_frame_tiles(gEventObjectPic_Mom_5), - obj_frame_tiles(gEventObjectPic_Mom_6), - obj_frame_tiles(gEventObjectPic_Mom_7), - obj_frame_tiles(gEventObjectPic_Mom_8), + overworld_frame(gEventObjectPic_Mom, 16, 32, 0), + overworld_frame(gEventObjectPic_Mom, 16, 32, 1), + overworld_frame(gEventObjectPic_Mom, 16, 32, 2), + overworld_frame(gEventObjectPic_Mom, 16, 32, 3), + overworld_frame(gEventObjectPic_Mom, 16, 32, 4), + overworld_frame(gEventObjectPic_Mom, 16, 32, 5), + overworld_frame(gEventObjectPic_Mom, 16, 32, 6), + overworld_frame(gEventObjectPic_Mom, 16, 32, 7), + overworld_frame(gEventObjectPic_Mom, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Scott[] = { - obj_frame_tiles(gEventObjectPic_Scott_0), - obj_frame_tiles(gEventObjectPic_Scott_1), - obj_frame_tiles(gEventObjectPic_Scott_2), - obj_frame_tiles(gEventObjectPic_Scott_3), - obj_frame_tiles(gEventObjectPic_Scott_4), - obj_frame_tiles(gEventObjectPic_Scott_5), - obj_frame_tiles(gEventObjectPic_Scott_6), - obj_frame_tiles(gEventObjectPic_Scott_7), - obj_frame_tiles(gEventObjectPic_Scott_8), + overworld_frame(gEventObjectPic_Scott, 16, 32, 0), + overworld_frame(gEventObjectPic_Scott, 16, 32, 1), + overworld_frame(gEventObjectPic_Scott, 16, 32, 2), + overworld_frame(gEventObjectPic_Scott, 16, 32, 3), + overworld_frame(gEventObjectPic_Scott, 16, 32, 4), + overworld_frame(gEventObjectPic_Scott, 16, 32, 5), + overworld_frame(gEventObjectPic_Scott, 16, 32, 6), + overworld_frame(gEventObjectPic_Scott, 16, 32, 7), + overworld_frame(gEventObjectPic_Scott, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Juan[] = { - obj_frame_tiles(gEventObjectPic_Juan_0), - obj_frame_tiles(gEventObjectPic_Juan_1), - obj_frame_tiles(gEventObjectPic_Juan_2), - obj_frame_tiles(gEventObjectPic_Juan_3), - obj_frame_tiles(gEventObjectPic_Juan_4), - obj_frame_tiles(gEventObjectPic_Juan_5), - obj_frame_tiles(gEventObjectPic_Juan_6), - obj_frame_tiles(gEventObjectPic_Juan_7), - obj_frame_tiles(gEventObjectPic_Juan_8), + overworld_frame(gEventObjectPic_Juan, 16, 32, 0), + overworld_frame(gEventObjectPic_Juan, 16, 32, 1), + overworld_frame(gEventObjectPic_Juan, 16, 32, 2), + overworld_frame(gEventObjectPic_Juan, 16, 32, 3), + overworld_frame(gEventObjectPic_Juan, 16, 32, 4), + overworld_frame(gEventObjectPic_Juan, 16, 32, 5), + overworld_frame(gEventObjectPic_Juan, 16, 32, 6), + overworld_frame(gEventObjectPic_Juan, 16, 32, 7), + overworld_frame(gEventObjectPic_Juan, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = { - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2), - obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 0), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 1), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 2), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 0), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 0), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 1), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 1), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 2), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { @@ -1945,99 +1945,99 @@ const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = { - obj_frame_tiles(gEventObjectPic_Dusclops_0), - obj_frame_tiles(gEventObjectPic_Dusclops_1), - obj_frame_tiles(gEventObjectPic_Dusclops_2), - obj_frame_tiles(gEventObjectPic_Dusclops_3), - obj_frame_tiles(gEventObjectPic_Dusclops_4), - obj_frame_tiles(gEventObjectPic_Dusclops_5), - obj_frame_tiles(gEventObjectPic_Dusclops_6), - obj_frame_tiles(gEventObjectPic_Dusclops_7), - obj_frame_tiles(gEventObjectPic_Dusclops_8), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 0), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 1), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 2), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 3), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 4), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 5), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 6), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 7), + overworld_frame(gEventObjectPic_Dusclops, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = { - obj_frame_tiles(gEventObjectPic_Kirlia_0), - obj_frame_tiles(gEventObjectPic_Kirlia_1), - obj_frame_tiles(gEventObjectPic_Kirlia_2), - obj_frame_tiles(gEventObjectPic_Kirlia_3), - obj_frame_tiles(gEventObjectPic_Kirlia_4), - obj_frame_tiles(gEventObjectPic_Kirlia_5), - obj_frame_tiles(gEventObjectPic_Kirlia_6), - obj_frame_tiles(gEventObjectPic_Kirlia_7), - obj_frame_tiles(gEventObjectPic_Kirlia_8), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 0), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 1), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 2), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 3), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 4), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 5), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 6), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 7), + overworld_frame(gEventObjectPic_Kirlia, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = { - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2), - obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 0), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 1), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 2), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 0), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 0), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 1), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 1), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 2), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = { - obj_frame_tiles(gEventObjectPic_Sudowoodo_0), - obj_frame_tiles(gEventObjectPic_Sudowoodo_0), - obj_frame_tiles(gEventObjectPic_Sudowoodo_1), - obj_frame_tiles(gEventObjectPic_Sudowoodo_0), - obj_frame_tiles(gEventObjectPic_Sudowoodo_0), - obj_frame_tiles(gEventObjectPic_Sudowoodo_0), - obj_frame_tiles(gEventObjectPic_Sudowoodo_0), - obj_frame_tiles(gEventObjectPic_Sudowoodo_1), - obj_frame_tiles(gEventObjectPic_Sudowoodo_2), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 1), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 1), + overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Mew[] = { - obj_frame_tiles(gEventObjectPic_Mew_0), - obj_frame_tiles(gEventObjectPic_Mew_1), - obj_frame_tiles(gEventObjectPic_Mew_2), - obj_frame_tiles(gEventObjectPic_Mew_3), - obj_frame_tiles(gEventObjectPic_Mew_4), - obj_frame_tiles(gEventObjectPic_Mew_5), - obj_frame_tiles(gEventObjectPic_Mew_6), - obj_frame_tiles(gEventObjectPic_Mew_7), - obj_frame_tiles(gEventObjectPic_Mew_8), + overworld_frame(gEventObjectPic_Mew, 16, 32, 0), + overworld_frame(gEventObjectPic_Mew, 16, 32, 1), + overworld_frame(gEventObjectPic_Mew, 16, 32, 2), + overworld_frame(gEventObjectPic_Mew, 16, 32, 3), + overworld_frame(gEventObjectPic_Mew, 16, 32, 4), + overworld_frame(gEventObjectPic_Mew, 16, 32, 5), + overworld_frame(gEventObjectPic_Mew, 16, 32, 6), + overworld_frame(gEventObjectPic_Mew, 16, 32, 7), + overworld_frame(gEventObjectPic_Mew, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Red[] = { - obj_frame_tiles(gEventObjectPic_Red_0), - obj_frame_tiles(gEventObjectPic_Red_1), - obj_frame_tiles(gEventObjectPic_Red_2), - obj_frame_tiles(gEventObjectPic_Red_3), - obj_frame_tiles(gEventObjectPic_Red_4), - obj_frame_tiles(gEventObjectPic_Red_5), - obj_frame_tiles(gEventObjectPic_Red_6), - obj_frame_tiles(gEventObjectPic_Red_7), - obj_frame_tiles(gEventObjectPic_Red_8), + overworld_frame(gEventObjectPic_Red, 16, 32, 0), + overworld_frame(gEventObjectPic_Red, 16, 32, 1), + overworld_frame(gEventObjectPic_Red, 16, 32, 2), + overworld_frame(gEventObjectPic_Red, 16, 32, 3), + overworld_frame(gEventObjectPic_Red, 16, 32, 4), + overworld_frame(gEventObjectPic_Red, 16, 32, 5), + overworld_frame(gEventObjectPic_Red, 16, 32, 6), + overworld_frame(gEventObjectPic_Red, 16, 32, 7), + overworld_frame(gEventObjectPic_Red, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = { - obj_frame_tiles(gEventObjectPic_Leaf_0), - obj_frame_tiles(gEventObjectPic_Leaf_1), - obj_frame_tiles(gEventObjectPic_Leaf_2), - obj_frame_tiles(gEventObjectPic_Leaf_3), - obj_frame_tiles(gEventObjectPic_Leaf_4), - obj_frame_tiles(gEventObjectPic_Leaf_5), - obj_frame_tiles(gEventObjectPic_Leaf_6), - obj_frame_tiles(gEventObjectPic_Leaf_7), - obj_frame_tiles(gEventObjectPic_Leaf_8), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 0), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 1), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 2), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 3), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 4), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 5), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 6), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 7), + overworld_frame(gEventObjectPic_Leaf, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = { - obj_frame_tiles(gEventObjectPic_Deoxys_0), - obj_frame_tiles(gEventObjectPic_Deoxys_0), - obj_frame_tiles(gEventObjectPic_Deoxys_0), - obj_frame_tiles(gEventObjectPic_Deoxys_0), - obj_frame_tiles(gEventObjectPic_Deoxys_1), - obj_frame_tiles(gEventObjectPic_Deoxys_0), - obj_frame_tiles(gEventObjectPic_Deoxys_1), - obj_frame_tiles(gEventObjectPic_Deoxys_0), - obj_frame_tiles(gEventObjectPic_Deoxys_0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 1), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 1), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), + overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0), }; const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { @@ -2045,135 +2045,135 @@ const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = { - obj_frame_tiles(gEventObjectPic_Anabel_0), - obj_frame_tiles(gEventObjectPic_Anabel_1), - obj_frame_tiles(gEventObjectPic_Anabel_2), - obj_frame_tiles(gEventObjectPic_Anabel_3), - obj_frame_tiles(gEventObjectPic_Anabel_4), - obj_frame_tiles(gEventObjectPic_Anabel_5), - obj_frame_tiles(gEventObjectPic_Anabel_6), - obj_frame_tiles(gEventObjectPic_Anabel_7), - obj_frame_tiles(gEventObjectPic_Anabel_8), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 0), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 1), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 2), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 3), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 4), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 5), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 6), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 7), + overworld_frame(gEventObjectPic_Anabel, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = { - obj_frame_tiles(gEventObjectPic_Tucker_0), - obj_frame_tiles(gEventObjectPic_Tucker_1), - obj_frame_tiles(gEventObjectPic_Tucker_2), - obj_frame_tiles(gEventObjectPic_Tucker_3), - obj_frame_tiles(gEventObjectPic_Tucker_4), - obj_frame_tiles(gEventObjectPic_Tucker_5), - obj_frame_tiles(gEventObjectPic_Tucker_6), - obj_frame_tiles(gEventObjectPic_Tucker_7), - obj_frame_tiles(gEventObjectPic_Tucker_8), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 0), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 1), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 2), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 3), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 4), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 5), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 6), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 7), + overworld_frame(gEventObjectPic_Tucker, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = { - obj_frame_tiles(gEventObjectPic_Spenser_0), - obj_frame_tiles(gEventObjectPic_Spenser_1), - obj_frame_tiles(gEventObjectPic_Spenser_2), - obj_frame_tiles(gEventObjectPic_Spenser_3), - obj_frame_tiles(gEventObjectPic_Spenser_4), - obj_frame_tiles(gEventObjectPic_Spenser_5), - obj_frame_tiles(gEventObjectPic_Spenser_6), - obj_frame_tiles(gEventObjectPic_Spenser_7), - obj_frame_tiles(gEventObjectPic_Spenser_8), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 0), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 1), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 2), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 3), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 4), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 5), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 6), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 7), + overworld_frame(gEventObjectPic_Spenser, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Greta[] = { - obj_frame_tiles(gEventObjectPic_Greta_0), - obj_frame_tiles(gEventObjectPic_Greta_1), - obj_frame_tiles(gEventObjectPic_Greta_2), - obj_frame_tiles(gEventObjectPic_Greta_3), - obj_frame_tiles(gEventObjectPic_Greta_4), - obj_frame_tiles(gEventObjectPic_Greta_5), - obj_frame_tiles(gEventObjectPic_Greta_6), - obj_frame_tiles(gEventObjectPic_Greta_7), - obj_frame_tiles(gEventObjectPic_Greta_8), + overworld_frame(gEventObjectPic_Greta, 16, 32, 0), + overworld_frame(gEventObjectPic_Greta, 16, 32, 1), + overworld_frame(gEventObjectPic_Greta, 16, 32, 2), + overworld_frame(gEventObjectPic_Greta, 16, 32, 3), + overworld_frame(gEventObjectPic_Greta, 16, 32, 4), + overworld_frame(gEventObjectPic_Greta, 16, 32, 5), + overworld_frame(gEventObjectPic_Greta, 16, 32, 6), + overworld_frame(gEventObjectPic_Greta, 16, 32, 7), + overworld_frame(gEventObjectPic_Greta, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Noland[] = { - obj_frame_tiles(gEventObjectPic_Noland_0), - obj_frame_tiles(gEventObjectPic_Noland_1), - obj_frame_tiles(gEventObjectPic_Noland_2), - obj_frame_tiles(gEventObjectPic_Noland_3), - obj_frame_tiles(gEventObjectPic_Noland_4), - obj_frame_tiles(gEventObjectPic_Noland_5), - obj_frame_tiles(gEventObjectPic_Noland_6), - obj_frame_tiles(gEventObjectPic_Noland_7), - obj_frame_tiles(gEventObjectPic_Noland_8), + overworld_frame(gEventObjectPic_Noland, 16, 32, 0), + overworld_frame(gEventObjectPic_Noland, 16, 32, 1), + overworld_frame(gEventObjectPic_Noland, 16, 32, 2), + overworld_frame(gEventObjectPic_Noland, 16, 32, 3), + overworld_frame(gEventObjectPic_Noland, 16, 32, 4), + overworld_frame(gEventObjectPic_Noland, 16, 32, 5), + overworld_frame(gEventObjectPic_Noland, 16, 32, 6), + overworld_frame(gEventObjectPic_Noland, 16, 32, 7), + overworld_frame(gEventObjectPic_Noland, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = { - obj_frame_tiles(gEventObjectPic_Lucy_0), - obj_frame_tiles(gEventObjectPic_Lucy_1), - obj_frame_tiles(gEventObjectPic_Lucy_2), - obj_frame_tiles(gEventObjectPic_Lucy_3), - obj_frame_tiles(gEventObjectPic_Lucy_4), - obj_frame_tiles(gEventObjectPic_Lucy_5), - obj_frame_tiles(gEventObjectPic_Lucy_6), - obj_frame_tiles(gEventObjectPic_Lucy_7), - obj_frame_tiles(gEventObjectPic_Lucy_8), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 0), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 1), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 2), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 3), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 4), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 5), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 6), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 7), + overworld_frame(gEventObjectPic_Lucy, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = { - obj_frame_tiles(gEventObjectPic_Brandon_0), - obj_frame_tiles(gEventObjectPic_Brandon_1), - obj_frame_tiles(gEventObjectPic_Brandon_2), - obj_frame_tiles(gEventObjectPic_Brandon_3), - obj_frame_tiles(gEventObjectPic_Brandon_4), - obj_frame_tiles(gEventObjectPic_Brandon_5), - obj_frame_tiles(gEventObjectPic_Brandon_6), - obj_frame_tiles(gEventObjectPic_Brandon_7), - obj_frame_tiles(gEventObjectPic_Brandon_8), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 0), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 1), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 2), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 3), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 4), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 5), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 6), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 7), + overworld_frame(gEventObjectPic_Brandon, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = { - obj_frame_tiles(gEventObjectPic_Lugia_0), - obj_frame_tiles(gEventObjectPic_Lugia_0), - obj_frame_tiles(gEventObjectPic_Lugia_0), - obj_frame_tiles(gEventObjectPic_Lugia_0), - obj_frame_tiles(gEventObjectPic_Lugia_1), - obj_frame_tiles(gEventObjectPic_Lugia_0), - obj_frame_tiles(gEventObjectPic_Lugia_1), - obj_frame_tiles(gEventObjectPic_Lugia_0), - obj_frame_tiles(gEventObjectPic_Lugia_1), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 0), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 0), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 0), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 0), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 1), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 0), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 1), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 0), + overworld_frame(gEventObjectPic_Lugia, 32, 32, 1), }; const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = { - obj_frame_tiles(gEventObjectPic_HoOh_0), - obj_frame_tiles(gEventObjectPic_HoOh_0), - obj_frame_tiles(gEventObjectPic_HoOh_0), - obj_frame_tiles(gEventObjectPic_HoOh_0), - obj_frame_tiles(gEventObjectPic_HoOh_1), - obj_frame_tiles(gEventObjectPic_HoOh_0), - obj_frame_tiles(gEventObjectPic_HoOh_1), - obj_frame_tiles(gEventObjectPic_HoOh_0), - obj_frame_tiles(gEventObjectPic_HoOh_1), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 0), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 0), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 0), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 0), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 1), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 0), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 1), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 0), + overworld_frame(gEventObjectPic_HoOh, 32, 32, 1), }; const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = { - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_0), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_1), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_2), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_3), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_4), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_5), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_6), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_7), - obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_8), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 0), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 1), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 2), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 3), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 4), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 5), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 6), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 7), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { - obj_frame_tiles(gEventObjectPic_RubySapphireMay_0), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_1), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_2), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_3), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_4), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_5), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_6), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_7), - obj_frame_tiles(gEventObjectPic_RubySapphireMay_8), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 0), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 1), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 2), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 3), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 4), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 5), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 6), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 7), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 8), }; #endif //GUARD_EVENT_OBJECT_PIC_TABLES_H diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index c8633daa7..785a15872 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -13,23 +13,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850C9D0[] = const union AnimCmd *const gFieldEffectObjectImageAnimTable_Shadow[] = { - gFieldEffectObjectImageAnim_850C9D0, + gFieldEffectObjectImageAnim_850C9D0, }; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowSmall[] = { - obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall), + obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall), }; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowMedium[] = { - obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium), + obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium), }; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowLarge[] = { - obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge), + obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge), }; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = { - obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), + obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge), }; const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow}; @@ -41,11 +41,11 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0x const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { - obj_frame_tiles(gFieldEffectObjectPic_TallGrass_0), - obj_frame_tiles(gFieldEffectObjectPic_TallGrass_1), - obj_frame_tiles(gFieldEffectObjectPic_TallGrass_2), - obj_frame_tiles(gFieldEffectObjectPic_TallGrass_3), - obj_frame_tiles(gFieldEffectObjectPic_TallGrass_4), + overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 3), + overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 4), }; const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] = @@ -66,11 +66,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { - obj_frame_tiles(gFieldEffectObjectPic_Ripple_0), - obj_frame_tiles(gFieldEffectObjectPic_Ripple_1), - obj_frame_tiles(gFieldEffectObjectPic_Ripple_2), - obj_frame_tiles(gFieldEffectObjectPic_Ripple_3), - obj_frame_tiles(gFieldEffectObjectPic_Ripple_4), + overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 3), + overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 4), }; const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] = @@ -94,11 +94,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { - obj_frame_tiles(gFieldEffectObjectPic_Ash_0), - obj_frame_tiles(gFieldEffectObjectPic_Ash_1), - obj_frame_tiles(gFieldEffectObjectPic_Ash_2), - obj_frame_tiles(gFieldEffectObjectPic_Ash_3), - obj_frame_tiles(gFieldEffectObjectPic_Ash_4), + overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 3), + overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 4), }; const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] = @@ -119,9 +119,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { - obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_0), - obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_1), - obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_2), + overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 0), + overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 1), + overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 2), }; const union AnimCmd gFieldEffectObjectImageAnim_850CB94[] = @@ -159,14 +159,14 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { - obj_frame_tiles(gFieldEffectObjectPic_Arrow_0), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_1), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_2), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_3), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_4), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_5), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_6), - obj_frame_tiles(gFieldEffectObjectPic_Arrow_7), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 3), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 4), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 5), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 6), + overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 7), }; const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] = @@ -208,9 +208,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = { - obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0), - obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_1), - obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_2), + obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0), + obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_1), + obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_2), }; const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] = @@ -229,10 +229,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] = const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = { - obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_1), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_2), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_3), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_1), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_2), + obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] = @@ -252,8 +252,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = { - obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0), - obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_1), + obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0), + obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_1), }; const union AnimCmd gFieldEffectObjectImageAnim_850CD18[] = @@ -292,8 +292,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = { - obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0), - obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_1), + obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0), + obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_1), }; const union AnimCmd gFieldEffectObjectImageAnim_850CD74[] = @@ -332,10 +332,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[] const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = { - obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0), - obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_1), - obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_2), - obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_3), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_1), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_2), + obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] = @@ -402,10 +402,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { - obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_0), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_1), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_2), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_3), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = @@ -425,8 +425,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { - obj_frame_tiles(gFieldEffectObjectPic_Splash_0), - obj_frame_tiles(gFieldEffectObjectPic_Splash_1), + overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 0), + overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 1), }; const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] = @@ -458,9 +458,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { - obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_0), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_1), - obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_2), + overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 0), + overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 1), + overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 2), }; const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = @@ -479,10 +479,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[] const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = { - obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0), - obj_frame_tiles(gFieldEffectObjectPic_LongGrass_1), - obj_frame_tiles(gFieldEffectObjectPic_LongGrass_2), - obj_frame_tiles(gFieldEffectObjectPic_LongGrass_3), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_1), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_2), + obj_frame_tiles(gFieldEffectObjectPic_LongGrass_3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] = @@ -505,12 +505,12 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_2), - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_3), - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_4), - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_4), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), }; const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = @@ -532,15 +532,15 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_2), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_3), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_4), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_5), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_6), - obj_frame_tiles(gFieldEffectObjectPic_Unknown17_7), + obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 3), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 4), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 5), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 6), + overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 7), }; const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] = @@ -565,10 +565,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown18_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown18_2), - obj_frame_tiles(gFieldEffectObjectPic_Unknown18_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown18_3), }; const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] = @@ -590,10 +590,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown19_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown19_2), - obj_frame_tiles(gFieldEffectObjectPic_Unknown19_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown19_3), }; const union AnimCmd gFieldEffectObjectImageAnim_850D118[] = @@ -613,9 +613,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown29_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown29_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown29_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown29_2), }; const union AnimCmd gFieldEffectObjectImageAnim_850D160[] = @@ -634,10 +634,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown20_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown20_2), - obj_frame_tiles(gFieldEffectObjectPic_Unknown20_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown20_3), }; const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] = @@ -695,12 +695,12 @@ const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_Unknown21[] const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21 = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_BerryTreeGrowthSparkle[] = { - obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_0), - obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_1), - obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_2), - obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_3), - obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_4), - obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_5), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_0), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_1), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_2), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_3), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_4), + obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_5), }; const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = @@ -736,13 +736,13 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0}; const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_0), - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_1), - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_2), - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_3), - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_4), - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_5), - obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_6), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 0), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 1), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 2), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 3), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 4), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 5), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 6), }; const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] = @@ -772,13 +772,13 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] = const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_0), - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_1), - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_2), - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_3), - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_4), - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_5), - obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_6), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 0), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 1), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 2), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 3), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 4), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 5), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 6), }; const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] = @@ -808,19 +808,19 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] = const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88}; const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_0), - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_1), - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_2), - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_3), - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_4), - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_5), - obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_6), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 0), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 1), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 2), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 3), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 4), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 5), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 6), }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = { - obj_frame_tiles(gFieldEffectObjectPic_Bird), + obj_frame_tiles(gFieldEffectObjectPic_Bird), }; const union AnimCmd gFieldEffectObjectImageAnim_850D49C[] = @@ -837,8 +837,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { - obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_0), - obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_1), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 1), }; const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] = @@ -856,7 +856,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10}; const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = { - obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), + obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater), }; const union AnimCmd gFieldEffectObjectImageAnim_850D500[] = @@ -873,11 +873,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] = const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158}; const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { - obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_0), - obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_1), - obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_2), - obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_3), - obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_4), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 0), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 2), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 3), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 4), }; const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] = @@ -900,11 +900,11 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0 const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown33_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown33_1), - obj_frame_tiles(gFieldEffectObjectPic_Unknown33_2), - obj_frame_tiles(gFieldEffectObjectPic_Unknown33_3), - obj_frame_tiles(gFieldEffectObjectPic_Unknown33_4), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_2), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_3), + obj_frame_tiles(gFieldEffectObjectPic_Unknown33_4), }; const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] = @@ -925,14 +925,14 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_0), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_1), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_2), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_3), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_4), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_5), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_6), - obj_frame_tiles(gFieldEffectObjectPic_Bubbles_7), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 0), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 1), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 2), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 3), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 4), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 5), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 6), + overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 7), }; const union AnimCmd gFieldEffectObjectImageAnim_850D624[] = @@ -956,8 +956,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC}; const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = { - obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0), - obj_frame_tiles(gFieldEffectObjectPic_Unknown35_1), + obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0), + obj_frame_tiles(gFieldEffectObjectPic_Unknown35_1), }; const union AnimCmd gFieldEffectObjectImageAnim_850D674[] = @@ -987,7 +987,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { }; const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { - {.data = (u8*)gEventObjectPic_Rayquaza_0, .size = (sizeof gEventObjectPic_Rayquaza_0) / 4} + overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 0), }; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};