struct ScrollArrowsTemplate
This commit is contained in:
+13
-14
@@ -7,25 +7,24 @@
|
||||
|
||||
// Exported RAM declarations
|
||||
|
||||
struct ScrollIndicatorArrowPairTemplate
|
||||
struct ScrollArrowsTemplate
|
||||
{
|
||||
u8 unk_00;
|
||||
u8 unk_01;
|
||||
u8 unk_02;
|
||||
u8 unk_03;
|
||||
u8 unk_04;
|
||||
u8 unk_05;
|
||||
u16 unk_06;
|
||||
u16 unk_08;
|
||||
u16 unk_0a;
|
||||
u16 unk_0c;
|
||||
u16 unk_0e_0:4;
|
||||
u16 unk_0e_4:12;
|
||||
u8 firstArrowType;
|
||||
u8 firstX;
|
||||
u8 firstY;
|
||||
u8 secondArrowType;
|
||||
u8 secondX;
|
||||
u8 secondY;
|
||||
u16 fullyUpThreshold;
|
||||
u16 fullyDownThreshold;
|
||||
u16 tileTag;
|
||||
u16 palTag;
|
||||
u8 palNum;
|
||||
};
|
||||
|
||||
// Exported ROM declarations
|
||||
u8 AddScrollIndicatorArrowPairParameterized(u8, u8, u8, u8, s32, u16, u16, u16 *);
|
||||
u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
|
||||
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
|
||||
void RemoveScrollIndicatorArrowPair(u8);
|
||||
|
||||
#endif //GUARD_MENU_INDICATORS_H
|
||||
|
||||
+3
-4
@@ -1400,7 +1400,7 @@ static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId)
|
||||
|
||||
static void FC_CreateScrollIndicatorArrowPair(void)
|
||||
{
|
||||
struct ScrollIndicatorArrowPairTemplate template = {
|
||||
struct ScrollArrowsTemplate template = {
|
||||
2,
|
||||
40,
|
||||
26,
|
||||
@@ -1412,13 +1412,12 @@ static void FC_CreateScrollIndicatorArrowPair(void)
|
||||
SPRITETAG_SCROLL_INDICATORS,
|
||||
0xFFFF,
|
||||
1,
|
||||
0
|
||||
};
|
||||
|
||||
if (sFameCheckerData->numUnlockedPersons > 5)
|
||||
{
|
||||
template.unk_06 = 0;
|
||||
template.unk_08 = sFameCheckerData->numUnlockedPersons - 5;
|
||||
template.fullyUpThreshold = 0;
|
||||
template.fullyDownThreshold = sFameCheckerData->numUnlockedPersons - 5;
|
||||
sFameCheckerData->scrollIndicatorPairTaskId = AddScrollIndicatorArrowPair(&template, &sFameCheckerData->listMenuTopIdx);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -460,7 +460,7 @@ struct UnkStruct_203F3CC
|
||||
/*01cc*/ u8 filler_01CC[2];
|
||||
/*01ce*/ u8 unk_01CE[41];
|
||||
/*01f7*/ u8 unk_01F7[10][41];
|
||||
/*0394*/ struct ScrollIndicatorArrowPairTemplate unk_0394;
|
||||
/*0394*/ struct ScrollArrowsTemplate unk_0394;
|
||||
/*03a4*/ u8 buffer_03A4[0x1000];
|
||||
};
|
||||
|
||||
@@ -478,9 +478,9 @@ const struct WindowTemplate gUnknown_8468040[] = {
|
||||
{0, 1, 0, 28, 3, 15, 0x000},
|
||||
{2, 1, 3, 28, 20, 15, 0x000}
|
||||
};
|
||||
const struct ScrollIndicatorArrowPairTemplate gUnknown_8468050 = {
|
||||
const struct ScrollArrowsTemplate gUnknown_8468050 = {
|
||||
0x02, 0xe8, 0x18, 0x03, 0xe8, 0x98,
|
||||
0x0000, 0x0002, 0x1000, 0x1000, 0x0, 0x000
|
||||
0x0000, 0x0002, 0x1000, 0x1000, 0x0,
|
||||
};
|
||||
|
||||
const u16 gUnknown_8468060[] = INCBIN_U16("data/graphics/mevent/pal_468060.gbapal");
|
||||
@@ -743,7 +743,7 @@ void sub_8146980(void)
|
||||
++gUnknown_203F3CC->unk_01C4;
|
||||
}
|
||||
gUnknown_203F3CC->unk_0394 = gUnknown_8468050;
|
||||
gUnknown_203F3CC->unk_0394.unk_08 = gUnknown_203F3CC->unk_01C4;
|
||||
gUnknown_203F3CC->unk_0394.fullyDownThreshold = gUnknown_203F3CC->unk_01C4;
|
||||
}
|
||||
|
||||
void sub_8146A30(void)
|
||||
|
||||
+12
-13
@@ -259,20 +259,19 @@ const struct ListMenuTemplate gTeachyTvListMenuTemplateArray =
|
||||
.cursorKind = 0x0,
|
||||
};
|
||||
|
||||
const struct ScrollIndicatorArrowPairTemplate gTeachyTvScrollIndicatorArrowPairTemplateArray =
|
||||
const struct ScrollArrowsTemplate gTeachyTvScrollIndicatorArrowPairTemplateArray =
|
||||
{
|
||||
.unk_00 = 0x2,
|
||||
.unk_01 = 0x78,
|
||||
.unk_02 = 0xC,
|
||||
.unk_03 = 0x3,
|
||||
.unk_04 = 0x78,
|
||||
.unk_05 = 0x64,
|
||||
.unk_06 = 0x0,
|
||||
.unk_08 = 0x1,
|
||||
.unk_0a = 0x800,
|
||||
.unk_0c = 0x800,
|
||||
.unk_0e_0 = 0x0,
|
||||
.unk_0e_4 = 0x0,
|
||||
.firstArrowType = 0x2,
|
||||
.firstX = 0x78,
|
||||
.firstY = 0xC,
|
||||
.secondArrowType = 0x3,
|
||||
.secondX = 0x78,
|
||||
.secondY = 0x64,
|
||||
.fullyUpThreshold = 0x0,
|
||||
.fullyDownThreshold = 0x1,
|
||||
.tileTag = 0x800,
|
||||
.palTag = 0x800,
|
||||
.palNum = 0x0,
|
||||
};
|
||||
|
||||
const u8 gTeachyTvSwitchFuncArray[] =
|
||||
|
||||
Reference in New Issue
Block a user