summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/data/object_events/object_event_graphics_info.h8
-rw-r--r--src/data/object_events/object_event_subsprites.h103
2 files changed, 57 insertions, 54 deletions
diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h
index 87b26da64..687193566 100644
--- a/src/data/object_events/object_event_graphics_info.h
+++ b/src/data/object_events/object_event_graphics_info.h
@@ -99,7 +99,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xf
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_AcroBike, gObjectEventPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Surfing, gObjectEventPicTable_MaySurfing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_FieldMove, gObjectEventPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_Truck, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gObjectEventSubspriteTables_48x48, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Truck, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirchsBag, gDummySpriteAffineAnimTable};
@@ -119,7 +119,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xfff
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_MovingBox, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gObjectEventSubspriteTables_CableCar, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gObjectEventSubspriteTables_64x64, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_CableCar, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist2, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man7, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
@@ -145,8 +145,8 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy3 = {0xff
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gObjectEventSubspriteTables_32x32, gObjectEventImageAnimTable_Fishing, gObjectEventPicTable_MayFishing, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gObjectEventSubspriteTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_SSTidal, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_SubmarineShadow, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_96x40, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSTidal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gObjectEventSubspriteTables_88x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PichuDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gObjectEventSubspriteTables_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 49238f674..b9b05165f 100644
--- a/src/data/object_events/object_event_subsprites.h
+++ b/src/data/object_events/object_event_subsprites.h
@@ -103,7 +103,7 @@ const struct SubspriteTable gObjectEventSubspriteTables_32x32[] = {
{2, gObjectEventSubspriteTable_32x32_4}
};
-const struct Subsprite gObjectEventSubspriteTable_Truck_0[] = {
+const struct Subsprite gObjectEventSubspriteTable_48x48[] = {
{-24, -24, 1, 1, 0, 2},
{ 8, -24, 1, 0, 4, 2},
{-24, -16, 1, 1, 6, 2},
@@ -118,66 +118,67 @@ const struct Subsprite gObjectEventSubspriteTable_Truck_0[] = {
{ 8, 16, 1, 0, 34, 2}
};
-const struct SubspriteTable gObjectEventSubspriteTables_Truck[] = {
- {12, gObjectEventSubspriteTable_Truck_0},
- {12, gObjectEventSubspriteTable_Truck_0},
- {12, gObjectEventSubspriteTable_Truck_0},
- {12, gObjectEventSubspriteTable_Truck_0},
- {12, gObjectEventSubspriteTable_Truck_0},
- {12, gObjectEventSubspriteTable_Truck_0}
+const struct SubspriteTable gObjectEventSubspriteTables_48x48[] = {
+ {12, gObjectEventSubspriteTable_48x48},
+ {12, gObjectEventSubspriteTable_48x48},
+ {12, gObjectEventSubspriteTable_48x48},
+ {12, gObjectEventSubspriteTable_48x48},
+ {12, gObjectEventSubspriteTable_48x48},
+ {12, gObjectEventSubspriteTable_48x48}
};
-const struct Subsprite gObjectEventSubspriteTable_Unused_0[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x32_0[] = {
{-32, -16, 1, 3, 0, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_Unused_1[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x32_1[] = {
{-32, -16, 1, 3, 0, 1}
};
-const struct Subsprite gObjectEventSubspriteTable_Unused_2[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x32_2[] = {
{-32, -16, 1, 3, 0, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_Unused_3[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x32_3[] = {
{-32, -16, 1, 3, 0, 2}
};
-const struct SubspriteTable gObjectEventSubspriteTables_Unused[] = {
+// Unused
+const struct SubspriteTable gObjectEventSubspriteTables_64x32[] = {
{0, NULL},
- {1, gObjectEventSubspriteTable_Unused_0},
- {1, gObjectEventSubspriteTable_Unused_1},
- {1, gObjectEventSubspriteTable_Unused_2},
- {1, gObjectEventSubspriteTable_Unused_3},
- {1, gObjectEventSubspriteTable_Unused_3}
+ {1, gObjectEventSubspriteTable_64x32_0},
+ {1, gObjectEventSubspriteTable_64x32_1},
+ {1, gObjectEventSubspriteTable_64x32_2},
+ {1, gObjectEventSubspriteTable_64x32_3},
+ {1, gObjectEventSubspriteTable_64x32_3}
};
-const struct Subsprite gObjectEventSubspriteTable_CableCar_0[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x64_0[] = {
{-32, -32, 0, 3, 0, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_CableCar_1[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x64_1[] = {
{-32, -32, 0, 3, 0, 1}
};
-const struct Subsprite gObjectEventSubspriteTable_CableCar_2[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x64_2[] = {
{-32, -32, 0, 3, 0, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_CableCar_3[] = {
+const struct Subsprite gObjectEventSubspriteTable_64x64_3[] = {
{-32, -32, 0, 3, 0, 2}
};
-const struct SubspriteTable gObjectEventSubspriteTables_CableCar[] = {
+const struct SubspriteTable gObjectEventSubspriteTables_64x64[] = {
{0, NULL},
- {1, gObjectEventSubspriteTable_CableCar_0},
- {1, gObjectEventSubspriteTable_CableCar_1},
- {1, gObjectEventSubspriteTable_CableCar_2},
- {1, gObjectEventSubspriteTable_CableCar_3},
- {1, gObjectEventSubspriteTable_CableCar_3}
+ {1, gObjectEventSubspriteTable_64x64_0},
+ {1, gObjectEventSubspriteTable_64x64_1},
+ {1, gObjectEventSubspriteTable_64x64_2},
+ {1, gObjectEventSubspriteTable_64x64_3},
+ {1, gObjectEventSubspriteTable_64x64_3}
};
-const struct Subsprite gObjectEventSubspriteTable_SSTidal_0[] = {
+const struct Subsprite gObjectEventSubspriteTable_96x40_0[] = {
{-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 1, 8, 2},
@@ -195,7 +196,7 @@ const struct Subsprite gObjectEventSubspriteTable_SSTidal_0[] = {
{ 16, 12, 1, 1, 56, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_SSTidal_1[] = {
+const struct Subsprite gObjectEventSubspriteTable_96x40_1[] = {
{-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 1, 8, 1},
@@ -213,7 +214,7 @@ const struct Subsprite gObjectEventSubspriteTable_SSTidal_1[] = {
{ 16, 12, 1, 1, 56, 1}
};
-const struct Subsprite gObjectEventSubspriteTable_SSTidal_2[] = {
+const struct Subsprite gObjectEventSubspriteTable_96x40_2[] = {
{-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 1, 8, 2},
@@ -231,7 +232,7 @@ const struct Subsprite gObjectEventSubspriteTable_SSTidal_2[] = {
{ 16, 12, 1, 1, 56, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_SSTidal_3[] = {
+const struct Subsprite gObjectEventSubspriteTable_96x40_3[] = {
{-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 1, 8, 1},
@@ -249,16 +250,17 @@ const struct Subsprite gObjectEventSubspriteTable_SSTidal_3[] = {
{ 16, 12, 1, 1, 56, 2}
};
-const struct SubspriteTable gObjectEventSubspriteTables_SSTidal[] = {
- {15, gObjectEventSubspriteTable_SSTidal_0},
- {15, gObjectEventSubspriteTable_SSTidal_0},
- {15, gObjectEventSubspriteTable_SSTidal_1},
- {15, gObjectEventSubspriteTable_SSTidal_2},
- {15, gObjectEventSubspriteTable_SSTidal_3},
- {15, gObjectEventSubspriteTable_SSTidal_3}
+// Used by SS Tidal
+const struct SubspriteTable gObjectEventSubspriteTables_96x40[] = {
+ {15, gObjectEventSubspriteTable_96x40_0},
+ {15, gObjectEventSubspriteTable_96x40_0},
+ {15, gObjectEventSubspriteTable_96x40_1},
+ {15, gObjectEventSubspriteTable_96x40_2},
+ {15, gObjectEventSubspriteTable_96x40_3},
+ {15, gObjectEventSubspriteTable_96x40_3}
};
-const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_0[] = {
+const struct Subsprite gObjectEventSubspriteTable_88x32_0[] = {
{-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 0, 8, 2},
@@ -277,7 +279,7 @@ const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_0[] = {
{ 32, 4, 0, 0, 43, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_1[] = {
+const struct Subsprite gObjectEventSubspriteTable_88x32_1[] = {
{-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 0, 8, 1},
@@ -296,7 +298,7 @@ const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_1[] = {
{ 32, 4, 0, 0, 43, 1}
};
-const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_2[] = {
+const struct Subsprite gObjectEventSubspriteTable_88x32_2[] = {
{-48, -20, 1, 1, 0, 2},
{-16, -20, 1, 1, 4, 2},
{ 16, -20, 1, 0, 8, 2},
@@ -315,7 +317,7 @@ const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_2[] = {
{ 32, 4, 0, 0, 43, 2}
};
-const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_3[] = {
+const struct Subsprite gObjectEventSubspriteTable_88x32_3[] = {
{-48, -20, 1, 1, 0, 1},
{-16, -20, 1, 1, 4, 1},
{ 16, -20, 1, 0, 8, 1},
@@ -334,12 +336,13 @@ const struct Subsprite gObjectEventSubspriteTable_SubmarineShadow_3[] = {
{ 32, 4, 0, 0, 43, 2}
};
-const struct SubspriteTable gObjectEventSubspriteTables_SubmarineShadow[] = {
- {16, gObjectEventSubspriteTable_SubmarineShadow_0},
- {16, gObjectEventSubspriteTable_SubmarineShadow_0},
- {16, gObjectEventSubspriteTable_SubmarineShadow_1},
- {16, gObjectEventSubspriteTable_SubmarineShadow_2},
- {16, gObjectEventSubspriteTable_SubmarineShadow_3},
- {16, gObjectEventSubspriteTable_SubmarineShadow_3}
+// Used by the submarine shadow
+const struct SubspriteTable gObjectEventSubspriteTables_88x32[] = {
+ {16, gObjectEventSubspriteTable_88x32_0},
+ {16, gObjectEventSubspriteTable_88x32_0},
+ {16, gObjectEventSubspriteTable_88x32_1},
+ {16, gObjectEventSubspriteTable_88x32_2},
+ {16, gObjectEventSubspriteTable_88x32_3},
+ {16, gObjectEventSubspriteTable_88x32_3}
};
#endif //POKERUBY_OBJECT_EVENT_SUBSPRITES_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 04:38:04 +0000