From c40879aa3693a18c23be42cce54d52ca7afe1bca Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Dec 2019 15:25:13 -0500 Subject: [PATCH] Use ST_OAM constants for OamData definitions --- src/battle_arena.c | 6 +-- src/battle_bg.c | 12 +++--- src/battle_dome.c | 24 ++++++------ src/battle_factory_screen.c | 48 ++++++++++++------------ src/battle_interface.c | 24 ++++++------ src/battle_pyramid_bag.c | 6 +-- src/battle_script_commands.c | 6 +-- src/battle_transition.c | 6 +-- src/berry_blender.c | 30 +++++++-------- src/contest.c | 12 +++--- src/credits.c | 6 +-- src/data/party_menu.h | 24 ++++++------ src/data/trade.h | 6 +-- src/dodrio_berry_picking.c | 40 ++++++++++---------- src/egg_hatch.c | 12 +++--- src/evolution_graphics.c | 6 +-- src/field_weather_effect.c | 20 +++++----- src/fldeff_cut.c | 6 +-- src/hall_of_fame.c | 6 +-- src/intro.c | 72 ++++++++++++++++++------------------ src/item_icon.c | 6 +-- src/item_menu_icons.c | 30 +++++++-------- src/list_menu.c | 12 +++--- src/menu_helpers.c | 6 +-- src/menu_specialized.c | 20 +++++----- src/mirage_tower.c | 6 +-- src/mon_markings.c | 18 ++++----- src/money.c | 6 +-- src/move_relearner.c | 18 ++++----- src/pokeball.c | 6 +-- src/pokeblock.c | 6 +-- src/pokeblock_feed.c | 6 +-- src/pokedex.c | 36 +++++++++--------- src/pokemon.c | 6 +-- src/pokemon_jump.c | 70 +++++++++++++++++------------------ src/pokemon_storage_system.c | 24 ++++++------ src/pokemon_summary_screen.c | 18 ++++----- src/pokenav_main_menu.c | 2 +- src/pokenav_unk_10.c | 6 +-- src/pokenav_unk_2.c | 12 +++--- src/pokenav_unk_4.c | 12 +++--- src/pokenav_unk_5.c | 6 +-- src/rayquaza_scene.c | 48 ++++++++++++------------ src/reset_rtc_screen.c | 6 +-- src/rotating_gate.c | 4 +- src/save_failed_screen.c | 6 +-- src/starter_choose.c | 18 ++++----- src/title_screen.c | 24 ++++++------ src/trainer_see.c | 6 +-- src/union_room_chat.c | 16 ++++---- src/unk_transition.c | 6 +-- src/use_pokeblock.c | 12 +++--- 52 files changed, 425 insertions(+), 425 deletions(-) diff --git a/src/battle_arena.c b/src/battle_arena.c index 7202cf7b5..67f0cc90e 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -404,10 +404,10 @@ static const s8 sMindRatings[] = static const struct OamData sJudgementIconOamData = { .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, diff --git a/src/battle_bg.c b/src/battle_bg.c index 567625a99..01d05e68d 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -39,10 +39,10 @@ static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData? static const struct OamData sVsLetter_V_OamData = { .y = 0, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -56,10 +56,10 @@ static const struct OamData sVsLetter_V_OamData = static const struct OamData sVsLetter_S_OamData = { .y = 0, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, diff --git a/src/battle_dome.c b/src/battle_dome.c index eca6eb466..7ff83f328 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -860,10 +860,10 @@ static const struct CompressedSpritePalette gUnknown_0860CF60[] = static const struct OamData gUnknown_0860CF70 = { .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, @@ -877,10 +877,10 @@ static const struct OamData gUnknown_0860CF70 = static const struct OamData gUnknown_0860CF78 = { .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(32x16), .x = 0, .matrixNum = 0, @@ -894,10 +894,10 @@ static const struct OamData gUnknown_0860CF78 = static const struct OamData gUnknown_0860CF80 = { .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(16x8), .x = 0, .matrixNum = 0, @@ -911,10 +911,10 @@ static const struct OamData gUnknown_0860CF80 = static const struct OamData gUnknown_0860CF88 = { .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(8x16), .x = 0, .matrixNum = 0, diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 36839cde5..8c2f088d4 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -381,10 +381,10 @@ static const u8 gUnknown_08610479[] = {0x00, 0x04, 0x00}; static const struct OamData gUnknown_0861047C = { .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(32x32), .x = 0, .matrixNum = 0, @@ -398,10 +398,10 @@ static const struct OamData gUnknown_0861047C = static const struct OamData gUnknown_08610484 = { .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, @@ -415,10 +415,10 @@ static const struct OamData gUnknown_08610484 = static const struct OamData gUnknown_0861048C = { .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(32x16), .x = 0, .matrixNum = 0, @@ -432,10 +432,10 @@ static const struct OamData gUnknown_0861048C = static const struct OamData gUnknown_08610494 = { .y = 0, - .affineMode = 3, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -632,10 +632,10 @@ static const struct SpritePalette gUnknown_086106B0[] = static const struct OamData gUnknown_086106D8 = { .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 = 0, .x = 0, .matrixNum = 0, @@ -649,10 +649,10 @@ static const struct OamData gUnknown_086106D8 = static const struct OamData gUnknown_086106E0 = { .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 = 0, .x = 0, .matrixNum = 0, @@ -666,10 +666,10 @@ static const struct OamData gUnknown_086106E0 = static const struct OamData gUnknown_086106E8 = { .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 = 1, .x = 0, .matrixNum = 0, @@ -683,10 +683,10 @@ static const struct OamData gUnknown_086106E8 = static const struct OamData gUnknown_086106F0 = { .y = 0, - .affineMode = 3, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = 0, .x = 0, .matrixNum = 0, diff --git a/src/battle_interface.c b/src/battle_interface.c index 8fabfed68..05d34d6c5 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -202,10 +202,10 @@ static void sub_8074F88(struct TestingBar *barInfo, s32 *arg1, u16 *arg2); static const struct OamData sUnknown_0832C138 = { .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(64x32), .x = 0, .matrixNum = 0, @@ -274,10 +274,10 @@ static const struct SpriteTemplate sHealthboxSafariSpriteTemplate = static const struct OamData sOamData_Healthbar = { .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(32x8), .x = 0, .matrixNum = 0, @@ -441,10 +441,10 @@ static const struct SpriteSheet sStatusSummaryBallsSpriteSheet = static const struct OamData sUnknown_0832C354 = { .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(64x32), .x = 0, .matrixNum = 0, @@ -458,10 +458,10 @@ static const struct OamData sUnknown_0832C354 = static const struct OamData sOamData_StatusSummaryBalls = { .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(8x8), .x = 0, .matrixNum = 0, diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c index c904d4e98..040dab122 100644 --- a/src/battle_pyramid_bag.c +++ b/src/battle_pyramid_bag.c @@ -278,10 +278,10 @@ static const struct WindowTemplate gUnknown_0861F350[] = static const struct OamData gOamData_861F378 = { .y = 0, - .affineMode = 1, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index eab7b7d04..c44411f8d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -730,10 +730,10 @@ static const u8 sRubyLevelUpStatBoxStats[] = static const struct OamData sOamData_MonIconOnLvlUpBox = { .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(32x32), .x = 0, .matrixNum = 0, diff --git a/src/battle_transition.c b/src/battle_transition.c index c34419048..bfaaa5f7c 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -760,10 +760,10 @@ static const struct SpriteTemplate gUnknown_085C8E68 = static const struct OamData gOamData_85C8E80 = { .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/berry_blender.c b/src/berry_blender.c index 72f3056d3..2a122541d 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -402,10 +402,10 @@ static const TaskFunc sUnknown_083399EC[] = static const struct OamData sOamData_8216314 = { .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(32x32), .x = 0, .matrixNum = 0, @@ -545,10 +545,10 @@ static const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate = static const struct OamData sOamData_821640C = { .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, @@ -614,10 +614,10 @@ static const struct SpriteTemplate sUnknown_08339B40 = static const struct OamData sOamData_8216474 = { .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(8x8), .x = 0, .matrixNum = 0, @@ -701,10 +701,10 @@ static const struct SpriteTemplate sUnknown_08339BE0 = static const struct OamData sOamData_8216514 = { .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(32x32), .x = 0, .matrixNum = 0, @@ -759,10 +759,10 @@ static const struct SpriteTemplate sUnknown_08339C2C = static const struct OamData sOamData_8216560 = { .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(64x32), .x = 0, .matrixNum = 0, diff --git a/src/contest.c b/src/contest.c index 4830e05d5..2b2007f7c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -270,10 +270,10 @@ static const struct SpriteSheet gUnknown_08587A74 = static const struct OamData gOamData_8587A7C = { .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(8x8), .x = 0, .matrixNum = 0, @@ -355,10 +355,10 @@ static const struct SpritePalette gUnknown_08587B08 = static const struct OamData gOamData_8587B10 = { .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(32x8), .x = 0, .matrixNum = 0, diff --git a/src/credits.c b/src/credits.c index 323146f1e..a76dabd16 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1053,10 +1053,10 @@ static const struct SpritePalette gUnknown_085E702C[] = { static const struct OamData gUnknown_085E703C = { .y = 160, - .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 6af8ee2a6..3c3a3e1ce 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -879,10 +879,10 @@ static const u16 sHeldItemPalette[] = INCBIN_U16("graphics/interface/hold_icons. static const struct OamData sOamData_HeldItem = { .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(8x8), .x = 0, .matrixNum = 0, @@ -935,10 +935,10 @@ static const struct SpriteTemplate sSpriteTemplate_HeldItem = static const struct OamData sOamData_MenuPokeball = { .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(32x32), .x = 0, .matrixNum = 0, @@ -992,10 +992,10 @@ static const struct SpriteTemplate sSpriteTemplate_MenuPokeball = static const struct OamData sOamData_MenuPokeballSmall = { .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, @@ -1073,10 +1073,10 @@ static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall = static const struct OamData sOamData_StatusCondition = { .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(32x8), .x = 0, .matrixNum = 0, diff --git a/src/data/trade.h b/src/data/trade.h index 9e96a54dd..4ed39f6cd 100644 --- a/src/data/trade.h +++ b/src/data/trade.h @@ -633,7 +633,7 @@ static const u32 sTradeTilemap_WirelessSignal[] = INCBIN_U32("graphics/trade/wir static const struct OamData sTradeOamData_16x16 = { - .affineMode = 1, + .affineMode = ST_OAM_AFFINE_NORMAL, .shape = SPRITE_SHAPE(16x16), .size = SPRITE_SIZE(16x16) }; @@ -735,8 +735,8 @@ static const struct SpriteTemplate gSpriteTemplate_8338D28 = static const struct OamData sTradeOamData_32x32 = { - .affineMode = 1, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_BLEND, .shape = SPRITE_SHAPE(32x32), .size = SPRITE_SIZE(32x32), .priority = 1 diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 2e0cfbc7e..e731c73c7 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -3555,14 +3555,14 @@ static const u32 gDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/ static const struct OamData sOamData_82FB1E0 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -3572,14 +3572,14 @@ static const struct OamData sOamData_82FB1E0 = static const struct OamData sOamData_82FB1E8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -3589,14 +3589,14 @@ static const struct OamData sOamData_82FB1E8 = static const struct OamData sOamData_82FB1F0 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -3606,14 +3606,14 @@ static const struct OamData sOamData_82FB1F0 = static const struct OamData sOamData_82FB1F8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 1, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 3, .paletteNum = 0, diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 9e9d1c2c5..2ce2c04bb 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -83,10 +83,10 @@ static const u8 sEggShardTiles[] = INCBIN_U8("graphics/misc/egg_shard.4bpp"); static const struct OamData sOamData_EggHatch = { .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(32x32), .x = 0, .matrixNum = 0, @@ -163,10 +163,10 @@ static const struct SpriteTemplate sSpriteTemplate_EggHatch = static const struct OamData sOamData_EggShard = { .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(8x8), .x = 0, .matrixNum = 0, diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 816929f8b..b63f28754 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -50,10 +50,10 @@ static const struct SpritePalette sEvoSparkleSpritePals[] = static const struct OamData sOamData_EvoSparkle = { .y = 160, - .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(8x8), .x = 0, .matrixNum = 0, diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c index 70b9ad1e5..711b76633 100644 --- a/src/field_weather_effect.c +++ b/src/field_weather_effect.c @@ -57,10 +57,10 @@ static const struct SpriteSheet sCloudSpriteSheet = static const struct OamData sCloudSpriteOamData = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -392,10 +392,10 @@ static const struct Coords16 sRainSpriteCoords[] = static const struct OamData sRainSpriteOamData = { .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(16x32), .x = 0, .matrixNum = 0, @@ -839,10 +839,10 @@ static bool8 UpdateVisibleSnowflakeSprites(void) static const struct OamData sSnowflakeSpriteOamData = { .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(8x8), .x = 0, .matrixNum = 0, @@ -1244,10 +1244,10 @@ static const u16 unusedData_839AB1C[] = {0, 6, 6, 12, 18, 42, 300, 300}; static const struct OamData gOamData_839AB2C = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = 1, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index fe21ff060..a0160344e 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -92,10 +92,10 @@ static const struct HyperCutterUnk sHyperCutStruct[] = static const struct OamData sOamData_CutGrass = { .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(8x8), .x = 0, .matrixNum = 0, diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index d138abbb1..a580f3f02 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -174,10 +174,10 @@ static const s16 sHallOfFame_MonHalfTeamPositions[3][4] = static const struct OamData sOamData_85E53FC = { .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(8x8), .x = 0, .matrixNum = 0, diff --git a/src/intro.c b/src/intro.c index 58f2509cc..904f6d67c 100644 --- a/src/intro.c +++ b/src/intro.c @@ -141,10 +141,10 @@ static const struct SpritePalette gIntroPalette_Lightning[] = static const struct OamData gUnknown_085E4A94 = { .y = 160, - .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, @@ -210,10 +210,10 @@ static const struct SpritePalette gIntroPokemonRunningPalette[] = static const struct OamData gUnknown_085E4B28 = { .y = 160, - .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(32x32), .x = 0, .matrixNum = 0, @@ -247,10 +247,10 @@ static const struct SpriteTemplate gUnknown_085E4B40 = static const struct OamData gUnknown_085E4B58 = { .y = 160, - .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(32x32), .x = 0, .matrixNum = 0, @@ -303,10 +303,10 @@ static const struct SpriteTemplate gUnknown_085E4BA4 = static const struct OamData gUnknown_085E4BBC = { .y = 160, - .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(64x64), .x = 0, .matrixNum = 0, @@ -352,10 +352,10 @@ static const struct SpritePalette gIntroRayquazaLightningPalette[] = static const struct OamData gUnknown_085E4C14 = { .y = 160, - .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(32x32), .x = 0, .matrixNum = 0, @@ -437,10 +437,10 @@ static const s16 gIntroKyogreBubbleData[][3] = static const struct OamData gUnknown_085E4CF0 = { .y = 160, - .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(16x32), .x = 0, .matrixNum = 0, @@ -477,10 +477,10 @@ static const struct SpriteTemplate gUnknown_085E4D14 = static const struct OamData gUnknown_085E4D2C = { .y = 160, - .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(32x32), .x = 0, .matrixNum = 0, @@ -568,10 +568,10 @@ static const union AnimCmd *const gIntroBicycleAnimationCommands[] = static const struct OamData gUnknown_085E4DD4 = { .y = 160, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, @@ -584,10 +584,10 @@ static const struct OamData gUnknown_085E4DD4 = static const struct OamData gUnknown_085E4DDC = { .y = 160, - .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(8x8), .x = 0, .matrixNum = 0, @@ -600,10 +600,10 @@ static const struct OamData gUnknown_085E4DDC = static const struct OamData gUnknown_085E4DE4 = { .y = 160, - .affineMode = 3, - .objMode = 1, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_BLEND, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x64), .x = 0, .matrixNum = 0, @@ -800,10 +800,10 @@ static const u8 gUnknown_085E4FA4[] = static const struct OamData gUnknown_085E4FB0 = { .y = 160, - .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(64x32), .x = 0, .matrixNum = 0, @@ -853,10 +853,10 @@ static const struct SpritePalette gIntroPalette_DropLogoFlygon[] = static const struct OamData gUnknown_085E501C = { .y = 160, - .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/item_icon.c b/src/item_icon.c index 6ae7eac58..487b89b71 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -16,10 +16,10 @@ EWRAM_DATA void *gItemIcon4x4Buffer = NULL; static const struct OamData sOamData_ItemIcon = { .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(32x32), .x = 0, .matrixNum = 0, diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 780a50160..8c22d2481 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -32,10 +32,10 @@ static const u16 gCherryUnused_Pal[] = INCBIN_U16("graphics/unused/cherry.gbapal static const struct OamData sBagOamData = { .y = 0, - .affineMode = 1, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -142,10 +142,10 @@ static const struct SpriteTemplate gBagSpriteTemplate = static const struct OamData sRotatingBallOamData = { .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 = 4, @@ -213,10 +213,10 @@ static const struct SpriteTemplate gRotatingBallSpriteTemplate = static const struct OamData sBerryPicOamData = { .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(64x64), .x = 0, .matrixNum = 0, @@ -230,10 +230,10 @@ static const struct OamData sBerryPicOamData = static const struct OamData sBerryPicRotatingOamData = { .y = 0, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, @@ -370,10 +370,10 @@ const struct CompressedSpritePalette gBerryCheckCirclePaletteTable = static const struct OamData sBerryCheckCircleOamData = { .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/list_menu.c b/src/list_menu.c index 797aff5f8..ddcad0fe9 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -125,10 +125,10 @@ static const struct static const struct OamData sOamData_ScrollArrowIndicator = { .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, @@ -265,10 +265,10 @@ static const struct Subsprite sSubsprite_RedOutline8 = static const struct OamData sOamData_RedArrowCursor = { .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, diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 2b7a7f419..5b68828c8 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -33,10 +33,10 @@ static TaskFunc gUnknown_0300117C; static const struct OamData sOamData_859F4E8 = { .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, diff --git a/src/menu_specialized.c b/src/menu_specialized.c index 75317e3ff..c0f7c510d 100644 --- a/src/menu_specialized.c +++ b/src/menu_specialized.c @@ -1104,14 +1104,14 @@ static const u32 gUnknown_086256A0[] = INCBIN_U32("graphics/pokenav/sparkle.4bpp static const struct OamData sOamData_8625A20 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -1121,14 +1121,14 @@ static const struct OamData sOamData_8625A20 = static const struct OamData sOamData_8625A28 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 2, .paletteNum = 0, diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 0c2b8ce74..bb93bb497 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -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, diff --git a/src/mon_markings.c b/src/mon_markings.c index f4d6b3818..d73cbf318 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -26,10 +26,10 @@ static const u8 gUnknown_0859E67C[] = INCBIN_U8("graphics/misc/mon_markings.4bpp static const struct OamData gUnknown_0859EE7C = { .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(64x64), .x = 0, .matrixNum = 0, @@ -43,10 +43,10 @@ static const struct OamData gUnknown_0859EE7C = static const struct OamData gUnknown_0859EE84 = { .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(8x8), .x = 0, .matrixNum = 0, @@ -152,10 +152,10 @@ static const union AnimCmd *const gUnknown_0859EF14[] = static const struct OamData gUnknown_0859EF1C = { .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(32x8), .x = 0, .matrixNum = 0, diff --git a/src/money.c b/src/money.c index 7b95a75ab..6213f2dd0 100644 --- a/src/money.c +++ b/src/money.c @@ -20,10 +20,10 @@ EWRAM_DATA static u8 sMoneyLabelSpriteId = 0; static const struct OamData sOamData_MoneyLabel = { .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(32x16), .x = 0, .matrixNum = 0, diff --git a/src/move_relearner.c b/src/move_relearner.c index b5202e006..6d9b5865b 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -183,14 +183,14 @@ static const u8 sMoveRelearnerSpriteSheetData[] = INCBIN_U8("graphics/interface/ static const struct OamData sHeartSpriteOamData = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_SQUARE, + .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x8), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -200,14 +200,14 @@ static const struct OamData sHeartSpriteOamData = static const struct OamData sUnusedOam1 = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_V_RECTANGLE, + .shape = SPRITE_SHAPE(8x16), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(8x16), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -217,14 +217,14 @@ static const struct OamData sUnusedOam1 = static const struct OamData sUnusedOam2 = { .y = 0, - .affineMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, - .shape = ST_OAM_H_RECTANGLE, + .shape = SPRITE_SHAPE(16x8), .x = 0, .matrixNum = 0, - .size = 0, + .size = SPRITE_SIZE(16x8), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/pokeball.c b/src/pokeball.c index f10bbd49c..d473f9ba0 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -95,10 +95,10 @@ const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = static const struct OamData sBallOamData = { .y = 0, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, diff --git a/src/pokeblock.c b/src/pokeblock.c index 4c744b537..5e7651650 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -219,10 +219,10 @@ static const u8 sContestStatsMonData[] = {MON_DATA_COOL, MON_DATA_BEAUTY, MON_DA static const struct OamData sOamData_PokeblockCase = { .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index 2c0b68dc6..4cb1c7a3e 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -459,10 +459,10 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F066C[] = static const struct OamData sThrownPokeblockOamData = { .y = 0, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(8x8), .x = 0, .matrixNum = 0, diff --git a/src/pokedex.c b/src/pokedex.c index 2aa5e30ea..1821b6007 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -244,10 +244,10 @@ void sub_80C267C(void); static const struct OamData sOamData_855CFE4 = { .y = 160, - .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(8x8), .x = 0, .matrixNum = 0, @@ -261,10 +261,10 @@ static const struct OamData sOamData_855CFE4 = static const struct OamData sOamData_855CFEC = { .y = 160, - .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(16x8), .x = 0, .matrixNum = 0, @@ -278,10 +278,10 @@ static const struct OamData sOamData_855CFEC = static const struct OamData sOamData_855CFF4 = { .y = 160, - .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(32x16), .x = 0, .matrixNum = 0, @@ -295,10 +295,10 @@ static const struct OamData sOamData_855CFF4 = static const struct OamData sOamData_855CFFC = { .y = 160, - .affineMode = 0, - .objMode = 2, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_WINDOW, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, @@ -312,10 +312,10 @@ static const struct OamData sOamData_855CFFC = static const struct OamData sOamData_855D004 = { .y = 160, - .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(64x32), .x = 0, .matrixNum = 0, @@ -329,10 +329,10 @@ static const struct OamData sOamData_855D004 = static const struct OamData sOamData_855D00C = { .y = 160, - .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(8x16), .x = 0, .matrixNum = 0, diff --git a/src/pokemon.c b/src/pokemon.c index 2b9483c53..12820aa76 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2083,10 +2083,10 @@ static const struct SpeciesItem sAlteringCaveWildMonHeldItems[] = static const struct OamData sOamData_8329F20 = { .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index ccf64b8a2..25968d974 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -2294,14 +2294,14 @@ static const struct SpriteTemplate *const gUnknown_082FBEB8[] = static const struct OamData sOamData_82FBEC8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x64), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -2311,14 +2311,14 @@ static const struct OamData sOamData_82FBEC8 = static const struct OamData sOamData_82FBED0 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 2, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(16x32), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -2328,14 +2328,14 @@ static const struct OamData sOamData_82FBED0 = static const struct OamData sOamData_82FBED8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -2345,14 +2345,14 @@ static const struct OamData sOamData_82FBED8 = static const struct OamData sOamData_82FBEE0 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 1, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x16), .tileNum = 0, .priority = 2, .paletteNum = 0, @@ -2498,14 +2498,14 @@ static const struct SpriteTemplate gUnknown_082FBFC0 = static const struct OamData sOamData_82FBFD8 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), .x = 0, .matrixNum = 0, - .size = 1, + .size = SPRITE_SIZE(16x16), .tileNum = 0, .priority = 1, .paletteNum = 0, @@ -4483,14 +4483,14 @@ static void sub_802EF50(u16 tileTag, u16 palTag) static const struct OamData sOamData_82FEBDC = { .y = 0, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 0, .paletteNum = 0, @@ -4500,14 +4500,14 @@ static const struct OamData sOamData_82FEBDC = static const struct OamData sOamData_82FEBE4 = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, - .shape = 1, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, - .size = 3, + .size = SPRITE_SIZE(64x32), .tileNum = 0, .priority = 0, .paletteNum = 0, diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 69a0161e1..df9bf0cf7 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -963,10 +963,10 @@ static const struct WindowTemplate sYesNoWindowTemplate = static const struct OamData sOamData_857286C = { .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(64x64), .x = 0, .matrixNum = 0, @@ -980,10 +980,10 @@ static const struct OamData sOamData_857286C = static const struct OamData sOamData_8572874 = { .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(16x8), .x = 0, .matrixNum = 0, @@ -1056,10 +1056,10 @@ static const struct SpriteTemplate gUnknown_085728D4 = static const struct OamData sOamData_85728EC = { .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(32x32), .x = 0, .matrixNum = 0, @@ -9358,10 +9358,10 @@ static const u32 gUnknown_0857BB24[] = INCBIN_U32("graphics/pokemon_storage/unkn static const struct OamData sOamData_857BBA4 = { .y = 0, - .affineMode = 1, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 41c48d008..32469bb4b 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -706,10 +706,10 @@ static const u8 sMovesPPLayout[] = _("{PP}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}"); static const struct OamData sOamData_MoveTypes = { .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(32x16), .x = 0, .matrixNum = 0, @@ -882,10 +882,10 @@ static const u8 sMoveTypeToOamPaletteNum[NUMBER_OF_MON_TYPES + CONTEST_CATEGORIE static const struct OamData gOamData_861CFF4 = { .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, @@ -971,10 +971,10 @@ static const struct SpriteTemplate gUnknown_0861D084 = static const struct OamData sOamData_StatusCondition = { .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(32x8), .x = 0, .matrixNum = 0, diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 4422a70e3..accc5a2bf 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -288,7 +288,7 @@ static const struct OamData sUnknown_0861FB24 = .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x16), .x = 0, .matrixNum = 0, diff --git a/src/pokenav_unk_10.c b/src/pokenav_unk_10.c index 135ff24b3..a98938a60 100644 --- a/src/pokenav_unk_10.c +++ b/src/pokenav_unk_10.c @@ -1057,10 +1057,10 @@ static const struct SpritePalette gUnknown_08624C80[] = static const struct OamData sOamData_8624CB0 = { .y = 0, - .affineMode = 1, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c index cb9467a9c..2a8a083ff 100644 --- a/src/pokenav_unk_2.c +++ b/src/pokenav_unk_2.c @@ -243,9 +243,9 @@ static const u8 gUnknown_0862030F[] = {6, 8, 7, 0, 0}; static const struct OamData gUnknown_08620314 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x16), .x = 0, .size = SPRITE_SIZE(32x16), @@ -287,9 +287,9 @@ static const struct SpriteTemplate gUnknown_0862034C = static const struct OamData gUnknown_08620364 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x16), .x = 0, .size = SPRITE_SIZE(32x16), diff --git a/src/pokenav_unk_4.c b/src/pokenav_unk_4.c index 0f05c6f5d..b8d9a51e7 100755 --- a/src/pokenav_unk_4.c +++ b/src/pokenav_unk_4.c @@ -231,9 +231,9 @@ const struct SpritePalette gUnknown_08622818[] = const struct OamData gUnknown_08622828 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(8x16), .x = 0, .size = SPRITE_SIZE(8x16), @@ -256,9 +256,9 @@ const struct SpriteTemplate gUnknown_08622830 = const struct OamData gUnknown_08622848 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .size = SPRITE_SIZE(64x64), diff --git a/src/pokenav_unk_5.c b/src/pokenav_unk_5.c index 03ac05d4d..a42d08e15 100755 --- a/src/pokenav_unk_5.c +++ b/src/pokenav_unk_5.c @@ -144,9 +144,9 @@ const struct WindowTemplate gUnknown_08623110 = const struct OamData gUnknown_086231C8 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x8), .x = 0, .size = SPRITE_SIZE(32x8), diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 4e5e492f2..1e2d69796 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -101,10 +101,10 @@ static const TaskFunc sTasksForAnimations[] = static const struct OamData sOamData_862A6BC = { .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(64x64), .x = 0, .matrixNum = 0, @@ -118,10 +118,10 @@ static const struct OamData sOamData_862A6BC = static const struct OamData sOamData_862A6C4 = { .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(32x32), .x = 0, .matrixNum = 0, @@ -135,10 +135,10 @@ static const struct OamData sOamData_862A6C4 = static const struct OamData sOamData_862A6CC = { .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(64x32), .x = 0, .matrixNum = 0, @@ -152,10 +152,10 @@ static const struct OamData sOamData_862A6CC = static const struct OamData sOamData_862A6D4 = { .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(32x16), .x = 0, .matrixNum = 0, @@ -169,10 +169,10 @@ static const struct OamData sOamData_862A6D4 = static const struct OamData sOamData_862A6DC = { .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(16x8), .x = 0, .matrixNum = 0, @@ -186,10 +186,10 @@ static const struct OamData sOamData_862A6DC = static const struct OamData sOamData_862A6E4 = { .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(16x32), .x = 0, .matrixNum = 0, @@ -203,10 +203,10 @@ static const struct OamData sOamData_862A6E4 = static const struct OamData sOamData_862A6EC = { .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, @@ -220,10 +220,10 @@ static const struct OamData sOamData_862A6EC = static const struct OamData sOamData_862A6F4 = { .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(32x8), .x = 0, .matrixNum = 0, diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c index 2bbf7d782..8c4843ab5 100644 --- a/src/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c @@ -105,10 +105,10 @@ static const struct ResetRtcStruct sUnknown_08510428[5] = static const struct OamData sOamData_08510464 = { .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(8x8), .x = 0, .matrixNum = 0, diff --git a/src/rotating_gate.c b/src/rotating_gate.c index 44d291dc4..340fc58dd 100644 --- a/src/rotating_gate.c +++ b/src/rotating_gate.c @@ -233,7 +233,7 @@ static const struct OamData sOamData_RotatingGateLarge = { .y = 0, .affineMode = ST_OAM_AFFINE_NORMAL, - .objMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), @@ -250,7 +250,7 @@ static const struct OamData sOamData_RotatingGateRegular = { .y = 0, .affineMode = ST_OAM_AFFINE_NORMAL, - .objMode = 0, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 6d45370b8..a2a2acc8d 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -48,10 +48,10 @@ EWRAM_DATA u8 gSaveFailedUnused2[4] = {0}; static const struct OamData sClockOamData = { .y = 160, - .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, diff --git a/src/starter_choose.c b/src/starter_choose.c index 5524d407b..7f390372e 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -167,10 +167,10 @@ static const u8 gUnknown_085B1E0C[] = {0x00, 0x01, 0x03}; static const struct OamData gOamData_85B1E10 = { .y = 160, - .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(32x32), .x = 0, .matrixNum = 0, @@ -184,10 +184,10 @@ static const struct OamData gOamData_85B1E10 = static const struct OamData gOamData_85B1E18 = { .y = 160, - .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(32x32), .x = 0, .matrixNum = 0, @@ -201,10 +201,10 @@ static const struct OamData gOamData_85B1E18 = static const struct OamData gOamData_85B1E20 = { .y = 160, - .affineMode = 3, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_DOUBLE, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, .matrixNum = 0, diff --git a/src/title_screen.c b/src/title_screen.c index 8310ef811..f95d7685e 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -102,10 +102,10 @@ const u16 gIntroWaterDropAlphaBlend[] = static const struct OamData sVersionBannerLeftOamData = { .y = 160, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 1, + .bpp = ST_OAM_8BPP, .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, @@ -119,10 +119,10 @@ static const struct OamData sVersionBannerLeftOamData = static const struct OamData sVersionBannerRightOamData = { .y = 160, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 1, + .bpp = ST_OAM_8BPP, .shape = SPRITE_SHAPE(64x32), .x = 0, .matrixNum = 0, @@ -190,10 +190,10 @@ static const struct CompressedSpriteSheet sSpriteSheet_EmeraldVersion[] = static const struct OamData sOamData_CopyrightBanner = { .y = 160, - .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(32x8), .x = 0, .matrixNum = 0, @@ -302,10 +302,10 @@ static const struct SpritePalette sSpritePalette_PressStart[] = static const struct OamData sPokemonLogoShineOamData = { .y = 160, - .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/trainer_see.c b/src/trainer_see.c index 72e903728..5e843164d 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -97,10 +97,10 @@ static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struc static const struct OamData sOamData_Icons = { .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, diff --git a/src/union_room_chat.c b/src/union_room_chat.c index f8ea1b781..be2269522 100755 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -461,8 +461,8 @@ const struct SpritePalette gUnknown_082F315C = { }; const struct OamData gUnknown_082F3164 = { - .shape = ST_OAM_H_RECTANGLE, - .size = 3, + .shape = SPRITE_SHAPE(64x32), + .size = SPRITE_SIZE(64x32), .priority = 1 }; @@ -504,8 +504,8 @@ const struct SpriteTemplate gUnknown_082F319C = { }; const struct OamData gUnknown_082F31B4 = { - .shape = ST_OAM_V_RECTANGLE, - .size = 0, + .shape = SPRITE_SHAPE(8x16), + .size = SPRITE_SIZE(8x16), .priority = 2 }; @@ -530,14 +530,14 @@ const struct SpriteTemplate gUnknown_082F31D4 = { }; const struct OamData gUnknown_082F31EC = { - .shape = ST_OAM_SQUARE, - .size = 1, + .shape = SPRITE_SHAPE(16x16), + .size = SPRITE_SIZE(16x16), .priority = 2 }; const struct OamData gUnknown_082F31F4 = { - .shape = ST_OAM_H_RECTANGLE, - .size = 2, + .shape = SPRITE_SHAPE(32x16), + .size = SPRITE_SIZE(32x16), .priority = 2 }; diff --git a/src/unk_transition.c b/src/unk_transition.c index cd91af07e..09e194be3 100644 --- a/src/unk_transition.c +++ b/src/unk_transition.c @@ -47,10 +47,10 @@ static const u8 sFiller[0x1C0] = {0}; static const struct OamData sOamData_862B71C = { .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(64x64), .x = 0, .matrixNum = 0, diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 4d7605c50..794c2989c 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -299,9 +299,9 @@ const s16 gUnknown_085DFD28[][2] = const struct OamData gOamData_085DFD3C = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x16), .x = 0, .size = SPRITE_SIZE(32x16), @@ -342,9 +342,9 @@ const struct SpriteTemplate gSpriteTemplate_085DFD5C = const struct OamData gOamData_085DFD74 = { .y = 0, - .affineMode = 0, - .objMode = 0, - .bpp = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x32), .x = 0, .size = SPRITE_SIZE(64x32),