From e016e79f2d4b9203dcfa0f0df22b58a73aed8bf3 Mon Sep 17 00:00:00 2001 From: Antonio Date: Sat, 13 Nov 2021 00:03:32 -0800 Subject: [PATCH] Updated struct definition containing savefile info. --- asm/non_matchings/menu/func_8008D5F8.s | 4 +- asm/non_matchings/menu/func_8008D8BC.s | 12 +++--- asm/non_matchings/menu/func_8008DC7C.s | 8 ++-- .../menu/menu_file_select_loop.s | 16 +++---- .../menu/render_file_select_menu.s | 12 +++--- src/menu.c | 42 ++++++++----------- src/menu.h | 10 ++--- 7 files changed, 48 insertions(+), 56 deletions(-) diff --git a/asm/non_matchings/menu/func_8008D5F8.s b/asm/non_matchings/menu/func_8008D5F8.s index 2e83e3c0..d3955340 100644 --- a/asm/non_matchings/menu/func_8008D5F8.s +++ b/asm/non_matchings/menu/func_8008D5F8.s @@ -47,11 +47,11 @@ glabel func_8008D5F8 /* 08E2A8 8008D6A8 00000000 */ nop .L8008D6AC: /* 08E2AC 8008D6AC 8D6C0000 */ lw $t4, ($t3) -/* 08E2B0 8008D6B0 3C0E8012 */ lui $t6, %hi(D_801264A0) # $t6, 0x8012 +/* 08E2B0 8008D6B0 3C0E8012 */ lui $t6, %hi(gSavefileInfo) # $t6, 0x8012 /* 08E2B4 8008D6B4 000C6880 */ sll $t5, $t4, 2 /* 08E2B8 8008D6B8 01AC6823 */ subu $t5, $t5, $t4 /* 08E2BC 8008D6BC 000D6880 */ sll $t5, $t5, 2 -/* 08E2C0 8008D6C0 25CE64A0 */ addiu $t6, %lo(D_801264A0) # addiu $t6, $t6, 0x64a0 +/* 08E2C0 8008D6C0 25CE64A0 */ addiu $t6, %lo(gSavefileInfo) # addiu $t6, $t6, 0x64a0 /* 08E2C4 8008D6C4 01AE1021 */ addu $v0, $t5, $t6 /* 08E2C8 8008D6C8 904F0001 */ lbu $t7, 1($v0) /* 08E2CC 8008D6CC 3C18800E */ lui $t8, %hi(gIsInAdventureTwo) # $t8, 0x800e diff --git a/asm/non_matchings/menu/func_8008D8BC.s b/asm/non_matchings/menu/func_8008D8BC.s index 7fe2f4d7..4e3c9524 100644 --- a/asm/non_matchings/menu/func_8008D8BC.s +++ b/asm/non_matchings/menu/func_8008D8BC.s @@ -45,8 +45,8 @@ glabel func_8008D8BC /* 08E560 8008D960 8C490000 */ lw $t1, ($v0) /* 08E564 8008D964 2403000C */ li $v1, 12 /* 08E568 8008D968 01230019 */ multu $t1, $v1 -/* 08E56C 8008D96C 3C088012 */ lui $t0, %hi(D_801264A0) # $t0, 0x8012 -/* 08E570 8008D970 250864A0 */ addiu $t0, %lo(D_801264A0) # addiu $t0, $t0, 0x64a0 +/* 08E56C 8008D96C 3C088012 */ lui $t0, %hi(gSavefileInfo) # $t0, 0x8012 +/* 08E570 8008D970 250864A0 */ addiu $t0, %lo(gSavefileInfo) # addiu $t0, $t0, 0x64a0 /* 08E574 8008D974 240400EF */ li $a0, 239 /* 08E578 8008D978 00005012 */ mflo $t2 /* 08E57C 8008D97C 010A5821 */ addu $t3, $t0, $t2 @@ -125,8 +125,8 @@ glabel func_8008D8BC /* 08E688 8008DA88 8CCB0000 */ lw $t3, ($a2) /* 08E68C 8008DA8C 2403000C */ li $v1, 12 /* 08E690 8008DA90 01630019 */ multu $t3, $v1 -/* 08E694 8008DA94 3C088012 */ lui $t0, %hi(D_801264A0) # $t0, 0x8012 -/* 08E698 8008DA98 250864A0 */ addiu $t0, %lo(D_801264A0) # addiu $t0, $t0, 0x64a0 +/* 08E694 8008DA94 3C088012 */ lui $t0, %hi(gSavefileInfo) # $t0, 0x8012 +/* 08E698 8008DA98 250864A0 */ addiu $t0, %lo(gSavefileInfo) # addiu $t0, $t0, 0x64a0 /* 08E69C 8008DA9C 00002825 */ move $a1, $zero /* 08E6A0 8008DAA0 24040241 */ li $a0, 577 /* 08E6A4 8008DAA4 00006012 */ mflo $t4 @@ -185,8 +185,8 @@ glabel func_8008D8BC /* 08E764 8008DB64 8CC70000 */ lw $a3, ($a2) /* 08E768 8008DB68 2403000C */ li $v1, 12 /* 08E76C 8008DB6C 00E30019 */ multu $a3, $v1 -/* 08E770 8008DB70 3C088012 */ lui $t0, %hi(D_801264A0) # $t0, 0x8012 -/* 08E774 8008DB74 250864A0 */ addiu $t0, %lo(D_801264A0) # addiu $t0, $t0, 0x64a0 +/* 08E770 8008DB70 3C088012 */ lui $t0, %hi(gSavefileInfo) # $t0, 0x8012 +/* 08E774 8008DB74 250864A0 */ addiu $t0, %lo(gSavefileInfo) # addiu $t0, $t0, 0x64a0 /* 08E778 8008DB78 8FA5001C */ lw $a1, 0x1c($sp) /* 08E77C 8008DB7C 24040001 */ li $a0, 1 /* 08E780 8008DB80 00074880 */ sll $t1, $a3, 2 diff --git a/asm/non_matchings/menu/func_8008DC7C.s b/asm/non_matchings/menu/func_8008DC7C.s index 155e3040..e8e95756 100644 --- a/asm/non_matchings/menu/func_8008DC7C.s +++ b/asm/non_matchings/menu/func_8008DC7C.s @@ -41,12 +41,12 @@ glabel func_8008DC7C /* 08E910 8008DD10 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012 /* 08E914 8008DD14 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c /* 08E918 8008DD18 8CC90000 */ lw $t1, ($a2) -/* 08E91C 8008DD1C 3C0B8012 */ lui $t3, %hi(D_801264A0+1) # $t3, 0x8012 +/* 08E91C 8008DD1C 3C0B8012 */ lui $t3, %hi(gSavefileInfo+1) # $t3, 0x8012 /* 08E920 8008DD20 00095080 */ sll $t2, $t1, 2 /* 08E924 8008DD24 01495023 */ subu $t2, $t2, $t1 /* 08E928 8008DD28 000A5080 */ sll $t2, $t2, 2 /* 08E92C 8008DD2C 016A5821 */ addu $t3, $t3, $t2 -/* 08E930 8008DD30 916B64A1 */ lbu $t3, %lo(D_801264A0+1)($t3) +/* 08E930 8008DD30 916B64A1 */ lbu $t3, %lo(gSavefileInfo+1)($t3) /* 08E934 8008DD34 00002825 */ move $a1, $zero /* 08E938 8008DD38 11600007 */ beqz $t3, .L8008DD58 /* 08E93C 8008DD3C 24040241 */ li $a0, 577 @@ -97,11 +97,11 @@ glabel func_8008DC7C /* 08E9DC 8008DDDC 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012 /* 08E9E0 8008DDE0 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c /* 08E9E4 8008DDE4 8CC30000 */ lw $v1, ($a2) -/* 08E9E8 8008DDE8 3C198012 */ lui $t9, %hi(D_801264A0) # $t9, 0x8012 +/* 08E9E8 8008DDE8 3C198012 */ lui $t9, %hi(gSavefileInfo) # $t9, 0x8012 /* 08E9EC 8008DDEC 0003C080 */ sll $t8, $v1, 2 /* 08E9F0 8008DDF0 0303C023 */ subu $t8, $t8, $v1 /* 08E9F4 8008DDF4 0018C080 */ sll $t8, $t8, 2 -/* 08E9F8 8008DDF8 273964A0 */ addiu $t9, %lo(D_801264A0) # addiu $t9, $t9, 0x64a0 +/* 08E9F8 8008DDF8 273964A0 */ addiu $t9, %lo(gSavefileInfo) # addiu $t9, $t9, 0x64a0 /* 08E9FC 8008DDFC 03191021 */ addu $v0, $t8, $t9 /* 08EA00 8008DE00 24080044 */ li $t0, 68 /* 08EA04 8008DE04 2409004B */ li $t1, 75 diff --git a/asm/non_matchings/menu/menu_file_select_loop.s b/asm/non_matchings/menu/menu_file_select_loop.s index 366e9ef2..595791cb 100644 --- a/asm/non_matchings/menu/menu_file_select_loop.s +++ b/asm/non_matchings/menu/menu_file_select_loop.s @@ -17,10 +17,10 @@ glabel menu_file_select_loop /* 08EAAC 8008DEAC 00004025 */ move $t0, $zero /* 08EAB0 8008DEB0 29E10003 */ slti $at, $t7, 3 /* 08EAB4 8008DEB4 14200030 */ bnez $at, .L8008DF78 -/* 08EAB8 8008DEB8 3C028012 */ lui $v0, %hi(D_801264A0) # $v0, 0x8012 +/* 08EAB8 8008DEB8 3C028012 */ lui $v0, %hi(gSavefileInfo) # $v0, 0x8012 /* 08EABC 8008DEBC 3C078012 */ lui $a3, %hi(D_80126530) # $a3, 0x8012 /* 08EAC0 8008DEC0 24E76530 */ addiu $a3, %lo(D_80126530) # addiu $a3, $a3, 0x6530 -/* 08EAC4 8008DEC4 244264A0 */ addiu $v0, %lo(D_801264A0) # addiu $v0, $v0, 0x64a0 +/* 08EAC4 8008DEC4 244264A0 */ addiu $v0, %lo(gSavefileInfo) # addiu $v0, $v0, 0x64a0 .L8008DEC8: /* 08EAC8 8008DEC8 8CE30000 */ lw $v1, ($a3) /* 08EACC 8008DECC A0400000 */ sb $zero, ($v0) @@ -143,8 +143,8 @@ glabel menu_file_select_loop /* 08EC7C 8008E07C 00086880 */ sll $t5, $t0, 2 /* 08EC80 8008E080 15800012 */ bnez $t4, .L8008E0CC /* 08EC84 8008E084 01A86823 */ subu $t5, $t5, $t0 -/* 08EC88 8008E088 3C0E8012 */ lui $t6, %hi(D_801264A0) # $t6, 0x8012 -/* 08EC8C 8008E08C 25CE64A0 */ addiu $t6, %lo(D_801264A0) # addiu $t6, $t6, 0x64a0 +/* 08EC88 8008E088 3C0E8012 */ lui $t6, %hi(gSavefileInfo) # $t6, 0x8012 +/* 08EC8C 8008E08C 25CE64A0 */ addiu $t6, %lo(gSavefileInfo) # addiu $t6, $t6, 0x64a0 /* 08EC90 8008E090 000D6880 */ sll $t5, $t5, 2 /* 08EC94 8008E094 01AE1021 */ addu $v0, $t5, $t6 /* 08EC98 8008E098 0C02607A */ jal func_800981E8 @@ -170,12 +170,12 @@ glabel menu_file_select_loop /* 08ECE4 8008E0E4 00000000 */ nop /* 08ECE8 8008E0E8 3C0C800E */ lui $t4, %hi(gSaveFileIndex) # $t4, 0x800e /* 08ECEC 8008E0EC 8D8CF4CC */ lw $t4, %lo(gSaveFileIndex)($t4) -/* 08ECF0 8008E0F0 3C0E8012 */ lui $t6, %hi(D_801264A0) # $t6, 0x8012 +/* 08ECF0 8008E0F0 3C0E8012 */ lui $t6, %hi(gSavefileInfo) # $t6, 0x8012 /* 08ECF4 8008E0F4 000C6880 */ sll $t5, $t4, 2 /* 08ECF8 8008E0F8 01AC6823 */ subu $t5, $t5, $t4 /* 08ECFC 8008E0FC 3C018012 */ lui $at, %hi(D_80126CC0) # $at, 0x8012 /* 08ED00 8008E100 000D6880 */ sll $t5, $t5, 2 -/* 08ED04 8008E104 25CE64A0 */ addiu $t6, %lo(D_801264A0) # addiu $t6, $t6, 0x64a0 +/* 08ED04 8008E104 25CE64A0 */ addiu $t6, %lo(gSavefileInfo) # addiu $t6, $t6, 0x64a0 /* 08ED08 8008E108 AC206CC0 */ sw $zero, %lo(D_80126CC0)($at) /* 08ED0C 8008E10C 01AE1021 */ addu $v0, $t5, $t6 /* 08ED10 8008E110 A0400000 */ sb $zero, ($v0) @@ -214,11 +214,11 @@ glabel menu_file_select_loop /* 08ED8C 8008E18C 18400036 */ blez $v0, .L8008E268 /* 08ED90 8008E190 3C09800E */ lui $t1, %hi(gSaveFileIndex) # $t1, 0x800e /* 08ED94 8008E194 8D29F4CC */ lw $t1, %lo(gSaveFileIndex)($t1) -/* 08ED98 8008E198 3C0F8012 */ lui $t7, %hi(D_801264A0) # $t7, 0x8012 +/* 08ED98 8008E198 3C0F8012 */ lui $t7, %hi(gSavefileInfo) # $t7, 0x8012 /* 08ED9C 8008E19C 00097080 */ sll $t6, $t1, 2 /* 08EDA0 8008E1A0 01C97023 */ subu $t6, $t6, $t1 /* 08EDA4 8008E1A4 000E7080 */ sll $t6, $t6, 2 -/* 08EDA8 8008E1A8 25EF64A0 */ addiu $t7, %lo(D_801264A0) # addiu $t7, $t7, 0x64a0 +/* 08EDA8 8008E1A8 25EF64A0 */ addiu $t7, %lo(gSavefileInfo) # addiu $t7, $t7, 0x64a0 /* 08EDAC 8008E1AC 01CF1021 */ addu $v0, $t6, $t7 /* 08EDB0 8008E1B0 90580001 */ lbu $t8, 1($v0) /* 08EDB4 8008E1B4 3C0B800E */ lui $t3, %hi(D_800E0FB0) # $t3, 0x800e diff --git a/asm/non_matchings/menu/render_file_select_menu.s b/asm/non_matchings/menu/render_file_select_menu.s index 94fded8f..a0aee289 100644 --- a/asm/non_matchings/menu/render_file_select_menu.s +++ b/asm/non_matchings/menu/render_file_select_menu.s @@ -26,7 +26,7 @@ glabel render_file_select_menu /* 08D9CC 8008CDCC 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 08D9D0 8008CDD0 0C019FCB */ jal func_80067F2C /* 08D9D4 8008CDD4 02E02025 */ move $a0, $s7 -/* 08D9D8 8008CDD8 3C118012 */ lui $s1, %hi(D_801264A0) # $s1, 0x8012 +/* 08D9D8 8008CDD8 3C118012 */ lui $s1, %hi(gSavefileInfo) # $s1, 0x8012 /* 08D9DC 8008CDDC 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e /* 08D9E0 8008CDE0 3C158012 */ lui $s5, %hi(D_80126550) # $s5, 0x8012 /* 08D9E4 8008CDE4 3C13B0E0 */ lui $s3, (0xB0E0C0FF >> 16) # lui $s3, 0xb0e0 @@ -35,7 +35,7 @@ glabel render_file_select_menu /* 08D9F0 8008CDF0 3673C0FF */ ori $s3, (0xB0E0C0FF & 0xFFFF) # ori $s3, $s3, 0xc0ff /* 08D9F4 8008CDF4 26B56550 */ addiu $s5, %lo(D_80126550) # addiu $s5, $s5, 0x6550 /* 08D9F8 8008CDF8 261003CC */ addiu $s0, %lo(D_800E03CC) # addiu $s0, $s0, 0x3cc -/* 08D9FC 8008CDFC 263164A0 */ addiu $s1, %lo(D_801264A0) # addiu $s1, $s1, 0x64a0 +/* 08D9FC 8008CDFC 263164A0 */ addiu $s1, %lo(gSavefileInfo) # addiu $s1, $s1, 0x64a0 /* 08DA00 8008CE00 24140078 */ li $s4, 120 .L8008CE04: /* 08DA04 8008CE04 8E4F0000 */ lw $t7, ($s2) @@ -86,14 +86,14 @@ glabel render_file_select_menu /* 08DAB0 8008CEB0 00003025 */ move $a2, $zero /* 08DAB4 8008CEB4 0C0310F3 */ jal set_text_background_color /* 08DAB8 8008CEB8 00003825 */ move $a3, $zero -/* 08DABC 8008CEBC 3C118012 */ lui $s1, %hi(D_801264A0) # $s1, 0x8012 +/* 08DABC 8008CEBC 3C118012 */ lui $s1, %hi(gSavefileInfo) # $s1, 0x8012 /* 08DAC0 8008CEC0 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e /* 08DAC4 8008CEC4 3C14800E */ lui $s4, %hi(D_800E03FC) # $s4, 0x800e /* 08DAC8 8008CEC8 3C13800E */ lui $s3, %hi(D_800DF75C) # $s3, 0x800e /* 08DACC 8008CECC 2673F75C */ addiu $s3, %lo(D_800DF75C) # addiu $s3, $s3, -0x8a4 /* 08DAD0 8008CED0 269403FC */ addiu $s4, %lo(D_800E03FC) # addiu $s4, $s4, 0x3fc /* 08DAD4 8008CED4 261003CC */ addiu $s0, %lo(D_800E03CC) # addiu $s0, $s0, 0x3cc -/* 08DAD8 8008CED8 263164A0 */ addiu $s1, %lo(D_801264A0) # addiu $s1, $s1, 0x64a0 +/* 08DAD8 8008CED8 263164A0 */ addiu $s1, %lo(gSavefileInfo) # addiu $s1, $s1, 0x64a0 /* 08DADC 8008CEDC 2415000A */ li $s5, 10 .L8008CEE0: /* 08DAE0 8008CEE0 922F0001 */ lbu $t7, 1($s1) @@ -350,8 +350,8 @@ glabel render_file_select_menu /* 08DE90 8008D290 126A0021 */ beq $s3, $t2, .L8008D318 .L8008D294: /* 08DE94 8008D294 01735823 */ subu $t3, $t3, $s3 -/* 08DE98 8008D298 3C0C8012 */ lui $t4, %hi(D_801264A0) # $t4, 0x8012 -/* 08DE9C 8008D29C 258C64A0 */ addiu $t4, %lo(D_801264A0) # addiu $t4, $t4, 0x64a0 +/* 08DE98 8008D298 3C0C8012 */ lui $t4, %hi(gSavefileInfo) # $t4, 0x8012 +/* 08DE9C 8008D29C 258C64A0 */ addiu $t4, %lo(gSavefileInfo) # addiu $t4, $t4, 0x64a0 /* 08DEA0 8008D2A0 000B5880 */ sll $t3, $t3, 2 /* 08DEA4 8008D2A4 016C8821 */ addu $s1, $t3, $t4 /* 08DEA8 8008D2A8 26240004 */ addiu $a0, $s1, 4 diff --git a/src/menu.c b/src/menu.c index 66c16a29..d850f2ed 100644 --- a/src/menu.c +++ b/src/menu.c @@ -89,7 +89,7 @@ s32 D_80126494; s32 D_80126498; s32 D_8012649C; -unk801264A0 D_801264A0[4]; +SavefileInfo gSavefileInfo[4]; s32 D_801264D0; s32 D_801264D4; @@ -3963,7 +3963,7 @@ void render_file_select_menu(s32 arg0) { func_8009BD5C(); func_80067F2C(&D_801263A0, &D_801263A8); for (i = 0; i < 3; i++) { // 3 files - if (D_801264A0[i].unk0 == gIsInAdventureTwo || D_801264A0[i].unk1 == 0) { + if (gSavefileInfo[i].unk0 == gIsInAdventureTwo || gSavefileInfo[i].unk1 == 0) { color = 0xB0E0C0FF; } else { color = 0x6A9073FF; @@ -3977,17 +3977,17 @@ void render_file_select_menu(s32 arg0) { set_text_background_color(0, 0, 0, 0); s5 = 10; for (i = 0; i < 3; i++) { - if (D_801264A0[i].unk1 != 0) { + if (gSavefileInfo[i].unk1 != 0) { s2 = 0xB; func_8007BF1C(0); - if (D_801264A0[i].unk0 != 0) { + if (gSavefileInfo[i].unk0 != 0) { s2 = 0xC; } func_8008CC28(s2, D_800E03FC[2] + D_800E03CC[i].unk0, D_800E03FC[3] + D_800E03CC[i].unk2, 0, 0, 0, 0x80); func_80068508(1); - D_800DF75C->unk18 = D_801264A0[i].unk2 / s5; + D_800DF75C->unk18 = gSavefileInfo[i].unk2 / s5; func_8008CC28(0, (D_800E03FC[6] + D_800E03CC[i].unk0) - 6, D_800E03FC[7] + D_800E03CC[i].unk2, 0, 0, 0, 0x80); - D_800DF75C->unk18 = D_801264A0[i].unk2 % s5; + D_800DF75C->unk18 = gSavefileInfo[i].unk2 % s5; func_8008CC28(0, D_800E03FC[6] + D_800E03CC[i].unk0 + 6, D_800E03FC[7] + D_800E03CC[i].unk2, 0, 0, 0, 0x80); func_80068508(0); D_800DF4A8 = 0x40; @@ -4028,8 +4028,8 @@ void render_file_select_menu(s32 arg0) { D_800E03CC[i].unk8, D_800E03CC[i].unkA, temp_t0, temp_t0, temp_t0, temp_t0); } if (D_80126CC0 == 0 || i != gSaveFileIndex) { - trim_filename_string(D_801264A0[i].name, tempName); - if (D_801264A0[i].unk1 == 0) { + trim_filename_string(gSavefileInfo[i].name, tempName); + if (gSavefileInfo[i].unk1 == 0) { trim_filename_string(gFilenames[i], tempName); } if (tempName != NULL) { @@ -4090,15 +4090,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008D8BC.s") GLOBAL_ASM("asm/non_matchings/menu/func_8008DC7C.s") #else /* Size: 0x0C Bytes */ -typedef struct unk801264A0 { - u8 unk0; - u8 unk1; - u16 unk2; - char name[4]; - u32 pad8; -} unk801264A0; - -extern unk801264A0 D_801264A0[3]; // Filename structs? +extern SavefileInfo gSavefileInfo[3]; // Filename structs? extern s32 D_80126494; extern s32 D_8012648C; @@ -4120,7 +4112,7 @@ void func_8008DC7C(s32 arg0) { func_80001D04(0x241, NULL); D_80126488 = 0; } else if (phi_v1 & 0x9000) { - if (D_801264A0[D_8012648C].unk0 == 0) { + if (gSavefileInfo[D_8012648C].unk0 == 0) { func_80001D04(0x241, NULL); } func_80001D04(0xEF, NULL); @@ -4151,13 +4143,13 @@ void func_8008DC7C(s32 arg0) { if (phi_v1 & 0x9000) { func_80001D04(0xEF, NULL); func_8006ECAC(D_8012648C); - D_801264A0[D_8012648C].unk0 = 0; - D_801264A0[D_8012648C].unk1 = 0; - D_801264A0[D_8012648C].unk2 = 0; - D_801264A0[D_8012648C].name[0] = 'D'; - D_801264A0[D_8012648C].name[1] = 'K'; - D_801264A0[D_8012648C].name[2] = 'R'; - D_801264A0[D_8012648C].name[3] = '\0'; + gSavefileInfo[D_8012648C].unk0 = 0; + gSavefileInfo[D_8012648C].unk1 = 0; + gSavefileInfo[D_8012648C].unk2 = 0; + gSavefileInfo[D_8012648C].name[0] = 'D'; + gSavefileInfo[D_8012648C].name[1] = 'K'; + gSavefileInfo[D_8012648C].name[2] = 'R'; + gSavefileInfo[D_8012648C].name[3] = '\0'; gSaveFileIndex = (s32)D_8012648C; D_801263E0 = 0; D_80126488 = 0; diff --git a/src/menu.h b/src/menu.h index c8c86129..c0f41ccf 100644 --- a/src/menu.h +++ b/src/menu.h @@ -173,13 +173,13 @@ typedef struct unk801263CC { } unk801263CC; /* Size: 0x0C Bytes */ -typedef struct unk801264A0 { - u8 unk0; - u8 unk1; - u16 unk2; +typedef struct SavefileInfo { + u8 isAdventure2; + u8 isStarted; + u16 balloonCount; char name[4]; u32 pad8; -} unk801264A0; +} SavefileInfo; typedef struct unk800E153C { TextureHeader *texture;