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

Use constants for Oam .shape and .size fields

Browse Source 
Also some general formatting fixes for constants.
This commit is contained in:
Phlosioneer
2019-03-11 03:12:15 -04:00
committed by huderlem
parent 291df27dcb
commit 9848f84b9e
61 changed files with 1422 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokedex_cry_screen.c
+18 -9
View File
@@ -54,7 +54,8 @@ const u16 gUnknown_085B8378[] = INCBIN_U16("graphics/pokedex/cry_meter_map.bin")
const u16 gUnknown_085B8418[] = INCBIN_U16("graphics/pokedex/cry_meter.gbapal");
const u8 gUnknown_085B8438[] = INCBIN_U8("graphics/pokedex/cry_meter.4bpp.lz");
const u16 gUnknown_085B8770[][72] = {
const u16 gUnknown_085B8770[][72] =
{
{
0x0000, 0x0004, 0x0008, 0x000C, 0x0010, 0x0014, 0x0018, 0x001C,
0x0400, 0x0404, 0x0408, 0x040C, 0x0410, 0x0414, 0x0418, 0x041C,
@@ -142,7 +143,8 @@ const u16 gUnknown_085B8BF0[] = INCBIN_U16("graphics/pokedex/85B8C10.gbapal");
const u8 gUnknown_085B8C10[] = INCBIN_U8("graphics/pokedex/85B8C10.4bpp");
const u8 gUnknown_085B8C30[] = {0xF0, 0x0F};
const u8 gUnknown_085B8C32[][16] = {
const u8 gUnknown_085B8C32[][16] =
{
{
0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
@@ -152,23 +154,28 @@ const u8 gUnknown_085B8C32[][16] = {
}
};
const union AnimCmd gSpriteAnim_85B8C54[] = {
const union AnimCmd gSpriteAnim_85B8C54[] =
{
ANIMCMD_FRAME(0, 30),
ANIMCMD_END
};
const union AnimCmd *const gSpriteAnimTable_85B8C5C[] = {
const union AnimCmd *const gSpriteAnimTable_85B8C5C[] =
{
gSpriteAnim_85B8C54
};
const struct OamData gOamData_85B8C60 = {
const struct OamData gOamData_85B8C60 =
{
.y = 160,
.affineMode = ST_OAM_AFFINE_NORMAL,
.size = 3,
.shape = SPRITE_SHAPE(64x64),
.size = SPRITE_SIZE(64x64),
.priority = 1
};
const struct SpriteTemplate gUnknown_085B8C68 = {
const struct SpriteTemplate gUnknown_085B8C68 =
{
0x2000,
0x2000,
&gOamData_85B8C60,
@@ -178,12 +185,14 @@ const struct SpriteTemplate gUnknown_085B8C68 = {
sub_814596C
};
const struct SpriteSheet gCryMeterNeedleSpriteSheets[] = {
const struct SpriteSheet gCryMeterNeedleSpriteSheets[] =
{
{CryMeterNeedleTiles, 0x800, 0x2000},
{}
};
const struct SpritePalette gCryMeterNeedleSpritePalettes[] = {
const struct SpritePalette gCryMeterNeedleSpritePalettes[] =
{
{CryMeterNeedlePalette, 0x2000},
{}
};