Finish data decomp

This commit is contained in:
PikalaxALT 2018-11-26 15:47:50 -05:00
parent e88def5ab1
commit a2b7b3ebf2
4 changed files with 25 additions and 14 deletions

View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_845FD44:: @ 845FD44
.byte 0x02, 0x28, 0x1a, 0x03, 0x28, 0x64, 0x00, 0x00, 0x00, 0x00, 0xec, 0x03, 0xff, 0xff, 0x01, 0x00

View File

@ -9,10 +9,18 @@
struct ScrollIndicatorArrowPairTemplate
{
u8 filler_00[6];
u8 unk_00;
u8 unk_01;
u8 unk_02;
u8 unk_03;
u8 unk_04;
u8 unk_05;
u16 unk_06;
u16 unk_08;
u8 filler_0a[6];
u16 unk_0a;
u16 unk_0c;
u16 unk_0e_0:4;
u16 unk_0e_4:12;
};
// Exported ROM declarations

View File

@ -377,7 +377,6 @@ SECTIONS {
src/quest_log.o(.rodata);
data/data_83FECCC.o(.rodata.8456C74);
src/fame_checker.o(.rodata);
data/fame_checker.o(.rodata);
data/data_845FD54.o(.rodata);
src/menews_jisan.o(.rodata);
src/menews_jisan.o(.rodata.str1.4);

View File

@ -481,8 +481,6 @@ const struct SpriteTemplate gUnknown_845FD2C = {
SPRITETAG_1009, 0xffff, &gOamData_845FCDC, gUnknown_845FCD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
};
extern const struct ScrollIndicatorArrowPairTemplate gUnknown_845FD44;
void sub_812C380(void)
{
LoadOam();
@ -1458,7 +1456,21 @@ void sub_812DFE4(u8 windowId)
void sub_812E000(void)
{
struct ScrollIndicatorArrowPairTemplate sp0 = gUnknown_845FD44;
struct ScrollIndicatorArrowPairTemplate sp0 = {
2,
40,
26,
3,
40,
100,
0,
0,
1004,
0xFFFF,
1,
0
};
if (gUnknown_203B0FC->unk_07_2 > 5)
{
sp0.unk_06 = 0;