From 9747e94380f44330435b2c94eed1f1746a07ce34 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Sun, 6 Jun 2021 17:24:04 -0500 Subject: [PATCH] Pushing current progress on undefined_syms --- asm/non_matchings/unknown_080500/MenuCreditsLoop.s | 8 ++++---- asm/non_matchings/unknown_080500/func_8007FFEC.s | 8 ++++---- asm/non_matchings/unknown_09F8F0/func_800A0BD4.s | 4 ++-- asm/non_matchings/unknown_09F8F0/func_800AD144.s | 8 ++++---- src/unknown_09F8F0.c | 6 +++--- undefined_syms.txt | 8 +------- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index de982047..aff15d94 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -266,12 +266,12 @@ glabel MenuCreditsLoop /* 09C2EC 8009B6EC 14410005 */ bne $v0, $at, .L8009B704 /* 09C2F0 8009B6F0 2418FF60 */ li $t8, -160 /* 09C2F4 8009B6F4 240F00A0 */ li $t7, 160 -/* 09C2F8 8009B6F8 3C01800E */ lui $at, %hi(D_800E1B58) # $at, 0x800e +/* 09C2F8 8009B6F8 3C01800E */ lui $at, %hi(D_800E1B50+8) # $at, 0x800e /* 09C2FC 8009B6FC 10000003 */ b .L8009B70C -/* 09C300 8009B700 A42F1B58 */ sh $t7, %lo(D_800E1B58)($at) +/* 09C300 8009B700 A42F1B58 */ sh $t7, %lo(D_800E1B50+8)($at) .L8009B704: -/* 09C304 8009B704 3C01800E */ lui $at, %hi(D_800E1B58) # $at, 0x800e -/* 09C308 8009B708 A4381B58 */ sh $t8, %lo(D_800E1B58)($at) +/* 09C304 8009B704 3C01800E */ lui $at, %hi(D_800E1B50+8) # $at, 0x800e +/* 09C308 8009B708 A4381B58 */ sh $t8, %lo(D_800E1B50+8)($at) .L8009B70C: /* 09C30C 8009B70C 0205082A */ slt $at, $s0, $a1 /* 09C310 8009B710 10200042 */ beqz $at, .L8009B81C diff --git a/asm/non_matchings/unknown_080500/func_8007FFEC.s b/asm/non_matchings/unknown_080500/func_8007FFEC.s index 1236f4d8..533cb222 100644 --- a/asm/non_matchings/unknown_080500/func_8007FFEC.s +++ b/asm/non_matchings/unknown_080500/func_8007FFEC.s @@ -39,9 +39,9 @@ glabel func_8007FFEC /* 080C7C 8008007C 3C07800E */ lui $a3, %hi(D_800E1DAC) # $a3, 0x800e /* 080C80 80080080 24E71DAC */ addiu $a3, %lo(D_800E1DAC) # addiu $a3, $a3, 0x1dac /* 080C84 80080084 ACE20000 */ sw $v0, ($a3) -/* 080C88 80080088 3C01800E */ lui $at, %hi(D_800E1DB0) # $at, 0x800e +/* 080C88 80080088 3C01800E */ lui $at, %hi(D_800E1DAC+4) # $at, 0x800e /* 080C8C 8008008C 0043C021 */ addu $t8, $v0, $v1 -/* 080C90 80080090 AC381DB0 */ sw $t8, %lo(D_800E1DB0)($at) +/* 080C90 80080090 AC381DB0 */ sw $t8, %lo(D_800E1DAC+4)($at) /* 080C94 80080094 8CF90004 */ lw $t9, 4($a3) /* 080C98 80080098 3C068012 */ lui $a2, %hi(D_80126C2C) # $a2, 0x8012 /* 080C9C 8008009C 3C018012 */ lui $at, %hi(D_80126C2C) # $at, 0x8012 @@ -51,7 +51,7 @@ glabel func_8007FFEC /* 080CAC 800800AC 8FAC0028 */ lw $t4, 0x28($sp) /* 080CB0 800800B0 8CCF0000 */ lw $t7, ($a2) /* 080CB4 800800B4 3C08800E */ lui $t0, %hi(D_800E1DA4) # $t0, 0x800e -/* 080CB8 800800B8 3C01800E */ lui $at, %hi(D_800E1DA8) # $at, 0x800e +/* 080CB8 800800B8 3C01800E */ lui $at, %hi(D_800E1DA4+4) # $at, 0x800e /* 080CBC 800800BC 01ECC021 */ addu $t8, $t7, $t4 /* 080CC0 800800C0 25081DA4 */ addiu $t0, %lo(D_800E1DA4) # addiu $t0, $t0, 0x1da4 /* 080CC4 800800C4 AC381DA4 */ sw $t8, %lo(D_800E1DA4)($at) @@ -59,7 +59,7 @@ glabel func_8007FFEC /* 080CCC 800800CC 8D190000 */ lw $t9, ($t0) /* 080CD0 800800D0 2409000A */ li $t1, 10 /* 080CD4 800800D4 032D7021 */ addu $t6, $t9, $t5 -/* 080CD8 800800D8 AC2E1DA8 */ sw $t6, %lo(D_800E1DA8)($at) +/* 080CD8 800800D8 AC2E1DA8 */ sw $t6, %lo(D_800E1DA4+4)($at) /* 080CDC 800800DC 00005025 */ move $t2, $zero /* 080CE0 800800E0 00002825 */ move $a1, $zero /* 080CE4 800800E4 1A0000C8 */ blez $s0, .L80080408 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s b/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s index c3720905..8766de8f 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A0BD4.s @@ -97,10 +97,10 @@ glabel func_800A0BD4 /* 0A1930 800A0D30 3C038012 */ lui $v1, %hi(D_80126D70) # $v1, 0x8012 /* 0A1934 800A0D34 24636D70 */ addiu $v1, %lo(D_80126D70) # addiu $v1, $v1, 0x6d70 /* 0A1938 800A0D38 906B0000 */ lbu $t3, ($v1) -/* 0A193C 800A0D3C 3C0C800E */ lui $t4, %hi(D_800E2772) # $t4, 0x800e +/* 0A193C 800A0D3C 3C0C800E */ lui $t4, %hi(D_800E2770+2) # $t4, 0x800e /* 0A1940 800A0D40 11600018 */ beqz $t3, .L800A0DA4 /* 0A1944 800A0D44 8FBF002C */ lw $ra, 0x2c($sp) -/* 0A1948 800A0D48 918C2772 */ lbu $t4, %lo(D_800E2772)($t4) +/* 0A1948 800A0D48 918C2772 */ lbu $t4, %lo(D_800E2770+2)($t4) /* 0A194C 800A0D4C 3C028012 */ lui $v0, %hi(D_80126D37) # $v0, 0x8012 /* 0A1950 800A0D50 15800014 */ bnez $t4, .L800A0DA4 /* 0A1954 800A0D54 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD144.s b/asm/non_matchings/unknown_09F8F0/func_800AD144.s index a5312c28..f6412b9b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD144.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD144.s @@ -34,15 +34,15 @@ glabel func_800AD144 /* 0ADDC4 800AD1C4 00000000 */ nop /* 0ADDC8 800AD1C8 3C19800E */ lui $t9, %hi(D_800E291C) # $t9, 0x800e /* 0ADDCC 800AD1CC 8F39291C */ lw $t9, %lo(D_800E291C)($t9) -/* 0ADDD0 800AD1D0 3C01800E */ lui $at, %hi(D_800E2C38) # $at, 0x800e -/* 0ADDD4 800AD1D4 AC222C38 */ sw $v0, %lo(D_800E2C38)($at) +/* 0ADDD0 800AD1D0 3C01800E */ lui $at, %hi(D_800E2C2C+12) # $at, 0x800e +/* 0ADDD4 800AD1D4 AC222C38 */ sw $v0, %lo(D_800E2C2C+12)($at) /* 0ADDD8 800AD1D8 8F240004 */ lw $a0, 4($t9) /* 0ADDDC 800AD1DC 0C01EB9D */ jal func_8007AE74 /* 0ADDE0 800AD1E0 00000000 */ nop /* 0ADDE4 800AD1E4 3C08800E */ lui $t0, %hi(D_800E291C) # $t0, 0x800e /* 0ADDE8 800AD1E8 8D08291C */ lw $t0, %lo(D_800E291C)($t0) -/* 0ADDEC 800AD1EC 3C01800E */ lui $at, %hi(D_800E2C50) # $at, 0x800e -/* 0ADDF0 800AD1F0 AC222C50 */ sw $v0, %lo(D_800E2C50)($at) +/* 0ADDEC 800AD1EC 3C01800E */ lui $at, %hi(D_800E2C2C+36) # $at, 0x800e +/* 0ADDF0 800AD1F0 AC222C50 */ sw $v0, %lo(D_800E2C2C+36)($at) /* 0ADDF4 800AD1F4 8D04000C */ lw $a0, 0xc($t0) /* 0ADDF8 800AD1F8 0C01F04B */ jal func_8007C12C /* 0ADDFC 800AD1FC 00002825 */ move $a1, $zero diff --git a/src/unknown_09F8F0.c b/src/unknown_09F8F0.c index 416ec7a0..6331d4d9 100644 --- a/src/unknown_09F8F0.c +++ b/src/unknown_09F8F0.c @@ -134,9 +134,9 @@ u16 D_800E2684[118] = { }; // This is probably not right. -s32 D_800E2770[8] = { - 0x00FD0000, 0x00000000, 0x00000000, 0x00000000, - 0x00FF0000, 0x00000000, 0x00000000, 0x00000000 +u8 D_800E2770[32] = { + 0, 0xFD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; s8 D_800E2790 = 1; diff --git a/undefined_syms.txt b/undefined_syms.txt index c5d6acd5..c017ac34 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -23,14 +23,8 @@ osCicId = 0x80000310; osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; - -D_800E1B58 = 0x800E1B58; -D_800E1DA8 = 0x800E1DA8; -D_800E1DB0 = 0x800E1DB0; -D_800E2772 = 0x800E2772; -D_800E2C38 = 0x800E2C38; -D_800E2C50 = 0x800E2C50; eqpower = 0x800E37A0; + D_800E4810 = 0x800E4810; D_800E4878 = 0x800E4878; __RunQueue = 0x800E4888;