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

Merge branch 'master' into doc-matchcall

Browse Source
This commit is contained in:
GriffinR
2019-12-10 20:43:27 -05:00
committed by GitHub
parent 77bf40d32b 49f1a90534
commit 47b0d8a597
299 changed files with 7336 additions and 5366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokenav_unk_4.c
+6 -6
View File
@@ -227,9 +227,9 @@ const struct SpritePalette gUnknown_08622818[2] =
static const struct OamData sOptionsCursorOamData =
{
.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),
@@ -252,9 +252,9 @@ static const struct SpriteTemplate sOptionsCursorSpriteTemplate =
static const struct OamData sTrainerPicOamData =
{
.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),