From 09b39527ff16a06fab702438bc5ac66ce6a613d8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 27 Mar 2020 08:58:23 -0400 Subject: [PATCH] Generalize oamtable names --- .../object_event_graphics_info.h | 6 +- .../object_events/object_event_subsprites.h | 83 ++++++++++--------- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index cb221a30b..bb36c9436 100755 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -92,7 +92,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xF const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, OBJ_EVENT_PAL_TAG_14, OBJ_EVENT_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_48x48, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_15, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, OBJ_EVENT_PAL_TAG_15, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable}; @@ -139,8 +139,8 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittle const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_8, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_17, OBJ_EVENT_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_26, OBJ_EVENT_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_96x40, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_26, OBJ_EVENT_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_88x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable}; const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MarillDoll, gDummySpriteAffineAnimTable}; diff --git a/src/data/object_events/object_event_subsprites.h b/src/data/object_events/object_event_subsprites.h index 79e75f1e1..63df1f777 100755 --- a/src/data/object_events/object_event_subsprites.h +++ b/src/data/object_events/object_event_subsprites.h @@ -278,7 +278,7 @@ const struct SubspriteTable gObjectEventSpriteOamTables_32x32[] = { {2, gObjectEventSpriteOamTable_32x32_4} }; -const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_48x48[] = { { .x = -24, .y = -24, @@ -377,16 +377,16 @@ const struct Subsprite gObjectEventSpriteOamTable_Truck_0[] = { } }; -const struct SubspriteTable gObjectEventSpriteOamTables_Truck[] = { - {12, gObjectEventSpriteOamTable_Truck_0}, - {12, gObjectEventSpriteOamTable_Truck_0}, - {12, gObjectEventSpriteOamTable_Truck_0}, - {12, gObjectEventSpriteOamTable_Truck_0}, - {12, gObjectEventSpriteOamTable_Truck_0}, - {12, gObjectEventSpriteOamTable_Truck_0} +const struct SubspriteTable gObjectEventSpriteOamTables_48x48[] = { + {12, gObjectEventSpriteOamTable_48x48}, + {12, gObjectEventSpriteOamTable_48x48}, + {12, gObjectEventSpriteOamTable_48x48}, + {12, gObjectEventSpriteOamTable_48x48}, + {12, gObjectEventSpriteOamTable_48x48}, + {12, gObjectEventSpriteOamTable_48x48} }; -const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x32_0[] = { { .x = -32, .y = -16, @@ -397,7 +397,7 @@ const struct Subsprite gObjectEventSpriteOamTable_Unused_0[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x32_1[] = { { .x = -32, .y = -16, @@ -408,7 +408,7 @@ const struct Subsprite gObjectEventSpriteOamTable_Unused_1[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x32_2[] = { { .x = -32, .y = -16, @@ -419,7 +419,7 @@ const struct Subsprite gObjectEventSpriteOamTable_Unused_2[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_64x32_3[] = { { .x = -32, .y = -16, @@ -430,13 +430,14 @@ const struct Subsprite gObjectEventSpriteOamTable_Unused_3[] = { } }; -const struct SubspriteTable gObjectEventSpriteOamTables_Unused[] = { +// Unused +const struct SubspriteTable gObjectEventSpriteOamTables_64x32[] = { {0, NULL}, - {1, gObjectEventSpriteOamTable_Unused_0}, - {1, gObjectEventSpriteOamTable_Unused_1}, - {1, gObjectEventSpriteOamTable_Unused_2}, - {1, gObjectEventSpriteOamTable_Unused_3}, - {1, gObjectEventSpriteOamTable_Unused_3} + {1, gObjectEventSpriteOamTable_64x32_0}, + {1, gObjectEventSpriteOamTable_64x32_1}, + {1, gObjectEventSpriteOamTable_64x32_2}, + {1, gObjectEventSpriteOamTable_64x32_3}, + {1, gObjectEventSpriteOamTable_64x32_3} }; const struct Subsprite gObjectEventSpriteOamTable_64x64_0[] = { @@ -492,7 +493,7 @@ const struct SubspriteTable gObjectEventSpriteOamTables_64x64[] = { {1, gObjectEventSpriteOamTable_64x64_3} }; -const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_96x40_0[] = { { .x = -48, .y = -20, @@ -615,7 +616,7 @@ const struct Subsprite gObjectEventSpriteOamTable_SSTidal_0[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_96x40_1[] = { { .x = -48, .y = -20, @@ -738,7 +739,7 @@ const struct Subsprite gObjectEventSpriteOamTable_SSTidal_1[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_96x40_2[] = { { .x = -48, .y = -20, @@ -861,7 +862,7 @@ const struct Subsprite gObjectEventSpriteOamTable_SSTidal_2[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_96x40_3[] = { { .x = -48, .y = -20, @@ -984,16 +985,17 @@ const struct Subsprite gObjectEventSpriteOamTable_SSTidal_3[] = { } }; -const struct SubspriteTable gObjectEventSpriteOamTables_SSTidal[] = { - {15, gObjectEventSpriteOamTable_SSTidal_0}, - {15, gObjectEventSpriteOamTable_SSTidal_0}, - {15, gObjectEventSpriteOamTable_SSTidal_1}, - {15, gObjectEventSpriteOamTable_SSTidal_2}, - {15, gObjectEventSpriteOamTable_SSTidal_3}, - {15, gObjectEventSpriteOamTable_SSTidal_3} +// Used by SS Tidal +const struct SubspriteTable gObjectEventSpriteOamTables_96x40[] = { + {15, gObjectEventSpriteOamTable_96x40_0}, + {15, gObjectEventSpriteOamTable_96x40_0}, + {15, gObjectEventSpriteOamTable_96x40_1}, + {15, gObjectEventSpriteOamTable_96x40_2}, + {15, gObjectEventSpriteOamTable_96x40_3}, + {15, gObjectEventSpriteOamTable_96x40_3} }; -const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = { +const struct Subsprite gObjectEventSpriteOamTable_88x32_0[] = { { .x = -48, .y = -20, @@ -1124,7 +1126,7 @@ const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_0[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = { +const struct Subsprite gObjectEventSpriteOamTable_88x32_1[] = { { .x = -48, .y = -20, @@ -1255,7 +1257,7 @@ const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_1[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = { +const struct Subsprite gObjectEventSpriteOamTable_88x32_2[] = { { .x = -48, .y = -20, @@ -1386,7 +1388,7 @@ const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_2[] = { } }; -const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = { +const struct Subsprite gObjectEventSpriteOamTable_88x32_3[] = { { .x = -48, .y = -20, @@ -1517,11 +1519,12 @@ const struct Subsprite gObjectEventSpriteOamTable_SubmarineShadow_3[] = { } }; -const struct SubspriteTable gObjectEventSpriteOamTables_SubmarineShadow[] = { - {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, - {16, gObjectEventSpriteOamTable_SubmarineShadow_0}, - {16, gObjectEventSpriteOamTable_SubmarineShadow_1}, - {16, gObjectEventSpriteOamTable_SubmarineShadow_2}, - {16, gObjectEventSpriteOamTable_SubmarineShadow_3}, - {16, gObjectEventSpriteOamTable_SubmarineShadow_3} +// Used by Submarine Shadow +const struct SubspriteTable gObjectEventSpriteOamTables_88x32[] = { + {16, gObjectEventSpriteOamTable_88x32_0}, + {16, gObjectEventSpriteOamTable_88x32_0}, + {16, gObjectEventSpriteOamTable_88x32_1}, + {16, gObjectEventSpriteOamTable_88x32_2}, + {16, gObjectEventSpriteOamTable_88x32_3}, + {16, gObjectEventSpriteOamTable_88x32_3} };