From c0311585e4561a1aa0fa8dc5569d41c74ccc7db8 Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Sun, 30 May 2021 16:12:10 -0700 Subject: [PATCH] Added more glabels with upper address loaded via li. --- asm/non_matchings/unknown_005740/func_80005254.s | 3 ++- asm/non_matchings/unknown_005740/func_80006FC8.s | 2 +- asm/non_matchings/unknown_032760/func_80033C08.s | 2 +- asm/non_matchings/unknown_032760/func_80039330.s | 2 +- asm/non_matchings/unknown_043920/func_80046524.s | 2 +- asm/non_matchings/unknown_043920/func_8004C2B0.s | 3 ++- asm/non_matchings/unknown_043920/func_80054FD0.s | 2 +- asm/non_matchings/unknown_080500/func_80095728.s | 6 +++--- asm/non_matchings/unknown_09F8F0/func_800A8474.s | 11 +++++++---- asm/non_matchings/unknown_09F8F0/func_800AA600.s | 3 ++- asm/non_matchings/unknown_0B8920/func_800BB2F4.s | 10 +++++----- asm/non_matchings/unknown_0B8920/func_800C3158.s | 2 +- 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80005254.s b/asm/non_matchings/unknown_005740/func_80005254.s index d221a88f..4ddaf169 100644 --- a/asm/non_matchings/unknown_005740/func_80005254.s +++ b/asm/non_matchings/unknown_005740/func_80005254.s @@ -310,7 +310,8 @@ glabel func_80005254 /* 0062C4 800056C4 3C014080 */ lui $at, 0x4080 /* 0062C8 800056C8 13000010 */ beqz $t8, .L8000570C /* 0062CC 800056CC 3C088012 */ lui $t0, %hi(D_80119C3C) # $t0, 0x8012 -/* 0062D0 800056D0 3C01800E */ li $at, 0x800E0000 # -0.000000 +# Used to access D_800E4C18 and D_800E4C1C. +/* 0062D0 800056D0 3C01800E */ lui $at, %hi(D_800E4C18) # $at, 0x800e /* 0062D4 800056D4 C4274C18 */ lwc1 $f7, %lo(D_800E4C18)($at) /* 0062D8 800056D8 C4264C1C */ lwc1 $f6, %lo(D_800E4C1C)($at) /* 0062DC 800056DC C4E40040 */ lwc1 $f4, 0x40($a3) diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index 3b5bfacb..29e715a6 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -105,7 +105,7 @@ glabel func_80006FC8 /* 007D54 80007154 8FA30070 */ lw $v1, 0x70($sp) /* 007D58 80007158 E5800084 */ swc1 $f0, 0x84($t4) /* 007D5C 8000715C 8E900000 */ lw $s0, ($s4) -/* 007D60 80007160 3C01800E */ li $at, 0x800E0000 # -0.000000 +/* 007D60 80007160 3C01800E */ lui $at, %hi(D_800E4CD0) # $at, 0x800e /* 007D64 80007164 C4304CD0 */ lwc1 $f16, %lo(D_800E4CD0)($at) /* 007D68 80007168 C6020084 */ lwc1 $f2, 0x84($s0) /* 007D6C 8000716C 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80033C08.s b/asm/non_matchings/unknown_032760/func_80033C08.s index c899ea08..133506a9 100644 --- a/asm/non_matchings/unknown_032760/func_80033C08.s +++ b/asm/non_matchings/unknown_032760/func_80033C08.s @@ -18,7 +18,7 @@ glabel func_80033C08 /* 034848 80033C48 3C018012 */ lui $at, %hi(D_8011D4C8) # $at, 0x8012 /* 03484C 80033C4C C48A007C */ lwc1 $f10, 0x7c($a0) /* 034850 80033C50 C432D4C8 */ lwc1 $f18, %lo(D_8011D4C8)($at) -/* 034854 80033C54 3C018012 */ li $at, 0x80120000 # -0.000000 +/* 034854 80033C54 3C018012 */ lui $at, %hi(D_8011D4CC) # $at, 0x8012 /* 034858 80033C58 44807000 */ mtc1 $zero, $f14 /* 03485C 80033C5C 46023202 */ mul.s $f8, $f6, $f2 /* 034860 80033C60 C4860080 */ lwc1 $f6, 0x80($a0) diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index db1f94c8..d042346e 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -612,7 +612,7 @@ glabel func_80039330 /* 03A808 80039C08 240E0007 */ li $t6, 7 /* 03A80C 80039C0C AE0E0078 */ sw $t6, 0x78($s0) .L80039C10: -/* 03A810 80039C10 3C01800E */ li $at, 0x800E0000 # -0.000000 +/* 03A810 80039C10 3C01800E */ lui $at, %hi(D_800E6148) # $at, 0x800e /* 03A814 80039C14 C42A6148 */ lwc1 $f10, %lo(D_800E6148)($at) /* 03A818 80039C18 24040111 */ li $a0, 273 /* 03A81C 80039C1C E62A0004 */ swc1 $f10, 4($s1) diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index 7ba43660..d8aa6cf7 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -1721,7 +1721,7 @@ glabel func_80046524 /* 048A6C 80047E6C 11E00007 */ beqz $t7, .L80047E8C /* 048A70 80047E70 00000000 */ nop /* 048A74 80047E74 C426D578 */ lwc1 $f6, %lo(D_8011D578)($at) -/* 048A78 80047E78 3C018012 */ li $at, 0x80120000 # -0.000000 +/* 048A78 80047E78 3C018012 */ lui $at, %hi(D_8011D57C) # $at, 0x8012 /* 048A7C 80047E7C E626001C */ swc1 $f6, 0x1c($s1) /* 048A80 80047E80 C428D57C */ lwc1 $f8, %lo(D_8011D57C)($at) /* 048A84 80047E84 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index d926beaa..c7c14ba1 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -507,7 +507,8 @@ glabel func_8004C2B0 /* 04D5F4 8004C9F4 3C014000 */ lui $at, 0x4000 /* 04D5F8 8004C9F8 45000009 */ bc1f .L8004CA20 /* 04D5FC 8004C9FC 00000000 */ nop -/* 04D600 8004CA00 3C01800E */ li $at, 0x800E0000 # -0.000000 +# Used to access D_800E6578 and D_800E657C. +/* 04D600 8004CA00 3C01800E */ lui $at, %hi(D_800E6578) # $at, 0x800e /* 04D604 8004CA04 C4296578 */ lwc1 $f9, %lo(D_800E6578)($at) /* 04D608 8004CA08 C428657C */ lwc1 $f8, %lo(D_800E657C)($at) /* 04D60C 8004CA0C 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80054FD0.s b/asm/non_matchings/unknown_043920/func_80054FD0.s index c24bb5a4..46f6029f 100644 --- a/asm/non_matchings/unknown_043920/func_80054FD0.s +++ b/asm/non_matchings/unknown_043920/func_80054FD0.s @@ -158,7 +158,7 @@ glabel func_80054FD0 /* 055E30 80055230 C7AA0160 */ lwc1 $f10, 0x160($sp) /* 055E34 80055234 E428D548 */ swc1 $f8, %lo(D_8011D548)($at) /* 055E38 80055238 C5040000 */ lwc1 $f4, ($t0) -/* 055E3C 8005523C 3C018012 */ li $at, 0x80120000 # -0.000000 +/* 055E3C 8005523C 3C018012 */ lui $at, %hi(D_8011D54C) # $at, 0x8012 /* 055E40 80055240 46045180 */ add.s $f6, $f10, $f4 /* 055E44 80055244 24180001 */ li $t8, 1 /* 055E48 80055248 E426D54C */ swc1 $f6, %lo(D_8011D54C)($at) diff --git a/asm/non_matchings/unknown_080500/func_80095728.s b/asm/non_matchings/unknown_080500/func_80095728.s index f4094a8b..3e826b7b 100644 --- a/asm/non_matchings/unknown_080500/func_80095728.s +++ b/asm/non_matchings/unknown_080500/func_80095728.s @@ -244,7 +244,7 @@ glabel func_80095728 /* 0966B0 80095AB0 0C020795 */ jal func_80081E54 /* 0966B4 80095AB4 AFAE0014 */ sw $t6, 0x14($sp) /* 0966B8 80095AB8 240F0003 */ li $t7, 3 -/* 0966BC 80095ABC 3C018012 */ li $at, 0x80120000 # -0.000000 +/* 0966BC 80095ABC 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 0966C0 80095AC0 10000314 */ b .L80096714 /* 0966C4 80095AC4 AC2F63E0 */ sw $t7, %lo(D_801263E0)($at) .L80095AC8: @@ -357,7 +357,7 @@ glabel func_80095728 /* 09686C 80095C6C 8C440050 */ lw $a0, 0x50($v0) /* 096870 80095C70 0C025DBE */ jal func_800976F8 /* 096874 80095C74 24060003 */ li $a2, 3 -/* 096878 80095C78 3C01800E */ li $at, 0x800E0000 # -0.000000 +/* 096878 80095C78 3C01800E */ lui $at, %hi(D_800E0FAC) # $at, 0x800e /* 09687C 80095C7C AC200FAC */ sw $zero, %lo(D_800E0FAC)($at) .L80095C80: /* 096880 80095C80 8FA20038 */ lw $v0, 0x38($sp) @@ -387,7 +387,7 @@ glabel func_80095728 /* 0968DC 80095CDC 0C020795 */ jal func_80081E54 /* 0968E0 80095CE0 AFB80014 */ sw $t8, 0x14($sp) /* 0968E4 80095CE4 24030005 */ li $v1, 5 -/* 0968E8 80095CE8 3C018012 */ li $at, 0x80120000 # -0.000000 +/* 0968E8 80095CE8 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 0968EC 80095CEC 10000289 */ b .L80096714 /* 0968F0 80095CF0 AC2363E0 */ sw $v1, %lo(D_801263E0)($at) .L80095CF4: diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 4f407e1b..70564f01 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -349,7 +349,8 @@ glabel func_800A8474 /* 0A958C 800A898C 44074000 */ mfc1 $a3, $f8 /* 0A9590 800A8990 44D8F800 */ ctc1 $t8, $31 /* 0A9594 800A8994 15800020 */ bnez $t4, .L800A8A18 -/* 0A9598 800A8998 3C01800F */ li $at, 0x800F0000 # -0.000000 +# Used to access D_800E87A0 and D_800E87A4. +/* 0A9598 800A8998 3C01800F */ lui $at, %hi(D_800E87A0) # $at, 0x800f /* 0A959C 800A899C C42187A0 */ lwc1 $f1, %lo(D_800E87A0)($at) /* 0A95A0 800A89A0 C42087A4 */ lwc1 $f0, %lo(D_800E87A4)($at) /* 0A95A4 800A89A4 8E420000 */ lw $v0, ($s2) @@ -572,7 +573,7 @@ glabel func_800A8474 /* 0A98D0 800A8CD0 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000 /* 0A98D4 800A8CD4 15400006 */ bnez $t2, .L800A8CF0 /* 0A98D8 800A8CD8 3C118012 */ lui $s1, %hi(D_80126CD5) # $s1, 0x8012 -/* 0A98DC 800A8CDC 3C01800F */ li $at, 0x800F0000 # -0.000000 +/* 0A98DC 800A8CDC 3C01800F */ lui $at, %hi(D_800E87A8) # $at, 0x800f /* 0A98E0 800A8CE0 C42487A8 */ lwc1 $f4, %lo(D_800E87A8)($at) /* 0A98E4 800A8CE4 8E4B0000 */ lw $t3, ($s2) /* 0A98E8 800A8CE8 10000006 */ b .L800A8D04 @@ -935,7 +936,8 @@ glabel func_800A8474 /* 0A9E54 800A9254 AFA60054 */ sw $a2, 0x54($sp) /* 0A9E58 800A9258 0C02917C */ jal func_800A45F0 /* 0A9E5C 800A925C AFA300D0 */ sw $v1, 0xd0($sp) -/* 0A9E60 800A9260 3C01800F */ li $at, 0x800F0000 # -0.000000 +# Used to access D_800E87B8 and D_800E87BC. +/* 0A9E60 800A9260 3C01800F */ lui $at, %hi(D_800E87B8) # $at, 0x800f /* 0A9E64 800A9264 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 /* 0A9E68 800A9268 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0A9E6C 800A926C C42187B8 */ lwc1 $f1, %lo(D_800E87B8)($at) @@ -1143,7 +1145,8 @@ glabel func_800A8474 /* 0AA160 800A9560 44053000 */ mfc1 $a1, $f6 /* 0AA164 800A9564 44D8F800 */ ctc1 $t8, $31 /* 0AA168 800A9568 1580003C */ bnez $t4, .L800A965C -/* 0AA16C 800A956C 3C01800F */ li $at, 0x800F0000 # -0.000000 +# Used to access D_800E87C0 and D_800E87C4. +/* 0AA16C 800A956C 3C01800F */ lui $at, %hi(D_800E87C0) # $at, 0x800f /* 0AA170 800A9570 C42187C0 */ lwc1 $f1, %lo(D_800E87C0)($at) /* 0AA174 800A9574 C42087C4 */ lwc1 $f0, %lo(D_800E87C4)($at) /* 0AA178 800A9578 8E420000 */ lw $v0, ($s2) diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index f9b36469..111c35b2 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -357,7 +357,8 @@ glabel func_800AA600 /* 0AB73C 800AAB3C 01CF0019 */ multu $t6, $t7 /* 0AB740 800AAB40 A7A00076 */ sh $zero, 0x76($sp) /* 0AB744 800AAB44 AFA00078 */ sw $zero, 0x78($sp) -/* 0AB748 800AAB48 3C01800F */ li $at, 0x800F0000 # -0.000000 +# Used to access D_800E87E0 and D_800E87E4. +/* 0AB748 800AAB48 3C01800F */ lui $at, %hi(D_800E87E0) # $at, 0x800f /* 0AB74C 800AAB4C C43387E0 */ lwc1 $f19, %lo(D_800E87E0)($at) /* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E4)($at) /* 0AB754 800AAB54 3C18800E */ lui $t8, %hi(D_800E2834) # $t8, 0x800e diff --git a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s b/asm/non_matchings/unknown_0B8920/func_800BB2F4.s index b7cfc38c..4fceaaef 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s +++ b/asm/non_matchings/unknown_0B8920/func_800BB2F4.s @@ -30,7 +30,7 @@ glabel func_800BB2F4 /* 0BBF5C 800BB35C 3C018013 */ lui $at, %hi(D_8012A0BC) # $at, 0x8013 /* 0BBF60 800BB360 46805120 */ cvt.s.w $f4, $f10 /* 0BBF64 800BB364 C426A0BC */ lwc1 $f6, %lo(D_8012A0BC)($at) -/* 0BBF68 800BB368 3C018013 */ li $at, 0x80130000 # -0.000000 +/* 0BBF68 800BB368 3C018013 */ lui $at, %hi(D_8012A0B8) # $at, 0x8013 /* 0BBF6C 800BB36C C428A0B8 */ lwc1 $f8, %lo(D_8012A0B8)($at) /* 0BBF70 800BB370 3C098013 */ lui $t1, %hi(D_80129FC8) # $t1, 0x8013 /* 0BBF74 800BB374 25299FC8 */ addiu $t1, %lo(D_80129FC8) # addiu $t1, $t1, -0x6038 @@ -352,7 +352,7 @@ glabel func_800BB2F4 /* 0BC424 800BB824 10200009 */ beqz $at, .L800BB84C /* 0BC428 800BB828 24840001 */ addiu $a0, $a0, 1 /* 0BC42C 800BB82C 44825000 */ mtc1 $v0, $f10 -/* 0BC430 800BB830 3C018013 */ li $at, 0x80130000 # -0.000000 +/* 0BC430 800BB830 3C018013 */ lui $at, %hi(D_8012A00C) # $at, 0x8013 /* 0BC434 800BB834 468051A0 */ cvt.s.w $f6, $f10 /* 0BC438 800BB838 C424A00C */ lwc1 $f4, %lo(D_8012A00C)($at) /* 0BC43C 800BB83C 46103202 */ mul.s $f8, $f6, $f16 @@ -404,7 +404,7 @@ glabel func_800BB2F4 /* 0BC4E8 800BB8E8 10200009 */ beqz $at, .L800BB910 /* 0BC4EC 800BB8EC 00000000 */ nop /* 0BC4F0 800BB8F0 44823000 */ mtc1 $v0, $f6 -/* 0BC4F4 800BB8F4 3C018013 */ li $at, 0x80130000 # -0.000000 +/* 0BC4F4 800BB8F4 3C018013 */ lui $at, %hi(D_8012A00C) # $at, 0x8013 /* 0BC4F8 800BB8F8 46803120 */ cvt.s.w $f4, $f6 /* 0BC4FC 800BB8FC C42AA00C */ lwc1 $f10, %lo(D_8012A00C)($at) /* 0BC500 800BB900 46102202 */ mul.s $f8, $f4, $f16 @@ -590,7 +590,7 @@ glabel func_800BB2F4 /* 0BC7A8 800BBBA8 1020000A */ beqz $at, .L800BBBD4 /* 0BC7AC 800BBBAC 03E3082A */ slt $at, $ra, $v1 /* 0BC7B0 800BBBB0 44824000 */ mtc1 $v0, $f8 -/* 0BC7B4 800BBBB4 3C018013 */ li $at, 0x80130000 # -0.000000 +/* 0BC7B4 800BBBB4 3C018013 */ lui $at, %hi(D_8012A00C) # $at, 0x8013 /* 0BC7B8 800BBBB8 46804120 */ cvt.s.w $f4, $f8 /* 0BC7BC 800BBBBC C426A00C */ lwc1 $f6, %lo(D_8012A00C)($at) /* 0BC7C0 800BBBC0 46102282 */ mul.s $f10, $f4, $f16 @@ -649,7 +649,7 @@ glabel func_800BB2F4 /* 0BC884 800BBC84 10200009 */ beqz $at, .L800BBCAC /* 0BC888 800BBC88 00000000 */ nop /* 0BC88C 800BBC8C 44822000 */ mtc1 $v0, $f4 -/* 0BC890 800BBC90 3C018013 */ li $at, 0x80130000 # -0.000000 +/* 0BC890 800BBC90 3C018013 */ lui $at, %hi(D_8012A00C) # $at, 0x8013 /* 0BC894 800BBC94 468021A0 */ cvt.s.w $f6, $f4 /* 0BC898 800BBC98 C428A00C */ lwc1 $f8, %lo(D_8012A00C)($at) /* 0BC89C 800BBC9C 46103282 */ mul.s $f10, $f6, $f16 diff --git a/asm/non_matchings/unknown_0B8920/func_800C3158.s b/asm/non_matchings/unknown_0B8920/func_800C3158.s index 79e32ac6..113fca53 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3158.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3158.s @@ -14,7 +14,7 @@ glabel func_800C3158 /* 0C3D88 800C3188 35E10003 */ ori $at, $t7, 3 /* 0C3D8C 800C318C 38210002 */ xori $at, $at, 2 /* 0C3D90 800C3190 44C1F800 */ ctc1 $at, $31 -/* 0C3D94 800C3194 3C01800E */ li $at, 0x800E0000 # -0.000000 +/* 0C3D94 800C3194 3C01800E */ lui $at, %hi(D_800E3678) # $at, 0x800E /* 0C3D98 800C3198 462042A4 */ cvt.w.d $f10, $f8 /* 0C3D9C 800C319C 44CFF800 */ ctc1 $t7, $31 /* 0C3DA0 800C31A0 1000000F */ b .L800C31E0