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/battle_main.c | |
| parent | 1aa95a1821cd4ebe552a39bbfed067a305071e31 (diff) | |
Cleanup OamData entries
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 19fd01e3c..92f12636d 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -293,35 +293,31 @@ static const u8 sText_ShedinjaJpnName[] = _("ヌケニン"); // Nukenin const struct OamData gOamData_831ACA8 = { .y = 0, - .affineMode = 1, - .objMode = 0, - .mosaic = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, - .matrixNum = 0, .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, - .affineParam = 0 + .affineParam = 0, }; const struct OamData gOamData_831ACB0 = { .y = 0, - .affineMode = 1, - .objMode = 0, - .mosaic = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, - .matrixNum = 0, .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 2, - .affineParam = 0 + .affineParam = 0, }; // Unknown and unused data. Feel free to remove. @@ -5891,3 +5887,5 @@ static void HandleAction_ActionFinished(void) gBattleScripting.multihitMoveEffect = 0; gBattleResources->battleScriptsStack->size = 0; } + + |