summaryrefslogtreecommitdiff
path: root/src/data/object_events
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-03-24 18:16:41 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-03-24 18:16:41 -0400
commitdb504549737d3cc090515f5d2ecf6f4a9eca8a84 (patch)
tree0d2488f388dc19e4b73dc80f9e51737e94dcec83 /src/data/object_events
parentbadb380861f626f5f02ccb258e40f62d91d1297a (diff)
Move base oam to src
Diffstat (limited to 'src/data/object_events')
-rw-r--r--src/data/object_events/base_oam.h53
-rw-r--r--src/data/object_events/object_event_graphics_info.h2
2 files changed, 54 insertions, 1 deletions
diff --git a/src/data/object_events/base_oam.h b/src/data/object_events/base_oam.h
new file mode 100644
index 000000000..94b0b09af
--- /dev/null
+++ b/src/data/object_events/base_oam.h
@@ -0,0 +1,53 @@
+const struct OamData gObjectEventBaseOam_8x8 = {
+ .shape = SPRITE_SHAPE(8x8),
+ .size = SPRITE_SIZE(8x8),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_16x8 = {
+ .shape = SPRITE_SHAPE(16x8),
+ .size = SPRITE_SIZE(16x8),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_16x16 = {
+ .shape = SPRITE_SHAPE(16x16),
+ .size = SPRITE_SIZE(16x16),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_32x16 = {
+ .shape = SPRITE_SHAPE(32x16),
+ .size = SPRITE_SIZE(32x16),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_32x8 = {
+ .shape = SPRITE_SHAPE(32x8),
+ .size = SPRITE_SIZE(32x8),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_64x32 = {
+ .shape = SPRITE_SHAPE(64x32),
+ .size = SPRITE_SIZE(64x32),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_16x32 = {
+ .shape = SPRITE_SHAPE(16x32),
+ .size = SPRITE_SIZE(16x32),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_32x32 = {
+ .shape = SPRITE_SHAPE(32x32),
+ .size = SPRITE_SIZE(32x32),
+ .priority = 2
+};
+
+const struct OamData gObjectEventBaseOam_64x64 = {
+ .shape = SPRITE_SHAPE(64x64),
+ .size = SPRITE_SIZE(64x64),
+ .priority = 2
+};
diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h
index 7428283f7..4a943a107 100644
--- a/src/data/object_events/object_event_graphics_info.h
+++ b/src/data/object_events/object_event_graphics_info.h
@@ -151,4 +151,4 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A50A4 = {0xFFFF,
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A50C8 = {0xFFFF, OBJ_EVENT_PAL_TAG_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gSubspriteTables_83A3748, gAnimTable_83A3368, gSpriteImages_83A2830, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A50EC = {0xFFFF, OBJ_EVENT_PAL_TAG_0, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gSubspriteTables_83A379C, gAnimTable_83A3368, gSpriteImages_83A2908, gDummySpriteAffineAnimTable};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5110 = {0xFFFF, OBJ_EVENT_PAL_TAG_21, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gSubspriteTables_83A38D0, gAnimTable_83A3368, gSpriteImages_83A1CA8, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5134 = {0xFFFF, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_128x64, gSubspriteTables_83A3A50, gAnimTable_83A3368, gSpriteImages_83A1CF0, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A5134 = {0xFFFF, OBJ_EVENT_PAL_TAG_11, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gSubspriteTables_83A3A50, gAnimTable_83A3368, gSpriteImages_83A1CF0, gDummySpriteAffineAnimTable};