dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use ST_OAM constants for OamData definitions

Browse Source
This commit is contained in:
GriffinR
2019-12-04 15:25:13 -05:00
committed by huderlem
parent 22fd579fd9
commit c40879aa36
52 changed files with 425 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/data/party_menu.h
View File

@@ -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,

6
src/data/trade.h
View File

@@ -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