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

Merge pull request #1033 from DizzyEggg/patch-1

Browse Source 
Give a define for all dex interface sprites
This commit is contained in:
Sierra A
2020-05-03 02:23:40 -07:00
committed by GitHub
parent cb5b8da77b a35ce6ecdf
commit 0009692395
1 changed files with 154 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokedex.c
+22 -20
View File
@@ -666,10 +666,12 @@ static const union AnimCmd *const sSpriteAnimTable_DexListStartMenuCursor[] =
sSpriteAnim_DexListStartMenuCursor sSpriteAnim_DexListStartMenuCursor
}; };
#define TAG_DEX_INTERFACE 4096 // Tile and pal tag used for all interface sprites.
static const struct SpriteTemplate sScrollBarSpriteTemplate = static const struct SpriteTemplate sScrollBarSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_ScrollBar, .oam = &sOamData_ScrollBar,
.anims = sSpriteAnimTable_ScrollBar, .anims = sSpriteAnimTable_ScrollBar,
.images = NULL, .images = NULL,
@@ -679,8 +681,8 @@ static const struct SpriteTemplate sScrollBarSpriteTemplate =
static const struct SpriteTemplate sScrollArrowSpriteTemplate = static const struct SpriteTemplate sScrollArrowSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_ScrollArrow, .oam = &sOamData_ScrollArrow,
.anims = sSpriteAnimTable_ScrollArrow, .anims = sSpriteAnimTable_ScrollArrow,
.images = NULL, .images = NULL,
@@ -690,8 +692,8 @@ static const struct SpriteTemplate sScrollArrowSpriteTemplate =
static const struct SpriteTemplate sInterfaceTextSpriteTemplate = static const struct SpriteTemplate sInterfaceTextSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_InterfaceText, .oam = &sOamData_InterfaceText,
.anims = sSpriteAnimTable_InterfaceText, .anims = sSpriteAnimTable_InterfaceText,
.images = NULL, .images = NULL,
@@ -701,8 +703,8 @@ static const struct SpriteTemplate sInterfaceTextSpriteTemplate =
static const struct SpriteTemplate sRotatingPokeBallSpriteTemplate = static const struct SpriteTemplate sRotatingPokeBallSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_RotatingPokeBall, .oam = &sOamData_RotatingPokeBall,
.anims = sSpriteAnimTable_RotatingPokeBall, .anims = sSpriteAnimTable_RotatingPokeBall,
.images = NULL, .images = NULL,
@@ -712,8 +714,8 @@ static const struct SpriteTemplate sRotatingPokeBallSpriteTemplate =
static const struct SpriteTemplate sSeenOwnTextSpriteTemplate = static const struct SpriteTemplate sSeenOwnTextSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_SeenOwnText, .oam = &sOamData_SeenOwnText,
.anims = sSpriteAnimTable_SeenOwnText, .anims = sSpriteAnimTable_SeenOwnText,
.images = NULL, .images = NULL,
@@ -723,8 +725,8 @@ static const struct SpriteTemplate sSeenOwnTextSpriteTemplate =
static const struct SpriteTemplate sHoennNationalTextSpriteTemplate = static const struct SpriteTemplate sHoennNationalTextSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_InterfaceText, .oam = &sOamData_InterfaceText,
.anims = sSpriteAnimTable_HoennNationalText, .anims = sSpriteAnimTable_HoennNationalText,
.images = NULL, .images = NULL,
@@ -734,8 +736,8 @@ static const struct SpriteTemplate sHoennNationalTextSpriteTemplate =
static const struct SpriteTemplate sHoennDexSeenOwnNumberSpriteTemplate = static const struct SpriteTemplate sHoennDexSeenOwnNumberSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_Dex8x16, .oam = &sOamData_Dex8x16,
.anims = sSpriteAnimTable_HoennSeenOwnNumber, .anims = sSpriteAnimTable_HoennSeenOwnNumber,
.images = NULL, .images = NULL,
@@ -745,8 +747,8 @@ static const struct SpriteTemplate sHoennDexSeenOwnNumberSpriteTemplate =
static const struct SpriteTemplate sNationalDexSeenOwnNumberSpriteTemplate = static const struct SpriteTemplate sNationalDexSeenOwnNumberSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_Dex8x16, .oam = &sOamData_Dex8x16,
.anims = sSpriteAnimTable_NationalSeenOwnNumber, .anims = sSpriteAnimTable_NationalSeenOwnNumber,
.images = NULL, .images = NULL,
@@ -756,8 +758,8 @@ static const struct SpriteTemplate sNationalDexSeenOwnNumberSpriteTemplate =
static const struct SpriteTemplate sDexListStartMenuCursorSpriteTemplate = static const struct SpriteTemplate sDexListStartMenuCursorSpriteTemplate =
{ {
.tileTag = 4096, .tileTag = TAG_DEX_INTERFACE,
.paletteTag = 4096, .paletteTag = TAG_DEX_INTERFACE,
.oam = &sOamData_Dex8x16, .oam = &sOamData_Dex8x16,
.anims = sSpriteAnimTable_DexListStartMenuCursor, .anims = sSpriteAnimTable_DexListStartMenuCursor,
.images = NULL, .images = NULL,
@@ -767,13 +769,13 @@ static const struct SpriteTemplate sDexListStartMenuCursorSpriteTemplate =
static const struct CompressedSpriteSheet sInterfaceSpriteSheet[] = static const struct CompressedSpriteSheet sInterfaceSpriteSheet[] =
{ {
{gPokedexInterface_Gfx, 0x2000, 4096}, {gPokedexInterface_Gfx, 0x2000, TAG_DEX_INTERFACE},
{0} {0}
}; };
static const struct SpritePalette sInterfaceSpritePalette[] = static const struct SpritePalette sInterfaceSpritePalette[] =
{ {
{gPokedexBgHoenn_Pal, 4096}, {gPokedexBgHoenn_Pal, TAG_DEX_INTERFACE},
{0} {0}
}; };