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

Cleanup OamData entries

Browse Source
This commit is contained in:
Phlosioneer authored and huderlem committed 2019-04-02 07:41:50 -05:00
1 parent 1aa95a1821
commit 201c0953ae
12 files changed
+511 -96
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/field_weather_effect.c
+11 -18
View File
@@ -1513,18 +1513,15 @@ void LoadAshSpriteSheet(void)
const struct OamData gOamData_839ABB8 =
{
.y = 0,
.affineMode = 0,
.objMode = 1,
.mosaic = 0,
.bpp = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 1,
.paletteNum = 15,
.affineParam = 0,
};
const union AnimCmd gSpriteAnim_839ABC0[] =
@@ -1750,18 +1747,15 @@ void CreateFog2Sprites(void)
const struct OamData gOamData_839ABF0 =
{
.y = 0,
.affineMode = 0,
.objMode = 1,
.mosaic = 0,
.bpp = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 2,
.paletteNum = 0,
.affineParam = 0,
};
const union AnimCmd gSpriteAnim_839ABF8[] =
@@ -1949,18 +1943,15 @@ void sub_80800E4(void)
const struct OamData gOamData_839AC1C =
{
.y = 0,
.affineMode = 0,
.objMode = 1,
.mosaic = 0,
.bpp = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_BLEND,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x64),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(64x64),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
const union AnimCmd gSpriteAnim_839AC24[] =
@@ -2470,3 +2461,5 @@ static void UpdateRainCounter(u8 newWeather, u8 oldWeather)
&& (newWeather == WEATHER_RAIN_LIGHT || newWeather == WEATHER_RAIN_MED))
IncrementGameStat(GAME_STAT_GOT_RAINED_ON);
}