summaryrefslogtreecommitdiff
path: root/src/event_object_movement.c
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/event_object_movement.c
parentbadb380861f626f5f02ccb258e40f62d91d1297a (diff)
Move base oam to src
Diffstat (limited to 'src/event_object_movement.c')
-rw-r--r--src/event_object_movement.c12
1 files changed, 6 insertions, 6 deletions
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"