diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-01 18:31:10 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-02 07:41:50 -0500 |
| commit | 201c0953ae4f6c6b65958065f009cbaee3c8f3ee (patch) | |
| tree | 3ead6c3826b100b44953797026678e56c2780843 /src/cable_car.c | |
| parent | 1aa95a1821cd4ebe552a39bbfed067a305071e31 (diff) | |
Cleanup OamData entries
Diffstat (limited to 'src/cable_car.c')
| -rw-r--r--[-rwxr-xr-x] | src/cable_car.c | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/src/cable_car.c b/src/cable_car.c index ab7b5726a..4e6980c4e 100755..100644 --- a/src/cable_car.c +++ b/src/cable_car.c @@ -151,25 +151,46 @@ const struct SpritePalette gUnknown_085CDB74[] = { { } }; -const struct OamData gOamData_85CDB84 = { +const struct OamData gOamData_85CDB84 = +{ + .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), + .x = 0, .size = SPRITE_SIZE(64x64), - .priority = 2 + .tileNum = 0, + .priority = 2, + .paletteNum = 0, }; -const struct OamData gOamData_85CDB8C = { +const struct OamData gOamData_85CDB8C = +{ + .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x8), + .x = 0, .size = SPRITE_SIZE(16x8), - .priority = 2 + .tileNum = 0, + .priority = 2, + .paletteNum = 0, }; -const struct OamData gOamData_85CDB94 = { +const struct OamData gOamData_85CDB94 = +{ + .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x16), + .x = 0, .size = SPRITE_SIZE(16x16), - .priority = 2 + .tileNum = 0, + .priority = 2, + .paletteNum = 0, }; const struct SpriteTemplate gSpriteTemplate_85CDB9C[] = @@ -1007,3 +1028,4 @@ static void sub_81514C8(u8 arg0) sCableCar->unk1C = 0; } + |