From 20c2f95d62e33a32964dd9ffdead22b7ec6b69e6 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Fri, 28 May 2021 00:17:28 -0700 Subject: [PATCH] Added globals for new glabels --- .../unknown_080500/MenuCreditsLoop.s | 4 ++-- .../unknown_080500/func_80099E8C.s | 4 ++-- src/unknown_080500.c | 20 +++++++++++-------- undefined_syms.txt | 2 ++ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index 52706a0e..946a192f 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -293,7 +293,7 @@ glabel MenuCreditsLoop /* 09C360 8009B760 24150002 */ li $s5, 2 /* 09C364 8009B764 862D0000 */ lh $t5, ($s1) /* 09C368 8009B768 2643000E */ addiu $v1, $s2, 0xe -/* 09C36C 8009B76C 3C0F800E */ lui $t7, 0x800e +/* 09C36C 8009B76C 3C0F800E */ lui $t7, %hi(D_800E1A94) # $t7, 0x800e /* 09C370 8009B770 000D7080 */ sll $t6, $t5, 2 /* 09C374 8009B774 8EC50000 */ lw $a1, ($s6) /* 09C378 8009B778 AE020014 */ sw $v0, 0x14($s0) @@ -302,7 +302,7 @@ glabel MenuCreditsLoop /* 09C384 8009B784 A603002A */ sh $v1, 0x2a($s0) /* 09C388 8009B788 A2000031 */ sb $zero, 0x31($s0) /* 09C38C 8009B78C 01EE7821 */ addu $t7, $t7, $t6 -/* 09C390 8009B790 8DEF1A94 */ lw $t7, 0x1a94($t7) +/* 09C390 8009B790 8DEF1A94 */ lw $t7, %lo(D_800E1A94)($t7) /* 09C394 8009B794 3C19800E */ lui $t9, %hi(D_800E17F4) # $t9, 0x800e /* 09C398 8009B798 83A6005B */ lb $a2, 0x5b($sp) /* 09C39C 8009B79C 3C08800E */ lui $t0, %hi(D_800E1938) # $t0, 0x800e diff --git a/asm/non_matchings/unknown_080500/func_80099E8C.s b/asm/non_matchings/unknown_080500/func_80099E8C.s index 7b09f6a7..9e7c907d 100644 --- a/asm/non_matchings/unknown_080500/func_80099E8C.s +++ b/asm/non_matchings/unknown_080500/func_80099E8C.s @@ -189,10 +189,10 @@ glabel func_80099E8C /* 09AD50 8009A150 44815000 */ mtc1 $at, $f10 /* 09AD54 8009A154 3C013F50 */ li $at, 0x3F500000 # 0.812500 /* 09AD58 8009A158 0008C880 */ sll $t9, $t0, 2 -/* 09AD5C 8009A15C 3C05800E */ lui $a1, 0x800e +/* 09AD5C 8009A15C 3C05800E */ lui $a1, %hi(D_800E16F4) # $a1, 0x800e /* 09AD60 8009A160 44818000 */ mtc1 $at, $f16 /* 09AD64 8009A164 00B92821 */ addu $a1, $a1, $t9 -/* 09AD68 8009A168 8CA516F4 */ lw $a1, 0x16f4($a1) +/* 09AD68 8009A168 8CA516F4 */ lw $a1, %lo(D_800E16F4)($a1) /* 09AD6C 8009A16C 44074000 */ mfc1 $a3, $f8 /* 09AD70 8009A170 8FA60068 */ lw $a2, 0x68($sp) /* 09AD74 8009A174 2409FFFF */ li $t1, -1 diff --git a/src/unknown_080500.c b/src/unknown_080500.c index a072dedd..f20bed30 100644 --- a/src/unknown_080500.c +++ b/src/unknown_080500.c @@ -1070,7 +1070,7 @@ s32 D_800E16C4[12] = { 0, 0x00000000 }; -s32 *D_800E16F0[5] = { +s32 *D_800E16F4[5] = { D_800E153C, D_800E1594, D_800E15EC, D_800E1644, D_800E169C }; @@ -1157,7 +1157,7 @@ u16 D_800E18FC[30] = { }; // Credits text look-up table -char *D_800E1938[107] = { +char *D_800E1938[87] = { (char*)0x800E7D08, (char*)0x800E7D10, (char*)0x800E7D24, (char*)0x800E7D30, (char*)0x800E7D44, (char*)0x800E7D50, (char*)0x800E7D58, (char*)0x800E7D60, (char*)0x800E7D70, (char*)0x800E7D7C, (char*)0x800E7D88, (char*)0x800E7D94, @@ -1179,12 +1179,16 @@ char *D_800E1938[107] = { (char*)0x800E8080, (char*)0x800E8088, (char*)0x800E8094, (char*)0x800E80A8, (char*)0x800E80B4, (char*)0x800E80C0, (char*)0x800E80CC, (char*)0x800E80DC, (char*)0x800E80E8, (char*)0x800E80F4, (char*)0x800E8100, (char*)0x800E8114, - (char*)0x00000000, (char*)0x00000000, (char*)0x00000000, (char*)0x800E8120, - (char*)0x800E8128, (char*)0x800E8130, (char*)0x800E8138, (char*)0x800E8140, - (char*)0x800E8148, (char*)0x800E8150, (char*)0x800E8158, (char*)0x800E8160, - (char*)0x800E8168, (char*)0x800E8170, (char*)0x800E8178, (char*)0x800E8180, - (char*)0x800E8188, (char*)0x800E8190, (char*)0x800E8198, (char*)0x800E81A0, - (char*)0x800E81A8, (char*)0x800E81B0, (char*)0x800E81B8 + (char*)0x00000000, (char*)0x00000000, (char*)0x00000000 +}; + +// Credits text look-up table (time trials time sheet) +char *D_800E1A94[20] = { + (char*)0x800E8120, (char*)0x800E8128, (char*)0x800E8130, (char*)0x800E8138, + (char*)0x800E8140, (char*)0x800E8148, (char*)0x800E8150, (char*)0x800E8158, + (char*)0x800E8160, (char*)0x800E8168, (char*)0x800E8170, (char*)0x800E8178, + (char*)0x800E8180, (char*)0x800E8188, (char*)0x800E8190, (char*)0x800E8198, + (char*)0x800E81A0, (char*)0x800E81A8, (char*)0x800E81B0, (char*)0x800E81B8 }; // Another credits text look-up table diff --git a/undefined_syms.txt b/undefined_syms.txt index 9a51ae94..e9560c95 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -535,6 +535,7 @@ D_800E1644 = 0x800E1644; D_800E166C = 0x800E166C; D_800E169C = 0x800E169C; D_800E16C4 = 0x800E16C4; +D_800E16F4 = 0x800E16F4; D_800E1708 = 0x800E1708; D_800E174C = 0x800E174C; D_800E1754 = 0x800E1754; @@ -545,6 +546,7 @@ D_800E17F0 = 0x800E17F0; D_800E17F4 = 0x800E17F4; D_800E18F8 = 0x800E18F8; D_800E1938 = 0x800E1938; +D_800E1A94 = 0x800E1A94; D_800E1AE4 = 0x800E1AE4; D_800E1AF8 = 0x800E1AF8; D_800E1B4C = 0x800E1B4C;