ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change overworld_frame macro to use tiles

Browse Source
This commit is contained in:
Diegoisawesome 2018-09-08 03:07:44 -05:00
parent eb8b0ff0f7
commit e1834c9d7b
4 changed files with 1771 additions and 1771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sprite.h
View File

@ -26,7 +26,7 @@ struct SpriteFrameImage
#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} #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 struct SpritePalette
{ {

540
src/data/field_event_obj/berry_tree_graphics_tables.h
View File

@ -2,421 +2,421 @@
#define GUARD_BERRY_TREE_GRAPHICS_TABLES_H #define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_PechaBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_KelpsyBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_WepearBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_IapapaBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_CheriBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_FigyBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_MagoBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_LumBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_RazzBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_GrepaBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_RabutaBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_NomelBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_LeppaBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_LiechiBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_HondewBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5}; const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_AguavBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_WikiBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_PomegBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_RawstBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_SpelonBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_ChestoBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_OranBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_PersimBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_SitrusBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_AspearBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3}; const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_PamtreBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_CornnBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_LansatBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_DurinBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4}; const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = { const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = {
overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeDirtPile, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 0),
overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1), overworld_frame(gEventObjectPic_BerryTreeSprout, 2, 2, 1),
overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 0), overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 0),
overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 1), overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 1),
overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 2), overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 2),
overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 3), overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 3),
overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 4), overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 4),
overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 5), overworld_frame(gEventObjectPic_TamatoBerryTree, 2, 4, 5),
}; };
const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2}; const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};

2840
src/data/field_event_obj/event_object_pic_tables.h
View File

File diff suppressed because it is too large Load Diff

160
src/data/field_event_obj/field_effect_objects.h
View File

@ -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 SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow};
const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = {
overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 3),
overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 4), overworld_frame(gFieldEffectObjectPic_TallGrass, 2, 2, 4),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] = 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 SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = {
overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 3),
overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 4), overworld_frame(gFieldEffectObjectPic_Ripple, 2, 2, 4),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] = 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 SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = {
overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 3),
overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 4), overworld_frame(gFieldEffectObjectPic_Ash, 2, 2, 4),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] = 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 SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460};
const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = {
overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 0), overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 0),
overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 1), overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 1),
overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 2), overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 2),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CB94[] = 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 SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = {
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 3),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 4), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 4),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 5), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 5),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 6), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 6),
overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 7), overworld_frame(gFieldEffectObjectPic_Arrow, 2, 2, 7),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] = 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 SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60};
const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = {
overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 2, 2, 3),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] = 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 SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = {
overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 0), overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 1), overworld_frame(gFieldEffectObjectPic_Splash, 2, 1, 1),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] = 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 SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90};
const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = {
overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 0), overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 0),
overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 1), overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 1),
overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 2), overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 2, 1, 2),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] = const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] =
@ -533,14 +533,14 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x10
const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = {
obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5), obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 3),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 4), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 4),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 5), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 5),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 6), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 6),
overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 7), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 7),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] = 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 SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0};
const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = {
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 0), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 1), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 2), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 2),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 3), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 3),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 4), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 4),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 5), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 5),
overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 6), overworld_frame(gFieldEffectObjectPic_TreeDisguise, 2, 4, 6),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] = 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 SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = {
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 0), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 1), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 2), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 2),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 3), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 3),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 4), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 4),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 5), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 5),
overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 6), overworld_frame(gFieldEffectObjectPic_MountainDisguise, 2, 4, 6),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] = 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 SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = {
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 0), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 1), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 2), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 2),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 3), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 3),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 4), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 4),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 5), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 5),
overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 6), overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 2, 4, 6),
}; };
const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88}; 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 SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = {
overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_ShortGrass, 2, 2, 1),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] = 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 SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158};
const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = {
overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 0), overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 0),
overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 1), overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 1),
overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 2), overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 2),
overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 3), overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 3),
overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 4), overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 2, 2, 4),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] = 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 SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = { const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 0), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 0),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 1), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 1),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 2), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 2),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 3), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 3),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 4), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 4),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 5), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 5),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 6), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 6),
overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 7), overworld_frame(gFieldEffectObjectPic_Bubbles, 2, 4, 7),
}; };
const union AnimCmd gFieldEffectObjectImageAnim_850D624[] = const union AnimCmd gFieldEffectObjectImageAnim_850D624[] =
@ -987,7 +987,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
}; };
const struct SpriteFrameImage gFieldEffectObjectPicTable_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}; const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};