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

Fix tabs.

Browse Source
This commit is contained in:
ultima-soul
2019-07-30 17:25:19 -07:00
parent 9a152f8fe6
commit 07015aa7ae
1 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/use_pokeblock.c
+98 -98
View File
@@ -162,119 +162,119 @@ const u32 gUnknown_085DFC0C[] = INCBIN_U32("graphics/interface/85DFC0C.bin");
const u32 gUnknown_085DFCB0[] = const u32 gUnknown_085DFCB0[] =
{ {
MON_DATA_COOL, MON_DATA_COOL,
MON_DATA_TOUGH, MON_DATA_TOUGH,
MON_DATA_SMART, MON_DATA_SMART,
MON_DATA_CUTE, MON_DATA_CUTE,
MON_DATA_BEAUTY MON_DATA_BEAUTY
}; };
const u8 gUnknown_085DFCC4[] = const u8 gUnknown_085DFCC4[] =
{ {
0, // Spicy/Cool 0, // Spicy/Cool
4, // Dry/Beauty 4, // Dry/Beauty
3, // Sweet/Cute 3, // Sweet/Cute
2, // Bitter/Smart 2, // Bitter/Smart
1 // Sour/Tough 1 // Sour/Tough
}; };
const u8 gUnknown_085DFCC9[] = const u8 gUnknown_085DFCC9[] =
{ {
0, 0,
8, 8,
1 1
}; };
const struct BgTemplate gUnknown_085DFCCC[4] = const struct BgTemplate gUnknown_085DFCCC[4] =
{ {
{ {
.bg = 0, .bg = 0,
.charBaseIndex = 2, .charBaseIndex = 2,
.mapBaseIndex = 0x1F, .mapBaseIndex = 0x1F,
.screenSize = 0, .screenSize = 0,
.paletteMode = 0, .paletteMode = 0,
.priority = 0, .priority = 0,
.baseTile = 0 .baseTile = 0
}, },
{ {
.bg = 1, .bg = 1,
.charBaseIndex = 0, .charBaseIndex = 0,
.mapBaseIndex = 0x1E, .mapBaseIndex = 0x1E,
.screenSize = 0, .screenSize = 0,
.paletteMode = 0, .paletteMode = 0,
.priority = 3, .priority = 3,
.baseTile = 0 .baseTile = 0
}, },
{ {
.bg = 3, .bg = 3,
.charBaseIndex = 3, .charBaseIndex = 3,
.mapBaseIndex = 0x1D, .mapBaseIndex = 0x1D,
.screenSize = 0, .screenSize = 0,
.paletteMode = 0, .paletteMode = 0,
.priority = 2, .priority = 2,
.baseTile = 0x100 .baseTile = 0x100
}, },
{ {
.bg = 2, .bg = 2,
.charBaseIndex = 0, .charBaseIndex = 0,
.mapBaseIndex = 0x17, .mapBaseIndex = 0x17,
.screenSize = 0, .screenSize = 0,
.paletteMode = 0, .paletteMode = 0,
.priority = 1, .priority = 1,
.baseTile = 0 .baseTile = 0
} }
}; };
const struct WindowTemplate gUnknown_085DFCDC[] = const struct WindowTemplate gUnknown_085DFCDC[] =
{ {
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 0xD, .tilemapLeft = 0xD,
.tilemapTop = 1, .tilemapTop = 1,
.width = 0xD, .width = 0xD,
.height = 4, .height = 4,
.paletteNum = 0xF, .paletteNum = 0xF,
.baseBlock = 1 .baseBlock = 1
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 0, .tilemapLeft = 0,
.tilemapTop = 0xE, .tilemapTop = 0xE,
.width = 0xB, .width = 0xB,
.height = 2, .height = 2,
.paletteNum = 0xF, .paletteNum = 0xF,
.baseBlock = 0x35 .baseBlock = 0x35
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 1, .tilemapLeft = 1,
.tilemapTop = 0x11, .tilemapTop = 0x11,
.width = 0x1C, .width = 0x1C,
.height = 2, .height = 2,
.paletteNum = 0xF, .paletteNum = 0xF,
.baseBlock = 0x4B .baseBlock = 0x4B
}, },
DUMMY_WIN_TEMPLATE DUMMY_WIN_TEMPLATE
}; };
const struct WindowTemplate sUsePokeblockYesNoWinTemplate = const struct WindowTemplate sUsePokeblockYesNoWinTemplate =
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 0x18, .tilemapLeft = 0x18,
.tilemapTop = 0xB, .tilemapTop = 0xB,
.width = 5, .width = 5,
.height = 4, .height = 4,
.paletteNum = 0xF, .paletteNum = 0xF,
.baseBlock = 0x83 .baseBlock = 0x83
}; };
const u8 *const sContestStatNames[] = const u8 *const sContestStatNames[] =
{ {
gText_Coolness, gText_Coolness,
gText_Toughness, gText_Toughness,
gText_Smartness, gText_Smartness,
gText_Cuteness, gText_Cuteness,
gText_Beauty3 gText_Beauty3
}; };
const struct SpriteSheet gSpriteSheet_ConditionUpDown = const struct SpriteSheet gSpriteSheet_ConditionUpDown =
@@ -284,16 +284,16 @@ const struct SpriteSheet gSpriteSheet_ConditionUpDown =
const struct SpritePalette gSpritePalette_ConditionUpDown = const struct SpritePalette gSpritePalette_ConditionUpDown =
{ {
gUsePokeblockUpDown_Pal, TAG_PAL_CONDITION_UP_DOWN gUsePokeblockUpDown_Pal, TAG_PAL_CONDITION_UP_DOWN
}; };
const s16 gUnknown_085DFD28[][2] = const s16 gUnknown_085DFD28[][2] =
{ {
{0x9C, 0x24}, {0x9C, 0x24},
{0x75, 0x3B}, {0x75, 0x3B},
{0x75, 0x76}, {0x75, 0x76},
{0xC5, 0x76}, {0xC5, 0x76},
{0xC5, 0x3B} {0xC5, 0x3B}
}; };
const struct OamData gOamData_085DFD3C = const struct OamData gOamData_085DFD3C =
@@ -330,7 +330,7 @@ const union AnimCmd *const gSpriteAnimTable_085DFD54[] =
const struct SpriteTemplate gSpriteTemplate_085DFD5C = const struct SpriteTemplate gSpriteTemplate_085DFD5C =
{ {
.tileTag = 0, .tileTag = 0,
.paletteTag = 0, .paletteTag = 0,
.oam = &gOamData_085DFD3C, .oam = &gOamData_085DFD3C,
.anims = gSpriteAnimTable_085DFD54, .anims = gSpriteAnimTable_085DFD54,
@@ -380,7 +380,7 @@ const union AnimCmd *const gSpriteAnimTable_085DFD94[] =
const struct SpriteTemplate gSpriteTemplate_085DFDA0 = const struct SpriteTemplate gSpriteTemplate_085DFDA0 =
{ {
.tileTag = 1, .tileTag = 1,
.paletteTag = 1, .paletteTag = 1,
.oam = &gOamData_085DFD74, .oam = &gOamData_085DFD74,
.anims = gSpriteAnimTable_085DFD94, .anims = gSpriteAnimTable_085DFD94,
@@ -391,7 +391,7 @@ const struct SpriteTemplate gSpriteTemplate_085DFDA0 =
const struct SpritePalette gSpritePalette_085DFDB8 = const struct SpritePalette gSpritePalette_085DFDB8 =
{ {
gUsePokeblockCondition_Pal, TAG_PAL_POKEBLOCK_CONDITION gUsePokeblockCondition_Pal, TAG_PAL_POKEBLOCK_CONDITION
}; };
// code // code