Move base oam to src

4 files changed, 69 insertions, 16 deletions

diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 66abbce07..56b9f07f6 100644
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -21,7 +21,7 @@ const struct SpriteTemplate gUnknown_83A537C =
 {
     .tileTag = 65535,
     .paletteTag = 65535,
-    .oam = &gObjectEventBaseOam_128x64,
+    .oam = &gObjectEventBaseOam_8x8,
     .anims = gUnknown_83A5358,
     .images = gUnknown_83A535C,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -32,7 +32,7 @@ const struct SpriteTemplate gUnknown_83A5394 =
 {
     .tileTag = 65535,
     .paletteTag = 65535,
-    .oam = &gObjectEventBaseOam_Unknown1,
+    .oam = &gObjectEventBaseOam_16x8,
     .anims = gUnknown_83A5358,
     .images = gUnknown_83A5364,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -43,7 +43,7 @@ const struct SpriteTemplate gUnknown_83A53AC =
 {
     .tileTag = 65535,
     .paletteTag = 65535,
-    .oam = &gObjectEventBaseOam_Unknown2,
+    .oam = &gObjectEventBaseOam_32x8,
     .anims = gUnknown_83A5358,
     .images = gUnknown_83A536C,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -54,7 +54,7 @@ const struct SpriteTemplate gUnknown_83A53C4 =
 {
     .tileTag = 65535,
     .paletteTag = 65535,
-    .oam = &gObjectEventBaseOam_Unknown3,
+    .oam = &gObjectEventBaseOam_64x32,
     .anims = gUnknown_83A5358,
     .images = gUnknown_83A5374,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -309,7 +309,7 @@ const struct SpriteTemplate gUnknown_83A5648 =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1004,
-    .oam = &gObjectEventBaseOam_Unknown1,
+    .oam = &gObjectEventBaseOam_16x8,
     .anims = gUnknown_83A5644,
     .images = gUnknown_83A561C,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -342,7 +342,7 @@ const struct SpriteTemplate gUnknown_83A5698 =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1005,
-    .oam = &gObjectEventBaseOam_Unknown1,
+    .oam = &gObjectEventBaseOam_16x8,
     .anims = gUnknown_83A5694,
     .images = gUnknown_83A5660,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -598,7 +598,7 @@ const struct SpriteTemplate gUnknown_83A589C =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1004,
-    .oam = &gObjectEventBaseOam_Unknown1,
+    .oam = &gObjectEventBaseOam_16x8,
     .anims = gUnknown_83A5894,
     .images = gUnknown_83A5854,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -629,7 +629,7 @@ const struct SpriteTemplate gUnknown_83A58E0 =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1004,
-    .oam = &gObjectEventBaseOam_Unknown1,
+    .oam = &gObjectEventBaseOam_16x8,
     .anims = gUnknown_83A58DC,
     .images = gUnknown_83A58B4,
     .affineAnims = gDummySpriteAffineAnimTable,
@@ -844,7 +844,7 @@ const struct SpriteTemplate gUnknown_83A5B1C =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1004,
-    .oam = &gObjectEventBaseOam_Unknown1,
+    .oam = &gObjectEventBaseOam_16x8,
     .anims = gUnknown_83A5B18,
     .images = gUnknown_83A5AF0,
     .affineAnims = gDummySpriteAffineAnimTable,
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};
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 132778538..f44ed28a7 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -330,10 +330,10 @@ extern const struct OamData gObjectEventBaseOam_16x16;
 extern const struct OamData gObjectEventBaseOam_16x32;
 extern const struct OamData gObjectEventBaseOam_32x16;
 extern const struct OamData gObjectEventBaseOam_64x64;
-extern const struct OamData gObjectEventBaseOam_128x64;
-extern const struct OamData gObjectEventBaseOam_Unknown1;
-extern const struct OamData gObjectEventBaseOam_Unknown2;
-extern const struct OamData gObjectEventBaseOam_Unknown3;
+extern const struct OamData gObjectEventBaseOam_8x8;
+extern const struct OamData gObjectEventBaseOam_16x8;
+extern const struct OamData gObjectEventBaseOam_32x8;
+extern const struct OamData gObjectEventBaseOam_64x32;
 extern const u16 gUnknown_836D828[];
 extern const u16 gUnknown_836D848[];
 extern const u16 gUnknown_836D868[];
@@ -717,8 +717,8 @@ extern const union AffineAnimCmd * const gDummySpriteAffineAnimTable[];
 /*#include "data/object_events/object_event_graphics_info_pointers.h"
 #include "data/field_effects/field_effect_object_template_pointers.h"
 #include "data/object_events/object_event_pic_tables.h"
-#include "data/object_events/object_event_anims.h"
-#include "data/object_events/base_oam.h"*/
+#include "data/object_events/object_event_anims.h"*/
+#include "data/object_events/base_oam.h"
 #include "data/object_events/object_event_subsprites.h"
 #include "data/object_events/object_event_graphics_info.h"