diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /src/mirage_tower.c | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'src/mirage_tower.c')
| -rw-r--r-- | src/mirage_tower.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mirage_tower.c b/src/mirage_tower.c index bb9c6e958..bb93bb497 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -1,5 +1,5 @@ #include "global.h" -#include "alloc.h" +#include "malloc.h" #include "bg.h" #include "event_data.h" #include "event_object_movement.h" @@ -139,10 +139,10 @@ static const union AnimCmd gSpriteAnim_8617DEC[] = static const struct OamData gOamData_8617DF4 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, |