From e1834c9d7bc961f872169e056b788fec04f39867 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 8 Sep 2018 03:07:44 -0500 Subject: [PATCH] Change overworld_frame macro to use tiles --- include/sprite.h | 2 +- .../berry_tree_graphics_tables.h | 540 ++-- .../field_event_obj/event_object_pic_tables.h | 2840 ++++++++--------- .../field_event_obj/field_effect_objects.h | 160 +- 4 files changed, 1771 insertions(+), 1771 deletions(-) diff --git a/include/sprite.h b/include/sprite.h index 6270511c90..26263737b1 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -26,7 +26,7 @@ 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} +#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame * 64)/2, .size = (width * height * 64)/2} struct SpritePalette { 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 679a0e5a57..beb59974f7 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[] = { - 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { - overworld_frame(gEventObjectPic_BerryTreeDirtPile, 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), + overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0), + overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4), + overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5), }; const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; 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 80a4e12ac4..40a6ad61c9 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[] = { - 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), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_BrendanNormal, 2, 4, 8), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 0), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 1), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 2), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 3), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 4), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 5), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 6), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 7), + overworld_frame(gEventObjectPic_BrendanRunning, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = { - overworld_frame(gEventObjectPic_BrendanMachBike, 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), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanMachBike, 4, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = { - overworld_frame(gEventObjectPic_BrendanAcroBike, 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), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 8), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 9), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 10), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 11), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 12), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 13), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 14), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 15), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 16), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 17), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 18), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 19), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 20), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 21), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 22), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 23), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 24), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 25), + overworld_frame(gEventObjectPic_BrendanAcroBike, 4, 4, 26), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = { - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 3), - overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 5), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanSurfing, 4, 4, 5), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = { - overworld_frame(gEventObjectPic_BrendanUnderwater, 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), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanUnderwater, 4, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = { - overworld_frame(gEventObjectPic_BrendanFieldMove, 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), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanFieldMove, 4, 4, 4), }; const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { - overworld_frame(gEventObjectPic_QuintyPlump, 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), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 0), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 1), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 2), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 3), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 4), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 5), + overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6), }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { - overworld_frame(gEventObjectPic_LittleBoy1, 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), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 0), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 1), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 2), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 3), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 4), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 5), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 6), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 7), - overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 8), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7), + overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { - overworld_frame(gEventObjectPic_Boy1, 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), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = { - overworld_frame(gEventObjectPic_Girl1, 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), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = { - overworld_frame(gEventObjectPic_Boy2, 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), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { - overworld_frame(gEventObjectPic_Girl2, 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), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { - overworld_frame(gEventObjectPic_LittleBoy2, 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), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - overworld_frame(gEventObjectPic_LittleGirl2, 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), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { - overworld_frame(gEventObjectPic_Boy3, 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), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy3, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { - overworld_frame(gEventObjectPic_Girl3, 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), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 0), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 1), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 2), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 3), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 4), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 5), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 6), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 7), + overworld_frame(gEventObjectPic_Girl3, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { - overworld_frame(gEventObjectPic_Boy4, 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), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), + overworld_frame(gEventObjectPic_Boy4, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { - overworld_frame(gEventObjectPic_Woman1, 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), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { - overworld_frame(gEventObjectPic_FatMan, 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), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 0), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 1), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 2), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 3), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 4), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 5), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 6), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 7), + overworld_frame(gEventObjectPic_FatMan, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - overworld_frame(gEventObjectPic_Woman2, 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), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { - overworld_frame(gEventObjectPic_Man1, 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), + overworld_frame(gEventObjectPic_Man1, 2, 4, 0), + overworld_frame(gEventObjectPic_Man1, 2, 4, 1), + overworld_frame(gEventObjectPic_Man1, 2, 4, 2), + overworld_frame(gEventObjectPic_Man1, 2, 4, 3), + overworld_frame(gEventObjectPic_Man1, 2, 4, 4), + overworld_frame(gEventObjectPic_Man1, 2, 4, 5), + overworld_frame(gEventObjectPic_Man1, 2, 4, 6), + overworld_frame(gEventObjectPic_Man1, 2, 4, 7), + overworld_frame(gEventObjectPic_Man1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - overworld_frame(gEventObjectPic_Woman3, 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), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { - overworld_frame(gEventObjectPic_OldMan1, 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), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7), + overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - overworld_frame(gEventObjectPic_OldWoman1, 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), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7), + overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { - overworld_frame(gEventObjectPic_Man2, 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), + overworld_frame(gEventObjectPic_Man2, 2, 4, 0), + overworld_frame(gEventObjectPic_Man2, 2, 4, 1), + overworld_frame(gEventObjectPic_Man2, 2, 4, 2), + overworld_frame(gEventObjectPic_Man2, 2, 4, 3), + overworld_frame(gEventObjectPic_Man2, 2, 4, 4), + overworld_frame(gEventObjectPic_Man2, 2, 4, 5), + overworld_frame(gEventObjectPic_Man2, 2, 4, 6), + overworld_frame(gEventObjectPic_Man2, 2, 4, 7), + overworld_frame(gEventObjectPic_Man2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { - overworld_frame(gEventObjectPic_Woman4, 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), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman4, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - overworld_frame(gEventObjectPic_Man3, 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), + overworld_frame(gEventObjectPic_Man3, 2, 4, 0), + overworld_frame(gEventObjectPic_Man3, 2, 4, 1), + overworld_frame(gEventObjectPic_Man3, 2, 4, 2), + overworld_frame(gEventObjectPic_Man3, 2, 4, 3), + overworld_frame(gEventObjectPic_Man3, 2, 4, 4), + overworld_frame(gEventObjectPic_Man3, 2, 4, 5), + overworld_frame(gEventObjectPic_Man3, 2, 4, 6), + overworld_frame(gEventObjectPic_Man3, 2, 4, 7), + overworld_frame(gEventObjectPic_Man3, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - overworld_frame(gEventObjectPic_Woman5, 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), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { - overworld_frame(gEventObjectPic_Cook, 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), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 0), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 1), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), + overworld_frame(gEventObjectPic_Cook, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { - overworld_frame(gEventObjectPic_Woman6, 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), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman6, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - overworld_frame(gEventObjectPic_OldMan2, 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), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - overworld_frame(gEventObjectPic_OldWoman2, 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), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 3), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 4), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 5), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 6), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 7), + overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { - 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), + overworld_frame(gEventObjectPic_Camper, 2, 4, 0), + overworld_frame(gEventObjectPic_Camper, 2, 4, 1), + overworld_frame(gEventObjectPic_Camper, 2, 4, 2), + overworld_frame(gEventObjectPic_Camper, 2, 4, 3), + overworld_frame(gEventObjectPic_Camper, 2, 4, 4), + overworld_frame(gEventObjectPic_Camper, 2, 4, 5), + overworld_frame(gEventObjectPic_Camper, 2, 4, 6), + overworld_frame(gEventObjectPic_Camper, 2, 4, 7), + overworld_frame(gEventObjectPic_Camper, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { - overworld_frame(gEventObjectPic_Picnicker, 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), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 0), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 1), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 2), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 3), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 4), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 5), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 6), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 7), + overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - overworld_frame(gEventObjectPic_Man4, 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), + overworld_frame(gEventObjectPic_Man4, 2, 4, 0), + overworld_frame(gEventObjectPic_Man4, 2, 4, 1), + overworld_frame(gEventObjectPic_Man4, 2, 4, 2), + overworld_frame(gEventObjectPic_Man4, 2, 4, 3), + overworld_frame(gEventObjectPic_Man4, 2, 4, 4), + overworld_frame(gEventObjectPic_Man4, 2, 4, 5), + overworld_frame(gEventObjectPic_Man4, 2, 4, 6), + overworld_frame(gEventObjectPic_Man4, 2, 4, 7), + overworld_frame(gEventObjectPic_Man4, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { - overworld_frame(gEventObjectPic_Woman7, 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), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman7, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { - overworld_frame(gEventObjectPic_Youngster, 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), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 0), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 1), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 2), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 3), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 4), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 5), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 6), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 7), + overworld_frame(gEventObjectPic_Youngster, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = { - overworld_frame(gEventObjectPic_BugCatcher, 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), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 0), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 1), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 2), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 3), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 4), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 5), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 6), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 7), + overworld_frame(gEventObjectPic_BugCatcher, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = { - overworld_frame(gEventObjectPic_PsychicM, 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), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 0), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 1), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 2), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 3), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 4), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 5), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 6), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 7), + overworld_frame(gEventObjectPic_PsychicM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = { - overworld_frame(gEventObjectPic_SchoolKidM, 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), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 0), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 1), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 2), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 3), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 4), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 5), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 6), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 7), + overworld_frame(gEventObjectPic_SchoolKidM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = { - overworld_frame(gEventObjectPic_Maniac, 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), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 0), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 1), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 2), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 3), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 4), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 5), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 6), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 7), + overworld_frame(gEventObjectPic_Maniac, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = { - overworld_frame(gEventObjectPic_HexManiac, 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), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 0), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 1), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 2), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 3), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 4), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 5), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 6), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 7), + overworld_frame(gEventObjectPic_HexManiac, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = { - overworld_frame(gEventObjectPic_SwimmerM, 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), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 0), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 1), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 2), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 3), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 4), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 5), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 6), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 7), + overworld_frame(gEventObjectPic_SwimmerM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = { - overworld_frame(gEventObjectPic_SwimmerF, 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), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 0), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 1), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 2), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 3), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 4), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 5), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 6), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 7), + overworld_frame(gEventObjectPic_SwimmerF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = { - overworld_frame(gEventObjectPic_BlackBelt, 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), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 0), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 1), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 2), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 3), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 4), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 5), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 6), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 7), + overworld_frame(gEventObjectPic_BlackBelt, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = { - overworld_frame(gEventObjectPic_Beauty, 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), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 0), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 1), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 2), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 3), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 4), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 5), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 6), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 7), + overworld_frame(gEventObjectPic_Beauty, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = { - overworld_frame(gEventObjectPic_Scientist1, 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), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 0), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 1), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 2), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 3), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 4), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 5), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 6), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 7), + overworld_frame(gEventObjectPic_Scientist1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Lass[] = { - overworld_frame(gEventObjectPic_Lass, 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), + overworld_frame(gEventObjectPic_Lass, 2, 4, 0), + overworld_frame(gEventObjectPic_Lass, 2, 4, 1), + overworld_frame(gEventObjectPic_Lass, 2, 4, 2), + overworld_frame(gEventObjectPic_Lass, 2, 4, 3), + overworld_frame(gEventObjectPic_Lass, 2, 4, 4), + overworld_frame(gEventObjectPic_Lass, 2, 4, 5), + overworld_frame(gEventObjectPic_Lass, 2, 4, 6), + overworld_frame(gEventObjectPic_Lass, 2, 4, 7), + overworld_frame(gEventObjectPic_Lass, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = { - overworld_frame(gEventObjectPic_Gentleman, 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), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 0), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 1), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 2), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 3), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 4), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 5), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 6), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 7), + overworld_frame(gEventObjectPic_Gentleman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = { - overworld_frame(gEventObjectPic_Sailor, 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), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 0), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 1), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 2), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 3), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 4), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 5), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 6), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 7), + overworld_frame(gEventObjectPic_Sailor, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = { - overworld_frame(gEventObjectPic_Fisherman, 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), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 0), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 1), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 2), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 3), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 4), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 5), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 6), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 7), + overworld_frame(gEventObjectPic_Fisherman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = { - overworld_frame(gEventObjectPic_RunningTriathleteM, 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), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 0), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 1), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 2), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 3), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 4), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 5), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 6), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 7), + overworld_frame(gEventObjectPic_RunningTriathleteM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = { - overworld_frame(gEventObjectPic_RunningTriathleteF, 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), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 0), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 1), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 2), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 3), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 4), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 5), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 6), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 7), + overworld_frame(gEventObjectPic_RunningTriathleteF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = { - overworld_frame(gEventObjectPic_TuberF, 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), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberF, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = { - overworld_frame(gEventObjectPic_TuberM, 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), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberM, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = { - overworld_frame(gEventObjectPic_Hiker, 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), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 0), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 1), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 2), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 3), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 4), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 5), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 6), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 7), + overworld_frame(gEventObjectPic_Hiker, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteM, 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), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteM, 4, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = { - overworld_frame(gEventObjectPic_CyclingTriathleteF, 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), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 0), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 1), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 2), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 3), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 4), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 5), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 6), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 7), + overworld_frame(gEventObjectPic_CyclingTriathleteF, 4, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = { - overworld_frame(gEventObjectPic_Nurse, 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), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 0), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 1), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 2), + overworld_frame(gEventObjectPic_Nurse, 2, 4, 3), }; const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { @@ -751,87 +751,87 @@ const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = { }; const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { - 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), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 0), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 1), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 2), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 3), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 4), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 5), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 6), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 7), + overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { - overworld_frame(gEventObjectPic_Man5, 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), + overworld_frame(gEventObjectPic_Man5, 2, 4, 0), + overworld_frame(gEventObjectPic_Man5, 2, 4, 1), + overworld_frame(gEventObjectPic_Man5, 2, 4, 2), + overworld_frame(gEventObjectPic_Man5, 2, 4, 3), + overworld_frame(gEventObjectPic_Man5, 2, 4, 4), + overworld_frame(gEventObjectPic_Man5, 2, 4, 5), + overworld_frame(gEventObjectPic_Man5, 2, 4, 6), + overworld_frame(gEventObjectPic_Man5, 2, 4, 7), + overworld_frame(gEventObjectPic_Man5, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { - overworld_frame(gEventObjectPic_Man6, 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), + overworld_frame(gEventObjectPic_Man6, 2, 4, 0), + overworld_frame(gEventObjectPic_Man6, 2, 4, 1), + overworld_frame(gEventObjectPic_Man6, 2, 4, 2), + overworld_frame(gEventObjectPic_Man6, 2, 4, 3), + overworld_frame(gEventObjectPic_Man6, 2, 4, 4), + overworld_frame(gEventObjectPic_Man6, 2, 4, 5), + overworld_frame(gEventObjectPic_Man6, 2, 4, 6), + overworld_frame(gEventObjectPic_Man6, 2, 4, 7), + overworld_frame(gEventObjectPic_Man6, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { - overworld_frame(gEventObjectPic_ReporterM, 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), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 2), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 3), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 4), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 5), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 6), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 7), + overworld_frame(gEventObjectPic_ReporterM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = { - overworld_frame(gEventObjectPic_ReporterF, 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), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 0), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 1), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 2), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 3), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 4), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 5), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 6), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 7), + overworld_frame(gEventObjectPic_ReporterF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan1, 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), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan1, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = { - overworld_frame(gEventObjectPic_MauvilleOldMan2, 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), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 0), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 1), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 2), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 3), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 4), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 5), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 6), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 7), + overworld_frame(gEventObjectPic_MauvilleOldMan2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = { @@ -859,53 +859,53 @@ const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = { }; const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = { - 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), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 0), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 1), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 2), + overworld_frame(gEventObjectPic_CuttableTree, 2, 2, 3), }; const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = { - overworld_frame(gEventObjectPic_MartEmployee, 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), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 0), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 1), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 2), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 3), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 4), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 5), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 6), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 7), + overworld_frame(gEventObjectPic_MartEmployee, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = { - overworld_frame(gEventObjectPic_RooftopSaleWoman, 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), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_RooftopSaleWoman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Teala[] = { - overworld_frame(gEventObjectPic_Teala, 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), + overworld_frame(gEventObjectPic_Teala, 2, 4, 0), + overworld_frame(gEventObjectPic_Teala, 2, 4, 1), + overworld_frame(gEventObjectPic_Teala, 2, 4, 2), + overworld_frame(gEventObjectPic_Teala, 2, 4, 3), + overworld_frame(gEventObjectPic_Teala, 2, 4, 4), + overworld_frame(gEventObjectPic_Teala, 2, 4, 5), + overworld_frame(gEventObjectPic_Teala, 2, 4, 6), + overworld_frame(gEventObjectPic_Teala, 2, 4, 7), + overworld_frame(gEventObjectPic_Teala, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = { - overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 0), - overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 1), - overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 2), - overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 3), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 0), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 1), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 2), + overworld_frame(gEventObjectPic_BreakableRock, 2, 2, 3), }; const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { @@ -913,15 +913,15 @@ const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = { }; const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = { - 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), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 0), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 1), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), + overworld_frame(gEventObjectPic_MrBrineysBoat, 4, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { @@ -929,27 +929,27 @@ const struct SpriteFrameImage gEventObjectPicTable_Truck[] = { }; const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = { - 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), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 0), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 1), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = { - overworld_frame(gEventObjectPic_Vigoroth, 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), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 3), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), + overworld_frame(gEventObjectPic_Vigoroth, 4, 4, 4), }; const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { @@ -957,149 +957,149 @@ const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = { }; const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = { - 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), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 0), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 1), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 2), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 3), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 4), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 5), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 6), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 7), + overworld_frame(gEventObjectPic_EnemyZigzagoon, 4, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = { - overworld_frame(gEventObjectPic_Poochyena, 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), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 0), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 1), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 2), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 3), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 4), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 5), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 6), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 7), + overworld_frame(gEventObjectPic_Poochyena, 4, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Artist[] = { - overworld_frame(gEventObjectPic_Artist, 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), + overworld_frame(gEventObjectPic_Artist, 2, 4, 0), + overworld_frame(gEventObjectPic_Artist, 2, 4, 1), + overworld_frame(gEventObjectPic_Artist, 2, 4, 2), + overworld_frame(gEventObjectPic_Artist, 2, 4, 3), + overworld_frame(gEventObjectPic_Artist, 2, 4, 4), + overworld_frame(gEventObjectPic_Artist, 2, 4, 5), + overworld_frame(gEventObjectPic_Artist, 2, 4, 6), + overworld_frame(gEventObjectPic_Artist, 2, 4, 7), + overworld_frame(gEventObjectPic_Artist, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = { - overworld_frame(gEventObjectPic_MayNormal, 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), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_MayNormal, 2, 4, 8), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 0), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 1), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 2), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 3), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 4), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 5), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 6), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 7), + overworld_frame(gEventObjectPic_MayRunning, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = { - overworld_frame(gEventObjectPic_MayMachBike, 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), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 0), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 1), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 2), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 3), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 4), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 5), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 6), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 7), + overworld_frame(gEventObjectPic_MayMachBike, 4, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = { - overworld_frame(gEventObjectPic_MayAcroBike, 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), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 0), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 1), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 2), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 3), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 4), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 5), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 6), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 7), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 8), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 9), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 10), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 11), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 12), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 13), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 14), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 15), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 16), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 17), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 18), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 19), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 20), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 21), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 22), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 23), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 24), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 25), + overworld_frame(gEventObjectPic_MayAcroBike, 4, 4, 26), }; const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = { - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 3), - overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 5), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 0), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 2), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 4), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 1), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 3), + overworld_frame(gEventObjectPic_MaySurfing, 4, 4, 5), }; const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = { - overworld_frame(gEventObjectPic_MayUnderwater, 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), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 0), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 1), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), + overworld_frame(gEventObjectPic_MayUnderwater, 4, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = { - overworld_frame(gEventObjectPic_MayFieldMove, 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), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 0), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 1), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 2), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 3), + overworld_frame(gEventObjectPic_MayFieldMove, 4, 4, 4), }; const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = { - overworld_frame(gEventObjectPic_Cameraman, 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), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 0), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 1), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 2), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 3), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 4), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 5), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 6), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 7), + overworld_frame(gEventObjectPic_Cameraman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = { @@ -1111,309 +1111,309 @@ const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { - 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), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 0), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 1), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 2), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 3), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 4), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 5), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 6), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 7), + overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { - overworld_frame(gEventObjectPic_Man7, 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), + overworld_frame(gEventObjectPic_Man7, 2, 4, 0), + overworld_frame(gEventObjectPic_Man7, 2, 4, 1), + overworld_frame(gEventObjectPic_Man7, 2, 4, 2), + overworld_frame(gEventObjectPic_Man7, 2, 4, 3), + overworld_frame(gEventObjectPic_Man7, 2, 4, 4), + overworld_frame(gEventObjectPic_Man7, 2, 4, 5), + overworld_frame(gEventObjectPic_Man7, 2, 4, 6), + overworld_frame(gEventObjectPic_Man7, 2, 4, 7), + overworld_frame(gEventObjectPic_Man7, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { - overworld_frame(gEventObjectPic_AquaMemberM, 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), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 0), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 1), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 2), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 3), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 4), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 5), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 6), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 7), + overworld_frame(gEventObjectPic_AquaMemberM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = { - overworld_frame(gEventObjectPic_AquaMemberF, 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), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 0), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 1), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 2), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 3), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 4), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 5), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 6), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 7), + overworld_frame(gEventObjectPic_AquaMemberF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = { - overworld_frame(gEventObjectPic_MagmaMemberM, 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), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 0), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 1), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 2), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 3), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 4), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 5), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 6), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 7), + overworld_frame(gEventObjectPic_MagmaMemberM, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = { - overworld_frame(gEventObjectPic_MagmaMemberF, 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), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 0), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 1), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 2), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 3), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 4), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 5), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 6), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 7), + overworld_frame(gEventObjectPic_MagmaMemberF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = { - overworld_frame(gEventObjectPic_Sidney, 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), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 0), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 1), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), + overworld_frame(gEventObjectPic_Sidney, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = { - overworld_frame(gEventObjectPic_Phoebe, 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), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 0), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 1), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), + overworld_frame(gEventObjectPic_Phoebe, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = { - overworld_frame(gEventObjectPic_Glacia, 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), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 0), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 1), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), + overworld_frame(gEventObjectPic_Glacia, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Drake[] = { - overworld_frame(gEventObjectPic_Drake, 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), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 0), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 1), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), + overworld_frame(gEventObjectPic_Drake, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = { - overworld_frame(gEventObjectPic_Roxanne, 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), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 0), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 1), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), + overworld_frame(gEventObjectPic_Roxanne, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = { - overworld_frame(gEventObjectPic_Brawly, 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), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 0), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 1), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), + overworld_frame(gEventObjectPic_Brawly, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = { - overworld_frame(gEventObjectPic_Wattson, 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), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 0), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 1), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), + overworld_frame(gEventObjectPic_Wattson, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = { - overworld_frame(gEventObjectPic_Flannery, 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), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 0), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 1), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), + overworld_frame(gEventObjectPic_Flannery, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Norman[] = { - overworld_frame(gEventObjectPic_Norman, 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), + overworld_frame(gEventObjectPic_Norman, 2, 4, 0), + overworld_frame(gEventObjectPic_Norman, 2, 4, 1), + overworld_frame(gEventObjectPic_Norman, 2, 4, 2), + overworld_frame(gEventObjectPic_Norman, 2, 4, 3), + overworld_frame(gEventObjectPic_Norman, 2, 4, 4), + overworld_frame(gEventObjectPic_Norman, 2, 4, 5), + overworld_frame(gEventObjectPic_Norman, 2, 4, 6), + overworld_frame(gEventObjectPic_Norman, 2, 4, 7), + overworld_frame(gEventObjectPic_Norman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Winona[] = { - overworld_frame(gEventObjectPic_Winona, 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), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 0), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 1), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), + overworld_frame(gEventObjectPic_Winona, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Liza[] = { - overworld_frame(gEventObjectPic_Liza, 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), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 0), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 1), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), + overworld_frame(gEventObjectPic_Liza, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Tate[] = { - overworld_frame(gEventObjectPic_Tate, 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), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 0), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 1), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), + overworld_frame(gEventObjectPic_Tate, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = { - overworld_frame(gEventObjectPic_Wallace, 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), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 0), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 1), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 2), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 3), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 4), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 5), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 6), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 7), + overworld_frame(gEventObjectPic_Wallace, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Steven[] = { - overworld_frame(gEventObjectPic_Steven, 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), + overworld_frame(gEventObjectPic_Steven, 2, 4, 0), + overworld_frame(gEventObjectPic_Steven, 2, 4, 1), + overworld_frame(gEventObjectPic_Steven, 2, 4, 2), + overworld_frame(gEventObjectPic_Steven, 2, 4, 3), + overworld_frame(gEventObjectPic_Steven, 2, 4, 4), + overworld_frame(gEventObjectPic_Steven, 2, 4, 5), + overworld_frame(gEventObjectPic_Steven, 2, 4, 6), + overworld_frame(gEventObjectPic_Steven, 2, 4, 7), + overworld_frame(gEventObjectPic_Steven, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Wally[] = { - overworld_frame(gEventObjectPic_Wally, 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), + overworld_frame(gEventObjectPic_Wally, 2, 4, 0), + overworld_frame(gEventObjectPic_Wally, 2, 4, 1), + overworld_frame(gEventObjectPic_Wally, 2, 4, 2), + overworld_frame(gEventObjectPic_Wally, 2, 4, 3), + overworld_frame(gEventObjectPic_Wally, 2, 4, 4), + overworld_frame(gEventObjectPic_Wally, 2, 4, 5), + overworld_frame(gEventObjectPic_Wally, 2, 4, 6), + overworld_frame(gEventObjectPic_Wally, 2, 4, 7), + overworld_frame(gEventObjectPic_Wally, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = { - overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 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), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 0), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 1), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 2), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 3), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 4), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 5), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 6), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 7), + overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = { - overworld_frame(gEventObjectPic_BrendanFishing, 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), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 6), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 7), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 8), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 9), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 10), + overworld_frame(gEventObjectPic_BrendanFishing, 4, 4, 11), }; const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = { - overworld_frame(gEventObjectPic_MayFishing, 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), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 0), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 1), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 2), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 3), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 4), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 5), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 6), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 7), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 8), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 9), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 10), + overworld_frame(gEventObjectPic_MayFishing, 4, 4, 11), }; const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = { - overworld_frame(gEventObjectPic_HotSpringsOldWoman, 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), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_HotSpringsOldWoman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = { @@ -1621,63 +1621,63 @@ const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = { }; const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { - 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), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 0), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 1), + overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { - overworld_frame(gEventObjectPic_Boy5, 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), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), + overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = { - 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), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 0), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 1), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 2), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 3), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 4), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 5), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 6), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 7), + overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 0), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 2), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5), - overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 0), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 2), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 4), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), + overworld_frame(gEventObjectPic_BrendanWatering, 4, 4, 5), }; const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = { - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 0), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 2), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5), - overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 0), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 2), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 4), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 1), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 3), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), + overworld_frame(gEventObjectPic_MayWatering, 4, 4, 5), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = { @@ -1689,75 +1689,75 @@ const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Archie[] = { - 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), + overworld_frame(gEventObjectPic_Archie, 2, 4, 0), + overworld_frame(gEventObjectPic_Archie, 2, 4, 1), + overworld_frame(gEventObjectPic_Archie, 2, 4, 2), + overworld_frame(gEventObjectPic_Archie, 2, 4, 3), + overworld_frame(gEventObjectPic_Archie, 2, 4, 4), + overworld_frame(gEventObjectPic_Archie, 2, 4, 5), + overworld_frame(gEventObjectPic_Archie, 2, 4, 6), + overworld_frame(gEventObjectPic_Archie, 2, 4, 7), + overworld_frame(gEventObjectPic_Archie, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = { - overworld_frame(gEventObjectPic_Maxie, 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), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 0), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 1), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 2), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 3), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 4), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 5), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 6), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 7), + overworld_frame(gEventObjectPic_Maxie, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = { - overworld_frame(gEventObjectPic_Kyogre, 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), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 0), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 1), }; const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = { - overworld_frame(gEventObjectPic_Groudon, 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), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 0), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 1), }; const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = { - overworld_frame(gEventObjectPic_Kyogre, 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), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 2), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), + overworld_frame(gEventObjectPic_Kyogre, 4, 4, 3), }; const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = { - overworld_frame(gEventObjectPic_Groudon, 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), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 2), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), + overworld_frame(gEventObjectPic_Groudon, 4, 4, 3), }; const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = { @@ -1777,35 +1777,35 @@ const struct SpriteFrameImage gEventObjectPicTable_Regi[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = { - 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), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 0), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 1), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), + overworld_frame(gEventObjectPic_Skitty, 2, 2, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = { - overworld_frame(gEventObjectPic_Kecleon, 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), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 0), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 1), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), + overworld_frame(gEventObjectPic_Kecleon, 2, 2, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = { - overworld_frame(gEventObjectPic_Rayquaza, 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), + overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 0), + overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 1), + overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 2), + overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 3), + overworld_frame(gEventObjectPic_Rayquaza, 8, 8, 4), }; const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { @@ -1821,123 +1821,123 @@ const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = { - 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), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 0), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 1), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), + overworld_frame(gEventObjectPic_Zigzagoon, 2, 2, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = { - overworld_frame(gEventObjectPic_Pikachu, 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), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 0), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 1), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), + overworld_frame(gEventObjectPic_Pikachu, 2, 2, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = { - overworld_frame(gEventObjectPic_Azumarill, 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), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azumarill, 2, 2, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = { - overworld_frame(gEventObjectPic_Wingull, 16, 16, 0), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 2), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 4), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 1), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 1), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 3), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 3), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 5), - overworld_frame(gEventObjectPic_Wingull, 16, 16, 5), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 0), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 2), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 4), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 1), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 3), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), + overworld_frame(gEventObjectPic_Wingull, 2, 2, 5), }; const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = { - overworld_frame(gEventObjectPic_TuberMSwimming, 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), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 0), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 1), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 2), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 3), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 4), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 5), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 6), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 7), + overworld_frame(gEventObjectPic_TuberMSwimming, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = { - overworld_frame(gEventObjectPic_Azurill, 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), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 0), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 1), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), + overworld_frame(gEventObjectPic_Azurill, 2, 2, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Mom[] = { - overworld_frame(gEventObjectPic_Mom, 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), + overworld_frame(gEventObjectPic_Mom, 2, 4, 0), + overworld_frame(gEventObjectPic_Mom, 2, 4, 1), + overworld_frame(gEventObjectPic_Mom, 2, 4, 2), + overworld_frame(gEventObjectPic_Mom, 2, 4, 3), + overworld_frame(gEventObjectPic_Mom, 2, 4, 4), + overworld_frame(gEventObjectPic_Mom, 2, 4, 5), + overworld_frame(gEventObjectPic_Mom, 2, 4, 6), + overworld_frame(gEventObjectPic_Mom, 2, 4, 7), + overworld_frame(gEventObjectPic_Mom, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Scott[] = { - overworld_frame(gEventObjectPic_Scott, 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), + overworld_frame(gEventObjectPic_Scott, 2, 4, 0), + overworld_frame(gEventObjectPic_Scott, 2, 4, 1), + overworld_frame(gEventObjectPic_Scott, 2, 4, 2), + overworld_frame(gEventObjectPic_Scott, 2, 4, 3), + overworld_frame(gEventObjectPic_Scott, 2, 4, 4), + overworld_frame(gEventObjectPic_Scott, 2, 4, 5), + overworld_frame(gEventObjectPic_Scott, 2, 4, 6), + overworld_frame(gEventObjectPic_Scott, 2, 4, 7), + overworld_frame(gEventObjectPic_Scott, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Juan[] = { - overworld_frame(gEventObjectPic_Juan, 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), + overworld_frame(gEventObjectPic_Juan, 2, 4, 0), + overworld_frame(gEventObjectPic_Juan, 2, 4, 1), + overworld_frame(gEventObjectPic_Juan, 2, 4, 2), + overworld_frame(gEventObjectPic_Juan, 2, 4, 3), + overworld_frame(gEventObjectPic_Juan, 2, 4, 4), + overworld_frame(gEventObjectPic_Juan, 2, 4, 5), + overworld_frame(gEventObjectPic_Juan, 2, 4, 6), + overworld_frame(gEventObjectPic_Juan, 2, 4, 7), + overworld_frame(gEventObjectPic_Juan, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = { - overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 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), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 0), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 1), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), + overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { @@ -1945,99 +1945,99 @@ const struct SpriteFrameImage gEventObjectPicTable_Statue[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = { - 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), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 0), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 1), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 2), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 3), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 4), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 5), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 6), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 7), + overworld_frame(gEventObjectPic_Dusclops, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = { - overworld_frame(gEventObjectPic_Kirlia, 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), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 0), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 1), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 2), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 3), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 4), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 5), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 6), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 7), + overworld_frame(gEventObjectPic_Kirlia, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = { - overworld_frame(gEventObjectPic_UnionRoomAttendant, 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), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 0), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 1), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), + overworld_frame(gEventObjectPic_UnionRoomAttendant, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = { - overworld_frame(gEventObjectPic_Sudowoodo, 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), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 0), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 1), + overworld_frame(gEventObjectPic_Sudowoodo, 2, 4, 2), }; const struct SpriteFrameImage gEventObjectPicTable_Mew[] = { - overworld_frame(gEventObjectPic_Mew, 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), + overworld_frame(gEventObjectPic_Mew, 2, 4, 0), + overworld_frame(gEventObjectPic_Mew, 2, 4, 1), + overworld_frame(gEventObjectPic_Mew, 2, 4, 2), + overworld_frame(gEventObjectPic_Mew, 2, 4, 3), + overworld_frame(gEventObjectPic_Mew, 2, 4, 4), + overworld_frame(gEventObjectPic_Mew, 2, 4, 5), + overworld_frame(gEventObjectPic_Mew, 2, 4, 6), + overworld_frame(gEventObjectPic_Mew, 2, 4, 7), + overworld_frame(gEventObjectPic_Mew, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Red[] = { - overworld_frame(gEventObjectPic_Red, 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), + overworld_frame(gEventObjectPic_Red, 2, 4, 0), + overworld_frame(gEventObjectPic_Red, 2, 4, 1), + overworld_frame(gEventObjectPic_Red, 2, 4, 2), + overworld_frame(gEventObjectPic_Red, 2, 4, 3), + overworld_frame(gEventObjectPic_Red, 2, 4, 4), + overworld_frame(gEventObjectPic_Red, 2, 4, 5), + overworld_frame(gEventObjectPic_Red, 2, 4, 6), + overworld_frame(gEventObjectPic_Red, 2, 4, 7), + overworld_frame(gEventObjectPic_Red, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = { - overworld_frame(gEventObjectPic_Leaf, 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), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 0), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 1), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 2), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 3), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 4), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 5), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 6), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 7), + overworld_frame(gEventObjectPic_Leaf, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = { - overworld_frame(gEventObjectPic_Deoxys, 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), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 1), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), + overworld_frame(gEventObjectPic_Deoxys, 4, 4, 0), }; const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { @@ -2045,135 +2045,135 @@ const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = { }; const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = { - 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), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 0), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 1), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 2), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 3), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 4), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 5), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 6), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 7), + overworld_frame(gEventObjectPic_Anabel, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = { - overworld_frame(gEventObjectPic_Tucker, 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), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 0), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 1), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 2), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 3), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 4), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 5), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 6), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 7), + overworld_frame(gEventObjectPic_Tucker, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = { - overworld_frame(gEventObjectPic_Spenser, 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), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 0), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 1), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 2), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 3), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 4), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 5), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 6), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 7), + overworld_frame(gEventObjectPic_Spenser, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Greta[] = { - overworld_frame(gEventObjectPic_Greta, 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), + overworld_frame(gEventObjectPic_Greta, 2, 4, 0), + overworld_frame(gEventObjectPic_Greta, 2, 4, 1), + overworld_frame(gEventObjectPic_Greta, 2, 4, 2), + overworld_frame(gEventObjectPic_Greta, 2, 4, 3), + overworld_frame(gEventObjectPic_Greta, 2, 4, 4), + overworld_frame(gEventObjectPic_Greta, 2, 4, 5), + overworld_frame(gEventObjectPic_Greta, 2, 4, 6), + overworld_frame(gEventObjectPic_Greta, 2, 4, 7), + overworld_frame(gEventObjectPic_Greta, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Noland[] = { - overworld_frame(gEventObjectPic_Noland, 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), + overworld_frame(gEventObjectPic_Noland, 2, 4, 0), + overworld_frame(gEventObjectPic_Noland, 2, 4, 1), + overworld_frame(gEventObjectPic_Noland, 2, 4, 2), + overworld_frame(gEventObjectPic_Noland, 2, 4, 3), + overworld_frame(gEventObjectPic_Noland, 2, 4, 4), + overworld_frame(gEventObjectPic_Noland, 2, 4, 5), + overworld_frame(gEventObjectPic_Noland, 2, 4, 6), + overworld_frame(gEventObjectPic_Noland, 2, 4, 7), + overworld_frame(gEventObjectPic_Noland, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = { - overworld_frame(gEventObjectPic_Lucy, 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), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 0), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 1), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 2), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 3), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 4), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 5), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 6), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 7), + overworld_frame(gEventObjectPic_Lucy, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = { - overworld_frame(gEventObjectPic_Brandon, 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), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 0), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 1), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 2), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 3), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 4), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 5), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 6), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 7), + overworld_frame(gEventObjectPic_Brandon, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = { - overworld_frame(gEventObjectPic_Lugia, 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), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 0), + overworld_frame(gEventObjectPic_Lugia, 4, 4, 1), }; const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = { - overworld_frame(gEventObjectPic_HoOh, 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), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 0), + overworld_frame(gEventObjectPic_HoOh, 4, 4, 1), }; const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = { - overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 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), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = { - overworld_frame(gEventObjectPic_RubySapphireMayNormal, 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), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 0), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 1), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 2), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 3), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 4), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 5), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 6), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 7), + overworld_frame(gEventObjectPic_RubySapphireMayNormal, 2, 4, 8), }; #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 e8d15918f4..45a498dac1 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 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[] = { - overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 0), - overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 1), - overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 2), + overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0), + overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 1), + overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 5), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 7), }; const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] = @@ -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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 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[] = { - overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 0), - overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 1), + overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 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[] = { - overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 0), - overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 1), - overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 2), + overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 2), }; const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = @@ -533,14 +533,14 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x10 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { 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), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 5), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 6), + overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 7), }; const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] = @@ -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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 6), }; const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] = @@ -808,13 +808,13 @@ 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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6), }; const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88}; @@ -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[] = { - overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 0), - overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 1), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1), }; const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] = @@ -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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 4), }; const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] = @@ -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[] = { - 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), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 1), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 2), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 3), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 4), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 5), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 6), + overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 7), }; const union AnimCmd gFieldEffectObjectImageAnim_850D624[] = @@ -987,7 +987,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = { }; const struct SpriteFrameImage gFieldEffectObjectPicTable_Rayquaza[] = { - {.data = (u8*)gEventObjectPic_Rayquaza, .size = ((64*64)/2) /4} + overworld_frame(gEventObjectPic_Rayquaza, 4, 4, 0), }; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};