From 8fcd1d03da18c6f2c8fc337bc56c839090b84d5b Mon Sep 17 00:00:00 2001 From: David Benepe Date: Mon, 7 Jun 2021 01:35:32 -0500 Subject: [PATCH] Cleared data/rodata addresses from undefined_syms. Now it is onto bss! --- .../unknown_005740/func_80005254.s | 36 +- .../unknown_005740/func_80005D08.s | 14 +- .../unknown_005740/func_800063EC.s | 10 +- .../unknown_005740/func_80006BFC.s | 12 +- .../unknown_005740/func_80006FC8.s | 12 +- .../unknown_005740/func_80007FA4.s | 4 +- .../unknown_005740/func_800099EC.s | 4 +- .../unknown_005740/func_80009AB4.s | 4 +- .../unknown_00BC20/func_80011570.s | 12 +- .../unknown_00BC20/func_80013A0C.s | 4 +- .../unknown_00BC20/func_800159C8.s | 32 +- .../unknown_00BC20/func_80016748.s | 8 +- .../unknown_00BC20/func_80017A18.s | 10 +- .../unknown_00BC20/func_800185E4.s | 8 +- .../unknown_00BC20/func_8001955C.s | 4 +- .../unknown_00BC20/func_8001C6C4.s | 8 +- .../unknown_00BC20/func_8001EFA4.s | 2 +- .../unknown_00BC20/func_8001F460.s | 8 +- .../unknown_0255E0/func_8002581C.s | 4 +- .../unknown_0255E0/func_80026070.s | 8 +- .../unknown_0255E0/func_80026430.s | 12 +- .../unknown_0255E0/func_80027568.s | 6 +- .../unknown_0255E0/func_80028FAC.s | 4 +- .../unknown_0255E0/func_8002A5F8.s | 4 +- .../unknown_0255E0/func_8002A900.s | 6 +- .../unknown_0255E0/func_8002DE30.s | 4 +- .../unknown_032760/func_80033F60.s | 12 +- .../unknown_032760/func_80034860.s | 4 +- .../unknown_032760/func_80035260.s | 10 +- .../unknown_032760/func_800361E0.s | 16 +- .../unknown_032760/func_800389B8.s | 4 +- .../unknown_032760/func_80038AD4.s | 4 +- .../unknown_032760/func_80039330.s | 18 +- .../unknown_032760/func_8003B4BC.s | 4 +- .../unknown_032760/func_8003B988.s | 8 +- .../unknown_032760/func_8003CA68.s | 4 +- .../unknown_032760/func_8003D2B8.s | 4 +- .../unknown_032760/func_8003D5A0.s | 8 +- .../unknown_032760/func_8003E140.s | 6 +- .../unknown_032760/func_8003E694.s | 4 +- .../unknown_032760/func_8003EDD8.s | 4 +- .../unknown_032760/func_8003F2E8.s | 4 +- .../unknown_032760/func_800422F0.s | 4 +- .../unknown_043920/func_80042D20.s | 56 ++-- .../unknown_043920/func_8004447C.s | 4 +- .../unknown_043920/func_800452A0.s | 4 +- .../unknown_043920/func_80046524.s | 78 ++--- .../unknown_043920/func_80048C7C.s | 8 +- .../unknown_043920/func_80048E64.s | 4 +- .../unknown_043920/func_800494E0.s | 4 +- .../unknown_043920/func_80049794.s | 60 ++-- .../unknown_043920/func_8004C140.s | 4 +- .../unknown_043920/func_8004C2B0.s | 16 +- .../unknown_043920/func_8004DE38.s | 10 +- .../unknown_043920/func_8004F7F4.s | 28 +- .../unknown_043920/func_80050A28.s | 66 ++-- .../unknown_043920/func_80052B64.s | 4 +- .../unknown_043920/func_80052D7C.s | 38 +-- .../unknown_043920/func_80053478.s | 8 +- .../unknown_043920/func_80053750.s | 12 +- .../unknown_043920/func_80053E9C.s | 4 +- .../unknown_043920/func_80054110.s | 16 +- .../unknown_043920/func_8005492C.s | 32 +- .../unknown_043920/func_80054FD0.s | 6 +- .../unknown_043920/func_80055EC0.s | 2 +- .../unknown_043920/func_80057A40.s | 16 +- .../unknown_043920/func_800581E8.s | 8 +- .../unknown_043920/func_80059208.s | 4 +- .../unknown_043920/func_80059790.s | 4 +- .../unknown_043920/func_80059E40.s | 8 +- .../unknown_043920/func_8005A6F0.s | 18 +- .../unknown_043920/func_8005B818.s | 28 +- .../unknown_05CEF0/func_8005C364.s | 16 +- .../unknown_05DCD0/func_8005D0D0.s | 16 +- .../unknown_05DCD0/func_8005D820.s | 28 +- .../unknown_05F0C0/func_8005E4C0.s | 8 +- .../unknown_05F690/func_8005EA90.s | 24 +- .../unknown_05F690/func_8005F310.s | 10 +- .../unknown_065D30/__timeToSamplesNoRound.s | 4 +- .../unknown_072E50/func_80072578.s | 4 +- .../unknown_072E50/func_80072718.s | 8 +- .../unknown_072E50/func_80074EB8.s | 5 +- .../unknown_072E50/func_80075000.s | 10 +- .../unknown_072E50/func_800753D8.s | 10 +- .../unknown_072E50/func_800756D4.s | 5 +- .../unknown_080500/MenuLogoScreenLoop.s | 12 +- .../unknown_080500/func_8008FA54.s | 4 +- .../unknown_080500/func_800904E8.s | 8 +- .../unknown_09F8F0/func_8009F034.s | 12 +- .../unknown_09F8F0/func_800A14F0.s | 8 +- .../unknown_09F8F0/func_800A1E48.s | 4 +- .../unknown_09F8F0/func_800A277C.s | 4 +- .../unknown_09F8F0/func_800A6254.s | 8 +- .../unknown_09F8F0/func_800A7520.s | 16 +- .../unknown_09F8F0/func_800A8474.s | 16 +- .../unknown_09F8F0/func_800AA600.s | 4 +- .../unknown_0AEE70/func_800B0010.s | 16 +- .../unknown_0AEE70/func_800B03C0.s | 8 +- .../unknown_0AEE70/func_800B1130.s | 8 +- .../unknown_0CA9A0/func_800CB2D4.s | 4 +- src/unknown_001050.c | 2 +- src/unknown_072E50.c | 3 +- src/unknown_0B7A50.c | 9 +- tools/python/generate_ld.py | 12 + tools/python/undefined_sym_fix.py | 25 +- undefined_syms.txt | 313 ------------------ 106 files changed, 632 insertions(+), 920 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80005254.s b/asm/non_matchings/unknown_005740/func_80005254.s index 3e248ea7..c6e6aac3 100644 --- a/asm/non_matchings/unknown_005740/func_80005254.s +++ b/asm/non_matchings/unknown_005740/func_80005254.s @@ -85,9 +85,9 @@ glabel func_80005254 /* 005F28 80005328 00000000 */ nop /* 005F2C 8000532C 24100064 */ li $s0, 100 .L80005330: -/* 005F30 80005330 3C01800E */ lui $at, %hi(D_800E4BFC) # $at, 0x800e +/* 005F30 80005330 3C01800E */ lui $at, %hi(D_800E4BF8 + 4) # $at, 0x800e /* 005F34 80005334 C4354BF8 */ lwc1 $f21, %lo(D_800E4BF8)($at) -/* 005F38 80005338 C4344BFC */ lwc1 $f20, %lo(D_800E4BFC)($at) +/* 005F38 80005338 C4344BFC */ lwc1 $f20, %lo(D_800E4BF8 + 4)($at) /* 005F3C 8000533C 8CE79C38 */ lw $a3, %lo(D_80119C38)($a3) /* 005F40 80005340 26319C38 */ addiu $s1, %lo(D_80119C38) # addiu $s1, $s1, -0x63c8 .L80005344: @@ -270,10 +270,10 @@ glabel func_80005254 /* 0061D0 800055D0 00401825 */ move $v1, $v0 .L800055D4: /* 0061D4 800055D4 44835000 */ mtc1 $v1, $f10 -/* 0061D8 800055D8 3C01800E */ lui $at, %hi(D_800E4C0C) # $at, 0x800e +/* 0061D8 800055D8 3C01800E */ lui $at, %hi(D_800E4C08 + 4) # $at, 0x800e /* 0061DC 800055DC 468051A1 */ cvt.d.w $f6, $f10 /* 0061E0 800055E0 C4254C08 */ lwc1 $f5, %lo(D_800E4C08)($at) -/* 0061E4 800055E4 C4244C0C */ lwc1 $f4, %lo(D_800E4C0C)($at) +/* 0061E4 800055E4 C4244C0C */ lwc1 $f4, %lo(D_800E4C08 + 4)($at) /* 0061E8 800055E8 C4EC003C */ lwc1 $f12, 0x3c($a3) /* 0061EC 800055EC 46262002 */ mul.d $f0, $f4, $f6 /* 0061F0 800055F0 460060A1 */ cvt.d.s $f2, $f12 @@ -315,10 +315,10 @@ glabel func_80005254 /* 006274 80005674 10000012 */ b .L800056C0 /* 006278 80005678 460C4080 */ add.s $f2, $f8, $f12 .L8000567C: -/* 00627C 8000567C 3C01800E */ lui $at, %hi(D_800E4C14) # $at, 0x800e +/* 00627C 8000567C 3C01800E */ lui $at, %hi(D_800E4C10 + 4) # $at, 0x800e /* 006280 80005680 C4EA003C */ lwc1 $f10, 0x3c($a3) /* 006284 80005684 C4274C10 */ lwc1 $f7, %lo(D_800E4C10)($at) -/* 006288 80005688 C4264C14 */ lwc1 $f6, %lo(D_800E4C14)($at) +/* 006288 80005688 C4264C14 */ lwc1 $f6, %lo(D_800E4C10 + 4)($at) /* 00628C 8000568C 46005121 */ cvt.d.s $f4, $f10 /* 006290 80005690 46262202 */ mul.d $f8, $f4, $f6 /* 006294 80005694 46109101 */ sub.s $f4, $f18, $f16 @@ -337,10 +337,10 @@ 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 -# Used to access D_800E4C18 and D_800E4C1C. +# Used to access D_800E4C18 and D_800E4C18 + 4. /* 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) +/* 0062D8 800056D8 C4264C1C */ lwc1 $f6, %lo(D_800E4C18 + 4)($at) /* 0062DC 800056DC C4E40040 */ lwc1 $f4, 0x40($a3) /* 0062E0 800056E0 3C014020 */ li $at, 0x40200000 # 2.500000 /* 0062E4 800056E4 46002021 */ cvt.d.s $f0, $f4 @@ -370,9 +370,9 @@ glabel func_80005254 /* 00633C 8000573C 850D0000 */ lh $t5, ($t0) /* 006340 80005740 2401FFFF */ li $at, -1 /* 006344 80005744 11A10006 */ beq $t5, $at, .L80005760 -/* 006348 80005748 3C01800E */ lui $at, %hi(D_800E4C24) # $at, 0x800e +/* 006348 80005748 3C01800E */ lui $at, %hi(D_800E4C20 + 4) # $at, 0x800e /* 00634C 8000574C C4254C20 */ lwc1 $f5, %lo(D_800E4C20)($at) -/* 006350 80005750 C4244C24 */ lwc1 $f4, %lo(D_800E4C24)($at) +/* 006350 80005750 C4244C24 */ lwc1 $f4, %lo(D_800E4C20 + 4)($at) /* 006354 80005754 460012A1 */ cvt.d.s $f10, $f2 /* 006358 80005758 46245180 */ add.d $f6, $f10, $f4 /* 00635C 8000575C 462030A0 */ cvt.s.d $f2, $f6 @@ -451,10 +451,10 @@ glabel func_80005254 /* 006470 80005870 80EF0090 */ lb $t7, 0x90($a3) /* 006474 80005874 44813000 */ mtc1 $at, $f6 /* 006478 80005878 448F4000 */ mtc1 $t7, $f8 -/* 00647C 8000587C 3C01800E */ lui $at, %hi(D_800E4C2C) # $at, 0x800e +/* 00647C 8000587C 3C01800E */ lui $at, %hi(D_800E4C28 + 4) # $at, 0x800e /* 006480 80005880 46804120 */ cvt.s.w $f4, $f8 /* 006484 80005884 C42B4C28 */ lwc1 $f11, %lo(D_800E4C28)($at) -/* 006488 80005888 C42A4C2C */ lwc1 $f10, %lo(D_800E4C2C)($at) +/* 006488 80005888 C42A4C2C */ lwc1 $f10, %lo(D_800E4C28 + 4)($at) /* 00648C 8000588C 46062003 */ div.s $f0, $f4, $f6 /* 006490 80005890 3C0140A0 */ li $at, 0x40A00000 # 5.000000 /* 006494 80005894 460061A1 */ cvt.d.s $f6, $f12 @@ -476,10 +476,10 @@ glabel func_80005254 /* 0064D0 800058D0 4500001A */ bc1f .L8000593C /* 0064D4 800058D4 00000000 */ nop /* 0064D8 800058D8 44985000 */ mtc1 $t8, $f10 -/* 0064DC 800058DC 3C01800E */ lui $at, %hi(D_800E4C34) # $at, 0x800e +/* 0064DC 800058DC 3C01800E */ lui $at, %hi(D_800E4C30 + 4) # $at, 0x800e /* 0064E0 800058E0 46805220 */ cvt.s.w $f8, $f10 /* 0064E4 800058E4 C4254C30 */ lwc1 $f5, %lo(D_800E4C30)($at) -/* 0064E8 800058E8 C4244C34 */ lwc1 $f4, %lo(D_800E4C34)($at) +/* 0064E8 800058E8 C4244C34 */ lwc1 $f4, %lo(D_800E4C30 + 4)($at) /* 0064EC 800058EC 460041A1 */ cvt.d.s $f6, $f8 /* 0064F0 800058F0 46243282 */ mul.d $f10, $f6, $f4 /* 0064F4 800058F4 3C01800E */ lui $at, %hi(D_800E4C38) # $at, 0x800e @@ -510,10 +510,10 @@ glabel func_80005254 /* 006554 80005954 45000018 */ bc1f .L800059B8 /* 006558 80005958 00EA1021 */ addu $v0, $a3, $t2 /* 00655C 8000595C 44993000 */ mtc1 $t9, $f6 -/* 006560 80005960 3C01800E */ lui $at, %hi(D_800E4C44) # $at, 0x800e +/* 006560 80005960 3C01800E */ lui $at, %hi(D_800E4C40 + 4) # $at, 0x800e /* 006564 80005964 46803120 */ cvt.s.w $f4, $f6 /* 006568 80005968 C4294C40 */ lwc1 $f9, %lo(D_800E4C40)($at) -/* 00656C 8000596C C4284C44 */ lwc1 $f8, %lo(D_800E4C44)($at) +/* 00656C 8000596C C4284C44 */ lwc1 $f8, %lo(D_800E4C40 + 4)($at) /* 006570 80005970 460022A1 */ cvt.d.s $f10, $f4 /* 006574 80005974 46285182 */ mul.d $f6, $f10, $f8 /* 006578 80005978 46000121 */ cvt.d.s $f4, $f0 @@ -573,10 +573,10 @@ glabel func_80005254 /* 006640 80005A40 1720000F */ bnez $t9, .L80005A80 /* 006644 80005A44 31AE4000 */ andi $t6, $t5, 0x4000 /* 006648 80005A48 11C0000D */ beqz $t6, .L80005A80 -/* 00664C 80005A4C 3C01800E */ lui $at, %hi(D_800E4C4C) # $at, 0x800e +/* 00664C 80005A4C 3C01800E */ lui $at, %hi(D_800E4C48 + 4) # $at, 0x800e /* 006650 80005A50 C508002C */ lwc1 $f8, 0x2c($t0) /* 006654 80005A54 C42B4C48 */ lwc1 $f11, %lo(D_800E4C48)($at) -/* 006658 80005A58 C42A4C4C */ lwc1 $f10, %lo(D_800E4C4C)($at) +/* 006658 80005A58 C42A4C4C */ lwc1 $f10, %lo(D_800E4C48 + 4)($at) /* 00665C 80005A5C 46004121 */ cvt.d.s $f4, $f8 /* 006660 80005A60 4624503C */ c.lt.d $f10, $f4 /* 006664 80005A64 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80005D08.s b/asm/non_matchings/unknown_005740/func_80005D08.s index 7047a012..b7414355 100644 --- a/asm/non_matchings/unknown_005740/func_80005D08.s +++ b/asm/non_matchings/unknown_005740/func_80005D08.s @@ -195,7 +195,7 @@ glabel func_80005D08 /* 006B98 80005F98 44805000 */ mtc1 $zero, $f10 /* 006B9C 80005F9C 46008221 */ cvt.d.s $f8, $f16 /* 006BA0 80005FA0 46285032 */ c.eq.d $f10, $f8 -# Used to access D_800E4C58 and D_800E4C5C. +# Used to access D_800E4C58 and D_800E4C58 + 4. /* 006BA4 80005FA4 3C01800E */ lui $at, %hi(D_800E4C58) # $at, 0x800e /* 006BA8 80005FA8 45010034 */ bc1t .L8000607C /* 006BAC 80005FAC 00000000 */ nop @@ -212,10 +212,10 @@ glabel func_80005D08 /* 006BD8 80005FD8 00402825 */ move $a1, $v0 .L80005FDC: /* 006BDC 80005FDC 44853000 */ mtc1 $a1, $f6 -/* 006BE0 80005FE0 3C01800E */ lui $at, %hi(D_800E4C5C) # $at, 0x800e +/* 006BE0 80005FE0 3C01800E */ lui $at, %hi(D_800E4C58 + 4) # $at, 0x800e /* 006BE4 80005FE4 468032A1 */ cvt.d.w $f10, $f6 /* 006BE8 80005FE8 C4254C50 */ lwc1 $f5, %lo(D_800E4C50)($at) -/* 006BEC 80005FEC C4244C54 */ lwc1 $f4, %lo(D_800E4C54)($at) +/* 006BEC 80005FEC C4244C54 */ lwc1 $f4, %lo(D_800E4C50 + 4)($at) /* 006BF0 80005FF0 8D230000 */ lw $v1, ($t1) /* 006BF4 80005FF4 462A2002 */ mul.d $f0, $f4, $f10 /* 006BF8 80005FF8 C46C003C */ lwc1 $f12, 0x3c($v1) @@ -257,7 +257,7 @@ glabel func_80005D08 /* 006C7C 8000607C 8D230000 */ lw $v1, ($t1) /* 006C80 80006080 C4294C58 */ lwc1 $f9, %lo(D_800E4C58)($at) /* 006C84 80006084 C464003C */ lwc1 $f4, 0x3c($v1) -/* 006C88 80006088 C4284C5C */ lwc1 $f8, %lo(D_800E4C5C)($at) +/* 006C88 80006088 C4284C5C */ lwc1 $f8, %lo(D_800E4C58 + 4)($at) /* 006C8C 8000608C 460022A1 */ cvt.d.s $f10, $f4 /* 006C90 80006090 46285182 */ mul.d $f6, $f10, $f8 /* 006C94 80006094 3C048012 */ lui $a0, %hi(D_80119C3C) # $a0, 0x8012 @@ -293,9 +293,9 @@ glabel func_80005D08 /* 006D08 80006108 C7AE001C */ lwc1 $f14, 0x1c($sp) /* 006D0C 8000610C 14400007 */ bnez $v0, .L8000612C /* 006D10 80006110 25299C38 */ addiu $t1, %lo(D_80119C38) # addiu $t1, $t1, -0x63c8 -/* 006D14 80006114 3C01800E */ lui $at, %hi(D_800E4C64) # $at, 0x800e +/* 006D14 80006114 3C01800E */ lui $at, %hi(D_800E4C60 + 4) # $at, 0x800e /* 006D18 80006118 C4254C60 */ lwc1 $f5, %lo(D_800E4C60)($at) -/* 006D1C 8000611C C4244C64 */ lwc1 $f4, %lo(D_800E4C64)($at) +/* 006D1C 8000611C C4244C64 */ lwc1 $f4, %lo(D_800E4C60 + 4)($at) /* 006D20 80006120 460071A1 */ cvt.d.s $f6, $f14 /* 006D24 80006124 46243280 */ add.d $f10, $f6, $f4 /* 006D28 80006128 462053A0 */ cvt.s.d $f14, $f10 @@ -310,7 +310,7 @@ glabel func_80005D08 /* 006D48 80006148 46060100 */ add.s $f4, $f0, $f6 /* 006D4C 8000614C E464005C */ swc1 $f4, 0x5c($v1) /* 006D50 80006150 8D230000 */ lw $v1, ($t1) -/* 006D54 80006154 C42A4C6C */ lwc1 $f10, %lo(D_800E4C6C)($at) +/* 006D54 80006154 C42A4C6C */ lwc1 $f10, %lo(D_800E4C68 + 4)($at) /* 006D58 80006158 C460005C */ lwc1 $f0, 0x5c($v1) /* 006D5C 8000615C C42B4C68 */ lwc1 $f11, %lo(D_800E4C68)($at) /* 006D60 80006160 46000221 */ cvt.d.s $f8, $f0 diff --git a/asm/non_matchings/unknown_005740/func_800063EC.s b/asm/non_matchings/unknown_005740/func_800063EC.s index 0729b783..42836050 100644 --- a/asm/non_matchings/unknown_005740/func_800063EC.s +++ b/asm/non_matchings/unknown_005740/func_800063EC.s @@ -344,7 +344,7 @@ glabel func_800063EC /* 0074A4 800068A4 46049182 */ mul.s $f6, $f18, $f4 /* 0074A8 800068A8 46009221 */ cvt.d.s $f8, $f18 /* 0074AC 800068AC 46285032 */ c.eq.d $f10, $f8 -# Used to access D_800E4C88 and D_800E4C8C. +# Used to access D_800E4C88 and D_800E4C88 + 4. /* 0074B0 800068B0 3C01800E */ lui $at, %hi(D_800E4C88) # $at, 0x800e /* 0074B4 800068B4 45010032 */ bc1t .L80006980 /* 0074B8 800068B8 46067380 */ add.s $f14, $f14, $f6 @@ -361,10 +361,10 @@ glabel func_800063EC /* 0074E4 800068E4 00402025 */ move $a0, $v0 .L800068E8: /* 0074E8 800068E8 44843000 */ mtc1 $a0, $f6 -/* 0074EC 800068EC 3C01800E */ lui $at, %hi(D_800E4C8C) # $at, 0x800e +/* 0074EC 800068EC 3C01800E */ lui $at, %hi(D_800E4C88 + 4) # $at, 0x800e /* 0074F0 800068F0 468032A1 */ cvt.d.w $f10, $f6 /* 0074F4 800068F4 C4254C80 */ lwc1 $f5, %lo(D_800E4C80)($at) -/* 0074F8 800068F8 C4244C84 */ lwc1 $f4, %lo(D_800E4C84)($at) +/* 0074F8 800068F8 C4244C84 */ lwc1 $f4, %lo(D_800E4C80 + 4)($at) /* 0074FC 800068FC C46C003C */ lwc1 $f12, 0x3c($v1) /* 007500 80006900 462A2002 */ mul.d $f0, $f4, $f10 /* 007504 80006904 460060A1 */ cvt.d.s $f2, $f12 @@ -403,7 +403,7 @@ glabel func_800063EC .L80006980: /* 007580 80006980 C464003C */ lwc1 $f4, 0x3c($v1) /* 007584 80006984 C4294C88 */ lwc1 $f9, %lo(D_800E4C88)($at) -/* 007588 80006988 C4284C8C */ lwc1 $f8, %lo(D_800E4C8C)($at) +/* 007588 80006988 C4284C8C */ lwc1 $f8, %lo(D_800E4C88 + 4)($at) /* 00758C 8000698C 460022A1 */ cvt.d.s $f10, $f4 /* 007590 80006990 46285182 */ mul.d $f6, $f10, $f8 /* 007594 80006994 46203120 */ cvt.s.d $f4, $f6 @@ -423,7 +423,7 @@ glabel func_800063EC /* 0075C8 800069C8 46040280 */ add.s $f10, $f0, $f4 /* 0075CC 800069CC E46A005C */ swc1 $f10, 0x5c($v1) /* 0075D0 800069D0 8D230000 */ lw $v1, ($t1) -/* 0075D4 800069D4 C4284C94 */ lwc1 $f8, %lo(D_800E4C94)($at) +/* 0075D4 800069D4 C4284C94 */ lwc1 $f8, %lo(D_800E4C90 + 4)($at) /* 0075D8 800069D8 C466005C */ lwc1 $f6, 0x5c($v1) /* 0075DC 800069DC C4294C90 */ lwc1 $f9, %lo(D_800E4C90)($at) /* 0075E0 800069E0 46003121 */ cvt.d.s $f4, $f6 diff --git a/asm/non_matchings/unknown_005740/func_80006BFC.s b/asm/non_matchings/unknown_005740/func_80006BFC.s index 5f2c3a84..7ee51b5d 100644 --- a/asm/non_matchings/unknown_005740/func_80006BFC.s +++ b/asm/non_matchings/unknown_005740/func_80006BFC.s @@ -173,13 +173,13 @@ glabel func_80006BFC /* 007A48 80006E48 3C01428C */ li $at, 0x428C0000 # 70.000000 /* 007A4C 80006E4C 44816000 */ mtc1 $at, $f12 /* 007A50 80006E50 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 007A54 80006E54 3C01800E */ lui $at, %hi(D_800E4CA4) # $at, 0x800e +/* 007A54 80006E54 3C01800E */ lui $at, %hi(D_800E4CA0 + 4) # $at, 0x800e /* 007A58 80006E58 46026100 */ add.s $f4, $f12, $f2 /* 007A5C 80006E5C C4254CA0 */ lwc1 $f5, %lo(D_800E4CA0)($at) /* 007A60 80006E60 46026201 */ sub.s $f8, $f12, $f2 /* 007A64 80006E64 00000000 */ nop /* 007A68 80006E68 46082183 */ div.s $f6, $f4, $f8 -/* 007A6C 80006E6C C4244CA4 */ lwc1 $f4, %lo(D_800E4CA4)($at) +/* 007A6C 80006E6C C4244CA4 */ lwc1 $f4, %lo(D_800E4CA0 + 4)($at) /* 007A70 80006E70 460002A1 */ cvt.d.s $f10, $f0 /* 007A74 80006E74 46245202 */ mul.d $f8, $f10, $f4 /* 007A78 80006E78 444CF800 */ cfc1 $t4, $31 @@ -228,16 +228,16 @@ glabel func_80006BFC /* 007B24 80006F24 E4460068 */ swc1 $f6, 0x68($v0) /* 007B28 80006F28 3C028012 */ lui $v0, %hi(D_80119C38) # $v0, 0x8012 /* 007B2C 80006F2C 8C429C38 */ lw $v0, %lo(D_80119C38)($v0) -/* 007B30 80006F30 C42A4CAC */ lwc1 $f10, %lo(D_800E4CAC)($at) +/* 007B30 80006F30 C42A4CAC */ lwc1 $f10, %lo(D_800E4CA8 + 4)($at) /* 007B34 80006F34 C4480068 */ lwc1 $f8, 0x68($v0) /* 007B38 80006F38 C42B4CA8 */ lwc1 $f11, %lo(D_800E4CA8)($at) /* 007B3C 80006F3C 46004321 */ cvt.d.s $f12, $f8 /* 007B40 80006F40 462C503C */ c.lt.d $f10, $f12 -# Used to access D_800E4CB8 and D_800E4CBC. +# Used to access D_800E4CB8 and D_800E4CB8 + 4. /* 007B44 80006F44 3C01800E */ lui $at, %hi(D_800E4CB8) # $at, 0x800e /* 007B48 80006F48 45000009 */ bc1f .L80006F70 /* 007B4C 80006F4C 00000000 */ nop -/* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CBC) # $at, 0x800e +/* 007B50 80006F50 3C01800E */ lui $at, %hi(D_800E4CB8 + 4) # $at, 0x800e /* 007B54 80006F54 C4244CB0 */ lwc1 $f4, %lo(D_800E4CB0)($at) /* 007B58 80006F58 00000000 */ nop /* 007B5C 80006F5C E4440068 */ swc1 $f4, 0x68($v0) @@ -247,7 +247,7 @@ glabel func_80006BFC /* 007B6C 80006F6C 846F0000 */ lh $t7, ($v1) .L80006F70: /* 007B70 80006F70 C4274CB8 */ lwc1 $f7, %lo(D_800E4CB8)($at) -/* 007B74 80006F74 C4264CBC */ lwc1 $f6, %lo(D_800E4CBC)($at) +/* 007B74 80006F74 C4264CBC */ lwc1 $f6, %lo(D_800E4CB8 + 4)($at) /* 007B78 80006F78 3C01800E */ lui $at, %hi(D_800E4CC0) # $at, 0x800e /* 007B7C 80006F7C 4626603C */ c.lt.d $f12, $f6 /* 007B80 80006F80 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index 25ceb63c..c75f553f 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -54,10 +54,10 @@ glabel func_80006FC8 /* 007C40 80007040 AFA000AC */ sw $zero, 0xac($sp) /* 007C44 80007044 3C01800E */ lui $at, %hi(D_800E4CC4) # $at, 0x800e /* 007C48 80007048 C43E4CC4 */ lwc1 $f30, %lo(D_800E4CC4)($at) -/* 007C4C 8000704C 3C01800E */ lui $at, %hi(D_800E4CCC) # $at, 0x800e +/* 007C4C 8000704C 3C01800E */ lui $at, %hi(D_800E4CC8 + 4) # $at, 0x800e /* 007C50 80007050 3C148012 */ lui $s4, %hi(D_80119C38) # $s4, 0x8012 /* 007C54 80007054 C43D4CC8 */ lwc1 $f29, %lo(D_800E4CC8)($at) -/* 007C58 80007058 C43C4CCC */ lwc1 $f28, %lo(D_800E4CCC)($at) +/* 007C58 80007058 C43C4CCC */ lwc1 $f28, %lo(D_800E4CC8 + 4)($at) /* 007C5C 8000705C 4480C800 */ mtc1 $zero, $f25 /* 007C60 80007060 4480C000 */ mtc1 $zero, $f24 /* 007C64 80007064 8FBE00D8 */ lw $fp, 0xd8($sp) @@ -536,9 +536,9 @@ glabel func_80006FC8 /* 008348 80007748 1509FE49 */ bne $t0, $t1, .L80007070 /* 00834C 8000774C 26D60004 */ addiu $s6, $s6, 4 .L80007750: -/* 008350 80007750 3C01800E */ lui $at, %hi(D_800E4CDC) # $at, 0x800e +/* 008350 80007750 3C01800E */ lui $at, %hi(D_800E4CD8 + 4) # $at, 0x800e /* 008354 80007754 C43D4CD8 */ lwc1 $f29, %lo(D_800E4CD8)($at) -/* 008358 80007758 C43C4CDC */ lwc1 $f28, %lo(D_800E4CDC)($at) +/* 008358 80007758 C43C4CDC */ lwc1 $f28, %lo(D_800E4CD8 + 4)($at) /* 00835C 8000775C 8FAA007C */ lw $t2, 0x7c($sp) /* 008360 80007760 3C01800E */ lui $at, %hi(D_800E4CE0) # $at, 0x800e /* 008364 80007764 C43E4CE0 */ lwc1 $f30, %lo(D_800E4CE0)($at) @@ -641,9 +641,9 @@ glabel func_80006FC8 .L800078C4: /* 0084C4 800078C4 8FB600C8 */ lw $s6, 0xc8($sp) /* 0084C8 800078C8 194000D7 */ blez $t2, .L80007C28 -/* 0084CC 800078CC 3C01800E */ lui $at, %hi(D_800E4CEC) # $at, 0x800e +/* 0084CC 800078CC 3C01800E */ lui $at, %hi(D_800E4CE8 + 4) # $at, 0x800e /* 0084D0 800078D0 C4394CE8 */ lwc1 $f25, %lo(D_800E4CE8)($at) -/* 0084D4 800078D4 C4384CEC */ lwc1 $f24, %lo(D_800E4CEC)($at) +/* 0084D4 800078D4 C4384CEC */ lwc1 $f24, %lo(D_800E4CE8 + 4)($at) /* 0084D8 800078D8 00000000 */ nop .L800078DC: /* 0084DC 800078DC 8EC80000 */ lw $t0, ($s6) diff --git a/asm/non_matchings/unknown_005740/func_80007FA4.s b/asm/non_matchings/unknown_005740/func_80007FA4.s index b8609c7a..33c1c9f4 100644 --- a/asm/non_matchings/unknown_005740/func_80007FA4.s +++ b/asm/non_matchings/unknown_005740/func_80007FA4.s @@ -6,11 +6,11 @@ glabel D_800E4CF8 glabel func_80007FA4 /* 008BA4 80007FA4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 008BA8 80007FA8 44818000 */ mtc1 $at, $f16 -/* 008BAC 80007FAC 3C01800E */ lui $at, %hi(D_800E4CFC) # $at, 0x800e +/* 008BAC 80007FAC 3C01800E */ lui $at, %hi(D_800E4CF8 + 4) # $at, 0x800e /* 008BB0 80007FB0 46106101 */ sub.s $f4, $f12, $f16 /* 008BB4 80007FB4 C4334CF8 */ lwc1 $f19, %lo(D_800E4CF8)($at) /* 008BB8 80007FB8 460C8180 */ add.s $f6, $f16, $f12 -/* 008BBC 80007FBC C4324CFC */ lwc1 $f18, %lo(D_800E4CFC)($at) +/* 008BBC 80007FBC C4324CFC */ lwc1 $f18, %lo(D_800E4CF8 + 4)($at) /* 008BC0 80007FC0 46062303 */ div.s $f12, $f4, $f6 /* 008BC4 80007FC4 3C01BF80 */ li $at, 0xBF800000 # -1.000000 /* 008BC8 80007FC8 44801000 */ mtc1 $zero, $f2 diff --git a/asm/non_matchings/unknown_005740/func_800099EC.s b/asm/non_matchings/unknown_005740/func_800099EC.s index 27e196d5..825f1c13 100644 --- a/asm/non_matchings/unknown_005740/func_800099EC.s +++ b/asm/non_matchings/unknown_005740/func_800099EC.s @@ -26,9 +26,9 @@ glabel func_800099EC /* 00A630 80009A30 44817000 */ mtc1 $at, $f14 /* 00A634 80009A34 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00A638 80009A38 44816000 */ mtc1 $at, $f12 -/* 00A63C 80009A3C 3C01800E */ lui $at, %hi(D_800E4F1C) # $at, 0x800e +/* 00A63C 80009A3C 3C01800E */ lui $at, %hi(D_800E4F18 + 4) # $at, 0x800e /* 00A640 80009A40 C4234F18 */ lwc1 $f3, %lo(D_800E4F18)($at) -/* 00A644 80009A44 C4224F1C */ lwc1 $f2, %lo(D_800E4F1C)($at) +/* 00A644 80009A44 C4224F1C */ lwc1 $f2, %lo(D_800E4F18 + 4)($at) /* 00A648 80009A48 8045017C */ lb $a1, 0x17c($v0) /* 00A64C 80009A4C 00000000 */ nop .L80009A50: diff --git a/asm/non_matchings/unknown_005740/func_80009AB4.s b/asm/non_matchings/unknown_005740/func_80009AB4.s index 46efb78d..ea1e577b 100644 --- a/asm/non_matchings/unknown_005740/func_80009AB4.s +++ b/asm/non_matchings/unknown_005740/func_80009AB4.s @@ -26,9 +26,9 @@ glabel func_80009AB4 /* 00A6F8 80009AF8 44817000 */ mtc1 $at, $f14 /* 00A6FC 80009AFC 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 00A700 80009B00 44816000 */ mtc1 $at, $f12 -/* 00A704 80009B04 3C01800E */ lui $at, %hi(D_800E4F24) # $at, 0x800e +/* 00A704 80009B04 3C01800E */ lui $at, %hi(D_800E4F20 + 4) # $at, 0x800e /* 00A708 80009B08 C4234F20 */ lwc1 $f3, %lo(D_800E4F20)($at) -/* 00A70C 80009B0C C4224F24 */ lwc1 $f2, %lo(D_800E4F24)($at) +/* 00A70C 80009B0C C4224F24 */ lwc1 $f2, %lo(D_800E4F20 + 4)($at) /* 00A710 80009B10 804500B8 */ lb $a1, 0xb8($v0) /* 00A714 80009B14 00000000 */ nop .L80009B18: diff --git a/asm/non_matchings/unknown_00BC20/func_80011570.s b/asm/non_matchings/unknown_00BC20/func_80011570.s index bb5a8071..88ba53fd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80011570.s +++ b/asm/non_matchings/unknown_00BC20/func_80011570.s @@ -36,11 +36,11 @@ glabel func_80011570 /* 0121D4 800115D4 00001025 */ move $v0, $zero .L800115D8: /* 0121D8 800115D8 844E003E */ lh $t6, 0x3e($v0) -/* 0121DC 800115DC 3C01800E */ lui $at, %hi(D_800E553C) # $at, 0x800e +/* 0121DC 800115DC 3C01800E */ lui $at, %hi(D_800E5538 + 4) # $at, 0x800e /* 0121E0 800115E0 448E3000 */ mtc1 $t6, $f6 /* 0121E4 800115E4 C42D5538 */ lwc1 $f13, %lo(D_800E5538)($at) /* 0121E8 800115E8 46803221 */ cvt.d.w $f8, $f6 -/* 0121EC 800115EC C42C553C */ lwc1 $f12, %lo(D_800E553C)($at) +/* 0121EC 800115EC C42C553C */ lwc1 $f12, %lo(D_800E5538 + 4)($at) /* 0121F0 800115F0 3C04800E */ lui $a0, %hi(D_800DC848) # $a0, 0x800e /* 0121F4 800115F4 462C4280 */ add.d $f10, $f8, $f12 /* 0121F8 800115F8 00001825 */ move $v1, $zero @@ -66,11 +66,11 @@ glabel func_80011570 /* 012244 80011644 24030001 */ li $v1, 1 .L80011648: /* 012248 80011648 84580042 */ lh $t8, 0x42($v0) -/* 01224C 8001164C 3C01800E */ lui $at, %hi(D_800E5544) # $at, 0x800e +/* 01224C 8001164C 3C01800E */ lui $at, %hi(D_800E5540 + 4) # $at, 0x800e /* 012250 80011650 44985000 */ mtc1 $t8, $f10 /* 012254 80011654 C4275540 */ lwc1 $f7, %lo(D_800E5540)($at) /* 012258 80011658 46805121 */ cvt.d.w $f4, $f10 -/* 01225C 8001165C C4265544 */ lwc1 $f6, %lo(D_800E5544)($at) +/* 01225C 8001165C C4265544 */ lwc1 $f6, %lo(D_800E5540 + 4)($at) /* 012260 80011660 00000000 */ nop /* 012264 80011664 46262200 */ add.d $f8, $f4, $f6 /* 012268 80011668 46204020 */ cvt.s.d $f0, $f8 @@ -81,11 +81,11 @@ glabel func_80011570 /* 01227C 8001167C 24030001 */ li $v1, 1 .L80011680: /* 012280 80011680 84590040 */ lh $t9, 0x40($v0) -/* 012284 80011684 3C01800E */ lui $at, %hi(D_800E554C) # $at, 0x800e +/* 012284 80011684 3C01800E */ lui $at, %hi(D_800E5548 + 4) # $at, 0x800e /* 012288 80011688 44995000 */ mtc1 $t9, $f10 /* 01228C 8001168C C4275548 */ lwc1 $f7, %lo(D_800E5548)($at) /* 012290 80011690 46805121 */ cvt.d.w $f4, $f10 -/* 012294 80011694 C426554C */ lwc1 $f6, %lo(D_800E554C)($at) +/* 012294 80011694 C426554C */ lwc1 $f6, %lo(D_800E5548 + 4)($at) /* 012298 80011698 00000000 */ nop /* 01229C 8001169C 46262201 */ sub.d $f8, $f4, $f6 /* 0122A0 800116A0 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_00BC20/func_80013A0C.s b/asm/non_matchings/unknown_00BC20/func_80013A0C.s index de3e1e6c..8e67b167 100644 --- a/asm/non_matchings/unknown_00BC20/func_80013A0C.s +++ b/asm/non_matchings/unknown_00BC20/func_80013A0C.s @@ -142,10 +142,10 @@ glabel func_80013A0C /* 014808 80013C08 24040002 */ li $a0, 2 .L80013C0C: /* 01480C 80013C0C 44849000 */ mtc1 $a0, $f18 -/* 014810 80013C10 3C01800E */ lui $at, %hi(D_800E557C) # $at, 0x800e +/* 014810 80013C10 3C01800E */ lui $at, %hi(D_800E5578 + 4) # $at, 0x800e /* 014814 80013C14 468091A0 */ cvt.s.w $f6, $f18 /* 014818 80013C18 C4255578 */ lwc1 $f5, %lo(D_800E5578)($at) -/* 01481C 80013C1C C424557C */ lwc1 $f4, %lo(D_800E557C)($at) +/* 01481C 80013C1C C424557C */ lwc1 $f4, %lo(D_800E5578 + 4)($at) /* 014820 80013C20 46003221 */ cvt.d.s $f8, $f6 /* 014824 80013C24 46244282 */ mul.d $f10, $f8, $f4 /* 014828 80013C28 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/unknown_00BC20/func_800159C8.s b/asm/non_matchings/unknown_00BC20/func_800159C8.s index d674ce00..f265333d 100644 --- a/asm/non_matchings/unknown_00BC20/func_800159C8.s +++ b/asm/non_matchings/unknown_00BC20/func_800159C8.s @@ -72,13 +72,13 @@ glabel func_800159C8 /* 016690 80015A90 1441000C */ bne $v0, $at, .L80015AC4 /* 016694 80015A94 00000000 */ nop /* 016698 80015A98 44803000 */ mtc1 $zero, $f6 -/* 01669C 80015A9C 3C01800E */ lui $at, %hi(D_800E55BC) # $at, 0x800e +/* 01669C 80015A9C 3C01800E */ lui $at, %hi(D_800E55B8 + 4) # $at, 0x800e /* 0166A0 80015AA0 4606003C */ c.lt.s $f0, $f6 /* 0166A4 80015AA4 00000000 */ nop /* 0166A8 80015AA8 45000006 */ bc1f .L80015AC4 /* 0166AC 80015AAC 00000000 */ nop /* 0166B0 80015AB0 C42955B8 */ lwc1 $f9, %lo(D_800E55B8)($at) -/* 0166B4 80015AB4 C42855BC */ lwc1 $f8, %lo(D_800E55BC)($at) +/* 0166B4 80015AB4 C42855BC */ lwc1 $f8, %lo(D_800E55B8 + 4)($at) /* 0166B8 80015AB8 46000121 */ cvt.d.s $f4, $f0 /* 0166BC 80015ABC 46282282 */ mul.d $f10, $f4, $f8 /* 0166C0 80015AC0 46205020 */ cvt.s.d $f0, $f10 @@ -410,13 +410,13 @@ glabel func_800159C8 /* 016BA4 80015FA4 8C850064 */ lw $a1, 0x64($a0) /* 016BA8 80015FA8 00001025 */ move $v0, $zero /* 016BAC 80015FAC 80AF01D6 */ lb $t7, 0x1d6($a1) -# Used to access D_800E55E0 and D_800E55E4 +# Used to access D_800E55E0 and D_800E55E0 + 4 /* 016BB0 80015FB0 3C01800E */ lui $at, %hi(D_800E55E0) # $at, 0x800e /* 016BB4 80015FB4 152F0059 */ bne $t1, $t7, .L8001611C /* 016BB8 80015FB8 00000000 */ nop -/* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C4) # $at, 0x800e +/* 016BBC 80015FBC 3C01800E */ lui $at, %hi(D_800E55C0 + 4) # $at, 0x800e /* 016BC0 80015FC0 C42755C0 */ lwc1 $f7, %lo(D_800E55C0)($at) -/* 016BC4 80015FC4 C42655C4 */ lwc1 $f6, %lo(D_800E55C4)($at) +/* 016BC4 80015FC4 C42655C4 */ lwc1 $f6, %lo(D_800E55C0 + 4)($at) /* 016BC8 80015FC8 46008021 */ cvt.d.s $f0, $f16 /* 016BCC 80015FCC 4620303C */ c.lt.d $f6, $f0 /* 016BD0 80015FD0 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -424,7 +424,7 @@ glabel func_800159C8 /* 016BD8 80015FD8 00000000 */ nop /* 016BDC 80015FDC 44815800 */ mtc1 $at, $f11 /* 016BE0 80015FE0 44805000 */ mtc1 $zero, $f10 -/* 016BE4 80015FE4 3C01800E */ lui $at, %hi(D_800E55CC) # $at, 0x800e +/* 016BE4 80015FE4 3C01800E */ lui $at, %hi(D_800E55C8 + 4) # $at, 0x800e /* 016BE8 80015FE8 4620503C */ c.lt.d $f10, $f0 /* 016BEC 80015FEC 00000000 */ nop /* 016BF0 80015FF0 45000002 */ bc1f .L80015FFC @@ -435,7 +435,7 @@ glabel func_800159C8 /* 016C00 80016000 00000000 */ nop /* 016C04 80016004 C484001C */ lwc1 $f4, 0x1c($a0) /* 016C08 80016008 C42155C8 */ lwc1 $f1, %lo(D_800E55C8)($at) -/* 016C0C 8001600C C42055CC */ lwc1 $f0, %lo(D_800E55CC)($at) +/* 016C0C 8001600C C42055CC */ lwc1 $f0, %lo(D_800E55C8 + 4)($at) /* 016C10 80016010 46002221 */ cvt.d.s $f8, $f4 /* 016C14 80016014 46204182 */ mul.d $f6, $f8, $f0 /* 016C18 80016018 C4840024 */ lwc1 $f4, 0x24($a0) @@ -459,7 +459,7 @@ glabel func_800159C8 /* 016C5C 8001605C 460C2202 */ mul.s $f8, $f4, $f12 /* 016C60 80016060 C480001C */ lwc1 $f0, 0x1c($a0) /* 016C64 80016064 C4E4000C */ lwc1 $f4, 0xc($a3) -# Used to access D_800E55D8 and D_800E55DC. +# Used to access D_800E55D8 and D_800E55D8 + 4. /* 016C68 80016068 3C01800E */ lui $at, %hi(D_800E55D8) # $at, 0x800e /* 016C6C 8001606C 46003282 */ mul.s $f10, $f6, $f0 /* 016C70 80016070 460A4081 */ sub.s $f2, $f8, $f10 @@ -474,11 +474,11 @@ glabel func_800159C8 /* 016C94 80016094 00000000 */ nop /* 016C98 80016098 45000011 */ bc1f .L800160E0 /* 016C9C 8001609C 00000000 */ nop -# Used to access D_800E55D0 and D_800E55D4. +# Used to access D_800E55D0 and D_800E55D0 + 4. /* 016CA0 800160A0 3C01800E */ lui $at, %hi(D_800E55D0) # $at, 0x800e /* 016CA4 800160A4 C486001C */ lwc1 $f6, 0x1c($a0) /* 016CA8 800160A8 C42155D0 */ lwc1 $f1, %lo(D_800E55D0)($at) -/* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D4)($at) +/* 016CAC 800160AC C42055D4 */ lwc1 $f0, %lo(D_800E55D0 + 4)($at) /* 016CB0 800160B0 460032A1 */ cvt.d.s $f10, $f6 /* 016CB4 800160B4 46205102 */ mul.d $f4, $f10, $f0 /* 016CB8 800160B8 46202220 */ cvt.s.d $f8, $f4 @@ -494,7 +494,7 @@ glabel func_800159C8 .L800160E0: /* 016CE0 800160E0 C48A001C */ lwc1 $f10, 0x1c($a0) /* 016CE4 800160E4 C42155D8 */ lwc1 $f1, %lo(D_800E55D8)($at) -/* 016CE8 800160E8 C42055DC */ lwc1 $f0, %lo(D_800E55DC)($at) +/* 016CE8 800160E8 C42055DC */ lwc1 $f0, %lo(D_800E55D8 + 4)($at) /* 016CEC 800160EC 46005107 */ neg.s $f4, $f10 /* 016CF0 800160F0 46002221 */ cvt.d.s $f8, $f4 /* 016CF4 800160F4 46204182 */ mul.d $f6, $f8, $f0 @@ -509,7 +509,7 @@ glabel func_800159C8 /* 016D18 80016118 E4AA011C */ swc1 $f10, 0x11c($a1) .L8001611C: /* 016D1C 8001611C C42555E0 */ lwc1 $f5, %lo(D_800E55E0)($at) -/* 016D20 80016120 C42455E4 */ lwc1 $f4, %lo(D_800E55E4)($at) +/* 016D20 80016120 C42455E4 */ lwc1 $f4, %lo(D_800E55E0 + 4)($at) /* 016D24 80016124 46008021 */ cvt.d.s $f0, $f16 /* 016D28 80016128 4620203C */ c.lt.d $f4, $f0 /* 016D2C 8001612C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -651,7 +651,7 @@ glabel func_800159C8 /* 016F30 80016330 15380070 */ bne $t1, $t8, .L800164F4 /* 016F34 80016334 8FBF0014 */ lw $ra, 0x14($sp) /* 016F38 80016338 84F90048 */ lh $t9, 0x48($a3) -/* 016F3C 8001633C 3C01800E */ lui $at, %hi(D_800E55EC) # $at, 0x800e +/* 016F3C 8001633C 3C01800E */ lui $at, %hi(D_800E55E8 + 4) # $at, 0x800e /* 016F40 80016340 1539006C */ bne $t1, $t9, .L800164F4 /* 016F44 80016344 8FBF0014 */ lw $ra, 0x14($sp) /* 016F48 80016348 910A0012 */ lbu $t2, 0x12($t0) @@ -659,7 +659,7 @@ glabel func_800159C8 /* 016F50 80016350 C42755E8 */ lwc1 $f7, %lo(D_800E55E8)($at) /* 016F54 80016354 014C5823 */ subu $t3, $t2, $t4 /* 016F58 80016358 448B5000 */ mtc1 $t3, $f10 -/* 016F5C 8001635C C42655EC */ lwc1 $f6, %lo(D_800E55EC)($at) +/* 016F5C 8001635C C42655EC */ lwc1 $f6, %lo(D_800E55E8 + 4)($at) /* 016F60 80016360 46805120 */ cvt.s.w $f4, $f10 /* 016F64 80016364 8C850064 */ lw $a1, 0x64($a0) /* 016F68 80016368 8CED0064 */ lw $t5, 0x64($a3) @@ -681,7 +681,7 @@ glabel func_800159C8 .L800163A8: /* 016FA8 800163A8 8FB8004C */ lw $t8, 0x4c($sp) .L800163AC: -/* 016FAC 800163AC 3C01800E */ lui $at, %hi(D_800E55F4) # $at, 0x800e +/* 016FAC 800163AC 3C01800E */ lui $at, %hi(D_800E55F0 + 4) # $at, 0x800e /* 016FB0 800163B0 83020189 */ lb $v0, 0x189($t8) /* 016FB4 800163B4 00000000 */ nop /* 016FB8 800163B8 10400006 */ beqz $v0, .L800163D4 @@ -701,7 +701,7 @@ glabel func_800159C8 /* 016FEC 800163EC E7AC0068 */ swc1 $f12, 0x68($sp) .L800163F0: /* 016FF0 800163F0 C42155F0 */ lwc1 $f1, %lo(D_800E55F0)($at) -/* 016FF4 800163F4 C42055F4 */ lwc1 $f0, %lo(D_800E55F4)($at) +/* 016FF4 800163F4 C42055F4 */ lwc1 $f0, %lo(D_800E55F0 + 4)($at) /* 016FF8 800163F8 46008121 */ cvt.d.s $f4, $f16 /* 016FFC 800163FC 4624003C */ c.lt.d $f0, $f4 /* 017000 80016400 E7AC0068 */ swc1 $f12, 0x68($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_80016748.s b/asm/non_matchings/unknown_00BC20/func_80016748.s index a31b8785..28a7cfe0 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016748.s +++ b/asm/non_matchings/unknown_00BC20/func_80016748.s @@ -79,12 +79,12 @@ glabel func_80016748 /* 017460 80016860 0000F025 */ move $fp, $zero /* 017464 80016864 1B0000BF */ blez $t8, .L80016B64 /* 017468 80016868 00009025 */ move $s2, $zero -/* 01746C 8001686C 3C01800E */ lui $at, %hi(D_800E55FC) # $at, 0x800e +/* 01746C 8001686C 3C01800E */ lui $at, %hi(D_800E55F8 + 4) # $at, 0x800e /* 017470 80016870 C43D55F8 */ lwc1 $f29, %lo(D_800E55F8)($at) -/* 017474 80016874 C43C55FC */ lwc1 $f28, %lo(D_800E55FC)($at) -/* 017478 80016878 3C01800E */ lui $at, %hi(D_800E5604) # $at, 0x800e +/* 017474 80016874 C43C55FC */ lwc1 $f28, %lo(D_800E55F8 + 4)($at) +/* 017478 80016878 3C01800E */ lui $at, %hi(D_800E5600 + 4) # $at, 0x800e /* 01747C 8001687C C43B5600 */ lwc1 $f27, %lo(D_800E5600)($at) -/* 017480 80016880 C43A5604 */ lwc1 $f26, %lo(D_800E5604)($at) +/* 017480 80016880 C43A5604 */ lwc1 $f26, %lo(D_800E5600 + 4)($at) /* 017484 80016884 4480C000 */ mtc1 $zero, $f24 /* 017488 80016888 2417000A */ li $s7, 10 .L8001688C: diff --git a/asm/non_matchings/unknown_00BC20/func_80017A18.s b/asm/non_matchings/unknown_00BC20/func_80017A18.s index e9d175c5..394e9c77 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017A18.s +++ b/asm/non_matchings/unknown_00BC20/func_80017A18.s @@ -110,7 +110,7 @@ glabel func_80017A18 /* 018798 80017B98 3C01800E */ lui $at, %hi(D_800E5608) # $at, 0x800e /* 01879C 80017B9C 46048402 */ mul.s $f16, $f16, $f4 /* 0187A0 80017BA0 46125001 */ sub.s $f0, $f10, $f18 -/* 0187A4 80017BA4 C42A560C */ lwc1 $f10, %lo(D_800E560C)($at) +/* 0187A4 80017BA4 C42A560C */ lwc1 $f10, %lo(D_800E5608 + 4)($at) /* 0187A8 80017BA8 E7BC0060 */ swc1 $f28, 0x60($sp) /* 0187AC 80017BAC 460E8380 */ add.s $f14, $f16, $f14 /* 0187B0 80017BB0 E7B40068 */ swc1 $f20, 0x68($sp) @@ -123,9 +123,9 @@ glabel func_80017A18 /* 0187CC 80017BCC 46126581 */ sub.s $f22, $f12, $f18 /* 0187D0 80017BD0 4500006D */ bc1f .L80017D88 /* 0187D4 80017BD4 E7A80070 */ swc1 $f8, 0x70($sp) -/* 0187D8 80017BD8 3C01800E */ lui $at, %hi(D_800E5614) # $at, 0x800e +/* 0187D8 80017BD8 3C01800E */ lui $at, %hi(D_800E5610 + 4) # $at, 0x800e /* 0187DC 80017BDC C4295610 */ lwc1 $f9, %lo(D_800E5610)($at) -/* 0187E0 80017BE0 C4285614 */ lwc1 $f8, %lo(D_800E5614)($at) +/* 0187E0 80017BE0 C4285614 */ lwc1 $f8, %lo(D_800E5610 + 4)($at) /* 0187E4 80017BE4 4600B2A1 */ cvt.d.s $f10, $f22 /* 0187E8 80017BE8 4628503C */ c.lt.d $f10, $f8 /* 0187EC 80017BEC C7AA0060 */ lwc1 $f10, 0x60($sp) @@ -186,9 +186,9 @@ glabel func_80017A18 /* 0188B8 80017CB8 00000000 */ nop .L80017CBC: /* 0188BC 80017CBC 10C00032 */ beqz $a2, .L80017D88 -/* 0188C0 80017CC0 3C01800E */ lui $at, %hi(D_800E561C) # $at, 0x800e +/* 0188C0 80017CC0 3C01800E */ lui $at, %hi(D_800E5618 + 4) # $at, 0x800e /* 0188C4 80017CC4 C4295618 */ lwc1 $f9, %lo(D_800E5618)($at) -/* 0188C8 80017CC8 C428561C */ lwc1 $f8, %lo(D_800E561C)($at) +/* 0188C8 80017CC8 C428561C */ lwc1 $f8, %lo(D_800E5618 + 4)($at) /* 0188CC 80017CCC 4600D1A1 */ cvt.d.s $f6, $f26 /* 0188D0 80017CD0 4626403C */ c.lt.d $f8, $f6 /* 0188D4 80017CD4 240D0001 */ li $t5, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_800185E4.s b/asm/non_matchings/unknown_00BC20/func_800185E4.s index c14c05b7..2e81bbd2 100644 --- a/asm/non_matchings/unknown_00BC20/func_800185E4.s +++ b/asm/non_matchings/unknown_00BC20/func_800185E4.s @@ -249,23 +249,23 @@ glabel func_800185E4 /* 019580 80018980 14790019 */ bne $v1, $t9, .L800189E8 /* 019584 80018984 00000000 */ nop /* 019588 80018988 8CE20064 */ lw $v0, 0x64($a3) -/* 01958C 8001898C 3C01800E */ lui $at, %hi(D_800E5624) # $at, 0x800e +/* 01958C 8001898C 3C01800E */ lui $at, %hi(D_800E5620 + 4) # $at, 0x800e /* 019590 80018990 844C0000 */ lh $t4, ($v0) /* 019594 80018994 00000000 */ nop /* 019598 80018998 154C0013 */ bne $t2, $t4, .L800189E8 /* 01959C 8001899C 00000000 */ nop /* 0195A0 800189A0 C4275620 */ lwc1 $f7, %lo(D_800E5620)($at) -/* 0195A4 800189A4 C4265624 */ lwc1 $f6, %lo(D_800E5624)($at) +/* 0195A4 800189A4 C4265624 */ lwc1 $f6, %lo(D_800E5620 + 4)($at) /* 0195A8 800189A8 460000A1 */ cvt.d.s $f2, $f0 /* 0195AC 800189AC 4626103C */ c.lt.d $f2, $f6 -/* 0195B0 800189B0 3C01800E */ lui $at, %hi(D_800E562C) # $at, 0x800e +/* 0195B0 800189B0 3C01800E */ lui $at, %hi(D_800E5628 + 4) # $at, 0x800e /* 0195B4 800189B4 45000003 */ bc1f .L800189C4 /* 0195B8 800189B8 00000000 */ nop /* 0195BC 800189BC 100000A6 */ b .L80018C58 /* 0195C0 800189C0 2402FF9C */ li $v0, -100 .L800189C4: /* 0195C4 800189C4 C4255628 */ lwc1 $f5, %lo(D_800E5628)($at) -/* 0195C8 800189C8 C424562C */ lwc1 $f4, %lo(D_800E562C)($at) +/* 0195C8 800189C8 C424562C */ lwc1 $f4, %lo(D_800E5628 + 4)($at) /* 0195CC 800189CC 00000000 */ nop /* 0195D0 800189D0 4622203C */ c.lt.d $f4, $f2 /* 0195D4 800189D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001955C.s b/asm/non_matchings/unknown_00BC20/func_8001955C.s index f2b5cef5..2dfd8db8 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001955C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001955C.s @@ -124,13 +124,13 @@ glabel func_8001955C /* 01A318 80019718 0C0326B4 */ jal sqrtf /* 01A31C 8001971C 46123300 */ add.s $f12, $f6, $f18 /* 01A320 80019720 44802000 */ mtc1 $zero, $f4 -/* 01A324 80019724 3C01800E */ lui $at, %hi(D_800E5634) # $at, 0x800e +/* 01A324 80019724 3C01800E */ lui $at, %hi(D_800E5630 + 4) # $at, 0x800e /* 01A328 80019728 46040032 */ c.eq.s $f0, $f4 /* 01A32C 8001972C 00000000 */ nop /* 01A330 80019730 45010011 */ bc1t .L80019778 /* 01A334 80019734 00000000 */ nop /* 01A338 80019738 C4295630 */ lwc1 $f9, %lo(D_800E5630)($at) -/* 01A33C 8001973C C4285634 */ lwc1 $f8, %lo(D_800E5634)($at) +/* 01A33C 8001973C C4285634 */ lwc1 $f8, %lo(D_800E5630 + 4)($at) /* 01A340 80019740 460002A1 */ cvt.d.s $f10, $f0 /* 01A344 80019744 00000000 */ nop /* 01A348 80019748 462A4183 */ div.d $f6, $f8, $f10 diff --git a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s index ed14d98e..447e4b4b 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001C6C4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001C6C4.s @@ -38,10 +38,10 @@ glabel func_8001C6C4 /* 01D324 8001C724 AFA600F0 */ sw $a2, 0xf0($sp) /* 01D328 8001C728 15C00009 */ bnez $t6, .L8001C750 /* 01D32C 8001C72C AFA700F4 */ sw $a3, 0xf4($sp) -/* 01D330 8001C730 3C01800E */ lui $at, %hi(D_800E564C) # $at, 0x800e +/* 01D330 8001C730 3C01800E */ lui $at, %hi(D_800E5648 + 4) # $at, 0x800e /* 01D334 8001C734 C7A400F0 */ lwc1 $f4, 0xf0($sp) /* 01D338 8001C738 C4295648 */ lwc1 $f9, %lo(D_800E5648)($at) -/* 01D33C 8001C73C C428564C */ lwc1 $f8, %lo(D_800E564C)($at) +/* 01D33C 8001C73C C428564C */ lwc1 $f8, %lo(D_800E5648 + 4)($at) /* 01D340 8001C740 460021A1 */ cvt.d.s $f6, $f4 /* 01D344 8001C744 46283282 */ mul.d $f10, $f6, $f8 /* 01D348 8001C748 46205420 */ cvt.s.d $f16, $f10 @@ -208,9 +208,9 @@ glabel func_8001C6C4 /* 01D5AC 8001C9AC 46120032 */ c.eq.s $f0, $f18 /* 01D5B0 8001C9B0 460A5402 */ mul.s $f16, $f10, $f10 /* 01D5B4 8001C9B4 4501000D */ bc1t .L8001C9EC -/* 01D5B8 8001C9B8 3C01800E */ lui $at, %hi(D_800E565C) # $at, 0x800e +/* 01D5B8 8001C9B8 3C01800E */ lui $at, %hi(D_800E5658 + 4) # $at, 0x800e /* 01D5BC 8001C9BC C4295658 */ lwc1 $f9, %lo(D_800E5658)($at) -/* 01D5C0 8001C9C0 C428565C */ lwc1 $f8, %lo(D_800E565C)($at) +/* 01D5C0 8001C9C0 C428565C */ lwc1 $f8, %lo(D_800E5658 + 4)($at) /* 01D5C4 8001C9C4 46000121 */ cvt.d.s $f4, $f0 /* 01D5C8 8001C9C8 00000000 */ nop /* 01D5CC 8001C9CC 46244183 */ div.d $f6, $f8, $f4 diff --git a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s index e4176f0b..c8c7a36d 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001EFA4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001EFA4.s @@ -77,7 +77,7 @@ glabel func_8001EFA4 /* 01FCB0 8001F0B0 00000000 */ nop /* 01FCB4 8001F0B4 A60D0028 */ sh $t5, 0x28($s0) /* 01FCB8 8001F0B8 822E0014 */ lb $t6, 0x14($s1) -/* 01FCBC 8001F0BC C430566C */ lwc1 $f16, %lo(D_800E566C)($at) +/* 01FCBC 8001F0BC C430566C */ lwc1 $f16, %lo(D_800E5668 + 4)($at) /* 01FCC0 8001F0C0 448E3000 */ mtc1 $t6, $f6 /* 01FCC4 8001F0C4 C4315668 */ lwc1 $f17, %lo(D_800E5668)($at) /* 01FCC8 8001F0C8 46803220 */ cvt.s.w $f8, $f6 diff --git a/asm/non_matchings/unknown_00BC20/func_8001F460.s b/asm/non_matchings/unknown_00BC20/func_8001F460.s index 3895b23e..585f2357 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F460.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F460.s @@ -43,14 +43,14 @@ glabel func_8001F460 /* 0200D4 8001F4D4 44992000 */ mtc1 $t9, $f4 /* 0200D8 8001F4D8 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 0200DC 8001F4DC 46802020 */ cvt.s.w $f0, $f4 -/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5674) # $at, 0x800e +/* 0200E0 8001F4E0 3C01800E */ lui $at, %hi(D_800E5670 + 4) # $at, 0x800e /* 0200E4 8001F4E4 00008025 */ move $s0, $zero /* 0200E8 8001F4E8 E7A00114 */ swc1 $f0, 0x114($sp) /* 0200EC 8001F4EC 8ED30064 */ lw $s3, 0x64($s6) /* 0200F0 8001F4F0 15C00007 */ bnez $t6, .L8001F510 /* 0200F4 8001F4F4 24110004 */ li $s1, 4 /* 0200F8 8001F4F8 C4295670 */ lwc1 $f9, %lo(D_800E5670)($at) -/* 0200FC 8001F4FC C4285674 */ lwc1 $f8, %lo(D_800E5674)($at) +/* 0200FC 8001F4FC C4285674 */ lwc1 $f8, %lo(D_800E5670 + 4)($at) /* 020100 8001F500 460001A1 */ cvt.d.s $f6, $f0 /* 020104 8001F504 46283282 */ mul.d $f10, $f6, $f8 /* 020108 8001F508 46205120 */ cvt.s.d $f4, $f10 @@ -1720,11 +1720,11 @@ glabel func_8001F460 /* 021970 80020D70 030FC821 */ addu $t9, $t8, $t7 /* 021974 80020D74 032EC021 */ addu $t8, $t9, $t6 /* 021978 80020D78 8F0F0000 */ lw $t7, ($t8) -/* 02197C 80020D7C 3C01800E */ lui $at, %hi(D_800E5684) # $at, 0x800e +/* 02197C 80020D7C 3C01800E */ lui $at, %hi(D_800E5680 + 4) # $at, 0x800e /* 021980 80020D80 8DF1003C */ lw $s1, 0x3c($t7) /* 021984 80020D84 C4215680 */ lwc1 $f1, %lo(D_800E5680)($at) /* 021988 80020D88 82390014 */ lb $t9, 0x14($s1) -/* 02198C 80020D8C C4205684 */ lwc1 $f0, %lo(D_800E5684)($at) +/* 02198C 80020D8C C4205684 */ lwc1 $f0, %lo(D_800E5680 + 4)($at) /* 021990 80020D90 44995000 */ mtc1 $t9, $f10 /* 021994 80020D94 00000000 */ nop /* 021998 80020D98 46805220 */ cvt.s.w $f8, $f10 diff --git a/asm/non_matchings/unknown_0255E0/func_8002581C.s b/asm/non_matchings/unknown_0255E0/func_8002581C.s index 6013280d..04ca0f70 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002581C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002581C.s @@ -64,9 +64,9 @@ glabel func_8002581C /* 026500 80025900 0004C400 */ sll $t8, $a0, 0x10 /* 026504 80025904 0C01C1FE */ jal func_800707F8 /* 026508 80025908 00182403 */ sra $a0, $t8, 0x10 -/* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E64) # $at, 0x800e +/* 02650C 8002590C 3C01800E */ lui $at, %hi(D_800E5E60 + 4) # $at, 0x800e /* 026510 80025910 C42F5E60 */ lwc1 $f15, %lo(D_800E5E60)($at) -/* 026514 80025914 C42E5E64 */ lwc1 $f14, %lo(D_800E5E64)($at) +/* 026514 80025914 C42E5E64 */ lwc1 $f14, %lo(D_800E5E60 + 4)($at) /* 026518 80025918 4600D221 */ cvt.d.s $f8, $f26 /* 02651C 8002591C 462E4282 */ mul.d $f10, $f8, $f14 /* 026520 80025920 8E020000 */ lw $v0, ($s0) diff --git a/asm/non_matchings/unknown_0255E0/func_80026070.s b/asm/non_matchings/unknown_0255E0/func_80026070.s index 61967b04..c5646d1b 100644 --- a/asm/non_matchings/unknown_0255E0/func_80026070.s +++ b/asm/non_matchings/unknown_0255E0/func_80026070.s @@ -169,7 +169,7 @@ glabel func_80026070 /* 026EDC 800262DC 46061282 */ mul.s $f10, $f2, $f6 /* 026EE0 800262E0 C7A60050 */ lwc1 $f6, 0x50($sp) /* 026EE4 800262E4 C42CD4A8 */ lwc1 $f12, %lo(D_8011D4A8)($at) -/* 026EE8 800262E8 3C01800E */ lui $at, %hi(D_800E5E6C) # $at, 0x800e +/* 026EE8 800262E8 3C01800E */ lui $at, %hi(D_800E5E68 + 4) # $at, 0x800e /* 026EEC 800262EC 460A4100 */ add.s $f4, $f8, $f10 /* 026EF0 800262F0 C7AA0058 */ lwc1 $f10, 0x58($sp) /* 026EF4 800262F4 46003202 */ mul.s $f8, $f6, $f0 @@ -186,14 +186,14 @@ glabel func_80026070 /* 026F20 80026320 46007486 */ mov.s $f18, $f14 .L80026324: /* 026F24 80026324 C42D5E68 */ lwc1 $f13, %lo(D_800E5E68)($at) -/* 026F28 80026328 C42C5E6C */ lwc1 $f12, %lo(D_800E5E6C)($at) +/* 026F28 80026328 C42C5E6C */ lwc1 $f12, %lo(D_800E5E68 + 4)($at) /* 026F2C 8002632C 46009021 */ cvt.d.s $f0, $f18 /* 026F30 80026330 462C003C */ c.lt.d $f0, $f12 -/* 026F34 80026334 3C01800E */ lui $at, %hi(D_800E5E74) # $at, 0x800e +/* 026F34 80026334 3C01800E */ lui $at, %hi(D_800E5E70 + 4) # $at, 0x800e /* 026F38 80026338 45010038 */ bc1t .L8002641C /* 026F3C 8002633C E7B20064 */ swc1 $f18, 0x64($sp) /* 026F40 80026340 C42F5E70 */ lwc1 $f15, %lo(D_800E5E70)($at) -/* 026F44 80026344 C42E5E74 */ lwc1 $f14, %lo(D_800E5E74)($at) +/* 026F44 80026344 C42E5E74 */ lwc1 $f14, %lo(D_800E5E70 + 4)($at) /* 026F48 80026348 460080A1 */ cvt.d.s $f2, $f16 /* 026F4C 8002634C 4622703C */ c.lt.d $f14, $f2 /* 026F50 80026350 E7B00060 */ swc1 $f16, 0x60($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_80026430.s b/asm/non_matchings/unknown_0255E0/func_80026430.s index 34a25dd3..94f0bde6 100644 --- a/asm/non_matchings/unknown_0255E0/func_80026430.s +++ b/asm/non_matchings/unknown_0255E0/func_80026430.s @@ -43,11 +43,11 @@ glabel func_80026430 /* 0270B0 800264B0 E7B4001C */ swc1 $f20, 0x1c($sp) /* 0270B4 800264B4 A7A0010E */ sh $zero, 0x10e($sp) /* 0270B8 800264B8 84840020 */ lh $a0, 0x20($a0) -/* 0270BC 800264BC 3C01800E */ lui $at, %hi(D_800E5E7C) # $at, 0x800e +/* 0270BC 800264BC 3C01800E */ lui $at, %hi(D_800E5E78 + 4) # $at, 0x800e /* 0270C0 800264C0 188001BC */ blez $a0, .L80026BB4 /* 0270C4 800264C4 27BE00B8 */ addiu $fp, $sp, 0xb8 /* 0270C8 800264C8 C43F5E78 */ lwc1 $f31, %lo(D_800E5E78)($at) -/* 0270CC 800264CC C43E5E7C */ lwc1 $f30, %lo(D_800E5E7C)($at) +/* 0270CC 800264CC C43E5E7C */ lwc1 $f30, %lo(D_800E5E78 + 4)($at) /* 0270D0 800264D0 4480A800 */ mtc1 $zero, $f21 /* 0270D4 800264D4 4480A000 */ mtc1 $zero, $f20 /* 0270D8 800264D8 27B500D0 */ addiu $s5, $sp, 0xd0 @@ -243,7 +243,7 @@ glabel func_80026430 /* 0273A8 800267A8 C7A00094 */ lwc1 $f0, 0x94($sp) /* 0273AC 800267AC 460E3202 */ mul.s $f8, $f6, $f14 /* 0273B0 800267B0 C7A400B0 */ lwc1 $f4, 0xb0($sp) -/* 0273B4 800267B4 3C01800E */ lui $at, %hi(D_800E5E84) # $at, 0x800e +/* 0273B4 800267B4 3C01800E */ lui $at, %hi(D_800E5E80 + 4) # $at, 0x800e /* 0273B8 800267B8 00008025 */ move $s0, $zero /* 0273BC 800267BC 46040282 */ mul.s $f10, $f0, $f4 /* 0273C0 800267C0 C7A400AC */ lwc1 $f4, 0xac($sp) @@ -258,7 +258,7 @@ glabel func_80026430 /* 0273E4 800267E4 460A0182 */ mul.s $f6, $f0, $f10 /* 0273E8 800267E8 C7AA00C4 */ lwc1 $f10, 0xc4($sp) /* 0273EC 800267EC 46064100 */ add.s $f4, $f8, $f6 -/* 0273F0 800267F0 C4285E84 */ lwc1 $f8, %lo(D_800E5E84)($at) +/* 0273F0 800267F0 C4285E84 */ lwc1 $f8, %lo(D_800E5E80 + 4)($at) /* 0273F4 800267F4 46005021 */ cvt.d.s $f0, $f10 /* 0273F8 800267F8 4628003C */ c.lt.d $f0, $f8 /* 0273FC 800267FC 46162300 */ add.s $f12, $f4, $f22 @@ -271,13 +271,13 @@ glabel func_80026430 /* 027414 80026814 4620F03C */ c.lt.d $f30, $f0 /* 027418 80026818 C7A600C8 */ lwc1 $f6, 0xc8($sp) /* 02741C 8002681C 45000004 */ bc1f .L80026830 -/* 027420 80026820 3C01800E */ lui $at, %hi(D_800E5E8C) # $at, 0x800e +/* 027420 80026820 3C01800E */ lui $at, %hi(D_800E5E88 + 4) # $at, 0x800e /* 027424 80026824 344E0002 */ ori $t6, $v0, 2 /* 027428 80026828 000EC600 */ sll $t8, $t6, 0x18 /* 02742C 8002682C 00181603 */ sra $v0, $t8, 0x18 .L80026830: /* 027430 80026830 C4255E88 */ lwc1 $f5, %lo(D_800E5E88)($at) -/* 027434 80026834 C4245E8C */ lwc1 $f4, %lo(D_800E5E8C)($at) +/* 027434 80026834 C4245E8C */ lwc1 $f4, %lo(D_800E5E88 + 4)($at) /* 027438 80026838 46003021 */ cvt.d.s $f0, $f6 /* 02743C 8002683C 4624003C */ c.lt.d $f0, $f4 /* 027440 80026840 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_80027568.s b/asm/non_matchings/unknown_0255E0/func_80027568.s index b064a279..8883023f 100644 --- a/asm/non_matchings/unknown_0255E0/func_80027568.s +++ b/asm/non_matchings/unknown_0255E0/func_80027568.s @@ -134,7 +134,7 @@ glabel func_80027568 /* 028338 80027738 E7A0005C */ swc1 $f0, 0x5c($sp) /* 02833C 8002773C 46003221 */ cvt.d.s $f8, $f6 /* 028340 80027740 462A4101 */ sub.d $f4, $f8, $f10 -/* 028344 80027744 C4285E94 */ lwc1 $f8, %lo(D_800E5E94)($at) +/* 028344 80027744 C4285E94 */ lwc1 $f8, %lo(D_800E5E90 + 4)($at) /* 028348 80027748 46202320 */ cvt.s.d $f12, $f4 /* 02834C 8002774C C4295E90 */ lwc1 $f9, %lo(D_800E5E90)($at) /* 028350 80027750 460061A1 */ cvt.d.s $f6, $f12 @@ -146,7 +146,7 @@ glabel func_80027568 /* 028368 80027768 C5700010 */ lwc1 $f16, 0x10($t3) /* 02836C 8002776C 46027282 */ mul.s $f10, $f14, $f2 /* 028370 80027770 C5720014 */ lwc1 $f18, 0x14($t3) -/* 028374 80027774 3C01800E */ lui $at, %hi(D_800E5E9C) # $at, 0x800e +/* 028374 80027774 3C01800E */ lui $at, %hi(D_800E5E98 + 4) # $at, 0x800e /* 028378 80027778 00001025 */ move $v0, $zero /* 02837C 8002777C 4610A102 */ mul.s $f4, $f20, $f16 /* 028380 80027780 00000000 */ nop @@ -154,7 +154,7 @@ glabel func_80027568 /* 028388 80027788 46045180 */ add.s $f6, $f10, $f4 /* 02838C 8002778C C4275E98 */ lwc1 $f7, %lo(D_800E5E98)($at) /* 028390 80027790 46083280 */ add.s $f10, $f6, $f8 -/* 028394 80027794 C4265E9C */ lwc1 $f6, %lo(D_800E5E9C)($at) +/* 028394 80027794 C4265E9C */ lwc1 $f6, %lo(D_800E5E98 + 4)($at) /* 028398 80027798 46185000 */ add.s $f0, $f10, $f24 /* 02839C 8002779C C7A8005C */ lwc1 $f8, 0x5c($sp) /* 0283A0 800277A0 46000121 */ cvt.d.s $f4, $f0 diff --git a/asm/non_matchings/unknown_0255E0/func_80028FAC.s b/asm/non_matchings/unknown_0255E0/func_80028FAC.s index 69e0bce7..aab03875 100644 --- a/asm/non_matchings/unknown_0255E0/func_80028FAC.s +++ b/asm/non_matchings/unknown_0255E0/func_80028FAC.s @@ -153,7 +153,7 @@ glabel func_80028FAC /* 029DC0 800291C0 10400033 */ beqz $v0, .L80029290 /* 029DC4 800291C4 8FA3016C */ lw $v1, 0x16c($sp) /* 029DC8 800291C8 8639002E */ lh $t9, 0x2e($s1) -/* 029DCC 800291CC 3C01800E */ lui $at, %hi(D_800E5EA4) # $at, 0x800e +/* 029DCC 800291CC 3C01800E */ lui $at, %hi(D_800E5EA0 + 4) # $at, 0x800e /* 029DD0 800291D0 02D94021 */ addu $t0, $s6, $t9 /* 029DD4 800291D4 910A0001 */ lbu $t2, 1($t0) /* 029DD8 800291D8 00000000 */ nop @@ -161,7 +161,7 @@ glabel func_80028FAC /* 029DE0 800291E0 00000000 */ nop /* 029DE4 800291E4 C6260034 */ lwc1 $f6, 0x34($s1) /* 029DE8 800291E8 C4255EA0 */ lwc1 $f5, %lo(D_800E5EA0)($at) -/* 029DEC 800291EC C4245EA4 */ lwc1 $f4, %lo(D_800E5EA4)($at) +/* 029DEC 800291EC C4245EA4 */ lwc1 $f4, %lo(D_800E5EA0 + 4)($at) /* 029DF0 800291F0 46003221 */ cvt.d.s $f8, $f6 /* 029DF4 800291F4 4628203C */ c.lt.d $f4, $f8 /* 029DF8 800291F8 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s index 00355b84..a7672b2d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A5F8.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A5F8.s @@ -181,10 +181,10 @@ glabel func_8002A5F8 /* 02B480 8002A880 3C028012 */ lui $v0, %hi(D_8011D380) # $v0, 0x8012 /* 02B484 8002A884 2442D380 */ addiu $v0, %lo(D_8011D380) # addiu $v0, $v0, -0x2c80 /* 02B488 8002A888 E4400000 */ swc1 $f0, ($v0) -/* 02B48C 8002A88C 3C01800E */ lui $at, %hi(D_800E5EAC) # $at, 0x800e +/* 02B48C 8002A88C 3C01800E */ lui $at, %hi(D_800E5EA8 + 4) # $at, 0x800e /* 02B490 8002A890 C4460000 */ lwc1 $f6, ($v0) /* 02B494 8002A894 C42B5EA8 */ lwc1 $f11, %lo(D_800E5EA8)($at) -/* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EAC)($at) +/* 02B498 8002A898 C42A5EAC */ lwc1 $f10, %lo(D_800E5EA8 + 4)($at) /* 02B49C 8002A89C 46003221 */ cvt.d.s $f8, $f6 /* 02B4A0 8002A8A0 462A403C */ c.lt.d $f8, $f10 /* 02B4A4 8002A8A4 3C018012 */ lui $at, %hi(D_8011B0BC) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_0255E0/func_8002A900.s b/asm/non_matchings/unknown_0255E0/func_8002A900.s index c752834e..b090a238 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A900.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A900.s @@ -63,7 +63,7 @@ glabel func_8002A900 /* 02B5CC 8002A9CC 44833000 */ mtc1 $v1, $f6 /* 02B5D0 8002A9D0 8FA5003C */ lw $a1, 0x3c($sp) /* 02B5D4 8002A9D4 46803320 */ cvt.s.w $f12, $f6 -/* 02B5D8 8002A9D8 3C01800E */ lui $at, %hi(D_800E5EB4) # $at, 0x800e +/* 02B5D8 8002A9D8 3C01800E */ lui $at, %hi(D_800E5EB0 + 4) # $at, 0x800e /* 02B5DC 8002A9DC 4600603C */ c.lt.s $f12, $f0 /* 02B5E0 8002A9E0 00000000 */ nop /* 02B5E4 8002A9E4 45000003 */ bc1f .L8002A9F4 @@ -74,7 +74,7 @@ glabel func_8002A900 /* 02B5F4 8002A9F4 44834000 */ mtc1 $v1, $f8 /* 02B5F8 8002A9F8 C4255EB0 */ lwc1 $f5, %lo(D_800E5EB0)($at) /* 02B5FC 8002A9FC 468042A1 */ cvt.d.w $f10, $f8 -/* 02B600 8002AA00 C4245EB4 */ lwc1 $f4, %lo(D_800E5EB4)($at) +/* 02B600 8002AA00 C4245EB4 */ lwc1 $f4, %lo(D_800E5EB0 + 4)($at) /* 02B604 8002AA04 00000000 */ nop /* 02B608 8002AA08 46245182 */ mul.d $f6, $f10, $f4 /* 02B60C 8002AA0C 462030A0 */ cvt.s.d $f2, $f6 @@ -104,7 +104,7 @@ glabel func_8002A900 /* 02B66C 8002AA6C 3C01800E */ lui $at, %hi(D_800E5EB8) # $at, 0x800e /* 02B670 8002AA70 460051A1 */ cvt.d.s $f6, $f10 /* 02B674 8002AA74 46262201 */ sub.d $f8, $f4, $f6 -/* 02B678 8002AA78 C4265EBC */ lwc1 $f6, %lo(D_800E5EBC)($at) +/* 02B678 8002AA78 C4265EBC */ lwc1 $f6, %lo(D_800E5EB8 + 4)($at) /* 02B67C 8002AA7C 462042A0 */ cvt.s.d $f10, $f8 /* 02B680 8002AA80 C4275EB8 */ lwc1 $f7, %lo(D_800E5EB8)($at) /* 02B684 8002AA84 46005121 */ cvt.d.s $f4, $f10 diff --git a/asm/non_matchings/unknown_0255E0/func_8002DE30.s b/asm/non_matchings/unknown_0255E0/func_8002DE30.s index a6d02aad..810d1f7d 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002DE30.s +++ b/asm/non_matchings/unknown_0255E0/func_8002DE30.s @@ -104,9 +104,9 @@ glabel func_8002DE30 /* 02EBB4 8002DFB4 00005025 */ move $t2, $zero /* 02EBB8 8002DFB8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 02EBBC 8002DFBC 4481B000 */ mtc1 $at, $f22 -/* 02EBC0 8002DFC0 3C01800E */ lui $at, %hi(D_800E5F44) # $at, 0x800e +/* 02EBC0 8002DFC0 3C01800E */ lui $at, %hi(D_800E5F40 + 4) # $at, 0x800e /* 02EBC4 8002DFC4 C4355F40 */ lwc1 $f21, %lo(D_800E5F40)($at) -/* 02EBC8 8002DFC8 C4345F44 */ lwc1 $f20, %lo(D_800E5F44)($at) +/* 02EBC8 8002DFC8 C4345F44 */ lwc1 $f20, %lo(D_800E5F40 + 4)($at) /* 02EBCC 8002DFCC 8EA2000C */ lw $v0, 0xc($s5) /* 02EBD0 8002DFD0 24120003 */ li $s2, 3 /* 02EBD4 8002DFD4 2411000A */ li $s1, 10 diff --git a/asm/non_matchings/unknown_032760/func_80033F60.s b/asm/non_matchings/unknown_032760/func_80033F60.s index 6a16baf0..f16888ac 100644 --- a/asm/non_matchings/unknown_032760/func_80033F60.s +++ b/asm/non_matchings/unknown_032760/func_80033F60.s @@ -20,9 +20,9 @@ glabel func_80033F60 /* 034B84 80033F84 00808025 */ move $s0, $a0 /* 034B88 80033F88 15E00008 */ bnez $t7, .L80033FAC /* 034B8C 80033F8C E7A0007C */ swc1 $f0, 0x7c($sp) -/* 034B90 80033F90 3C01800E */ lui $at, %hi(D_800E5FE4) # $at, 0x800e +/* 034B90 80033F90 3C01800E */ lui $at, %hi(D_800E5FE0 + 4) # $at, 0x800e /* 034B94 80033F94 C4295FE0 */ lwc1 $f9, %lo(D_800E5FE0)($at) -/* 034B98 80033F98 C4285FE4 */ lwc1 $f8, %lo(D_800E5FE4)($at) +/* 034B98 80033F98 C4285FE4 */ lwc1 $f8, %lo(D_800E5FE0 + 4)($at) /* 034B9C 80033F9C 460001A1 */ cvt.d.s $f6, $f0 /* 034BA0 80033FA0 46283282 */ mul.d $f10, $f6, $f8 /* 034BA4 80033FA4 46205120 */ cvt.s.d $f4, $f10 @@ -55,10 +55,10 @@ glabel func_80033F60 .L8003400C: /* 034C0C 8003400C C466000C */ lwc1 $f6, 0xc($v1) /* 034C10 80034010 C608000C */ lwc1 $f8, 0xc($s0) -/* 034C14 80034014 3C01800E */ lui $at, %hi(D_800E5FEC) # $at, 0x800e +/* 034C14 80034014 3C01800E */ lui $at, %hi(D_800E5FE8 + 4) # $at, 0x800e /* 034C18 80034018 46083281 */ sub.s $f10, $f6, $f8 /* 034C1C 8003401C C4335FE8 */ lwc1 $f19, %lo(D_800E5FE8)($at) -/* 034C20 80034020 C4325FEC */ lwc1 $f18, %lo(D_800E5FEC)($at) +/* 034C20 80034020 C4325FEC */ lwc1 $f18, %lo(D_800E5FE8 + 4)($at) /* 034C24 80034024 46005121 */ cvt.d.s $f4, $f10 /* 034C28 80034028 46322182 */ mul.d $f6, $f4, $f18 /* 034C2C 8003402C 3C014024 */ li $at, 0x40240000 # 2.562500 @@ -332,10 +332,10 @@ glabel func_80033F60 /* 03502C 8003442C 0C00FF11 */ jal func_8003FC44 /* 035030 80034430 E7A80014 */ swc1 $f8, 0x14($sp) .L80034434: -/* 035034 80034434 3C01800E */ lui $at, %hi(D_800E5FF4) # $at, 0x800e +/* 035034 80034434 3C01800E */ lui $at, %hi(D_800E5FF0 + 4) # $at, 0x800e /* 035038 80034438 C60A0008 */ lwc1 $f10, 8($s0) /* 03503C 8003443C C4275FF0 */ lwc1 $f7, %lo(D_800E5FF0)($at) -/* 035040 80034440 C4265FF4 */ lwc1 $f6, %lo(D_800E5FF4)($at) +/* 035040 80034440 C4265FF4 */ lwc1 $f6, %lo(D_800E5FF0 + 4)($at) /* 035044 80034444 46005121 */ cvt.d.s $f4, $f10 /* 035048 80034448 46262202 */ mul.d $f8, $f4, $f6 /* 03504C 8003444C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 diff --git a/asm/non_matchings/unknown_032760/func_80034860.s b/asm/non_matchings/unknown_032760/func_80034860.s index 7ef7f2fd..15263e57 100644 --- a/asm/non_matchings/unknown_032760/func_80034860.s +++ b/asm/non_matchings/unknown_032760/func_80034860.s @@ -18,9 +18,9 @@ glabel func_80034860 /* 035484 80034884 00004025 */ move $t0, $zero /* 035488 80034888 15E00007 */ bnez $t7, .L800348A8 /* 03548C 8003488C 46001006 */ mov.s $f0, $f2 -/* 035490 80034890 3C01800E */ lui $at, %hi(D_800E5FFC) # $at, 0x800e +/* 035490 80034890 3C01800E */ lui $at, %hi(D_800E5FF8 + 4) # $at, 0x800e /* 035494 80034894 C4295FF8 */ lwc1 $f9, %lo(D_800E5FF8)($at) -/* 035498 80034898 C4285FFC */ lwc1 $f8, %lo(D_800E5FFC)($at) +/* 035498 80034898 C4285FFC */ lwc1 $f8, %lo(D_800E5FF8 + 4)($at) /* 03549C 8003489C 460011A1 */ cvt.d.s $f6, $f2 /* 0354A0 800348A0 46283282 */ mul.d $f10, $f6, $f8 /* 0354A4 800348A4 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80035260.s b/asm/non_matchings/unknown_032760/func_80035260.s index 9eef6a6b..6531724f 100644 --- a/asm/non_matchings/unknown_032760/func_80035260.s +++ b/asm/non_matchings/unknown_032760/func_80035260.s @@ -20,9 +20,9 @@ glabel func_80035260 /* 035E84 80035284 00808025 */ move $s0, $a0 /* 035E88 80035288 15C00007 */ bnez $t6, .L800352A8 /* 035E8C 8003528C 46001006 */ mov.s $f0, $f2 -/* 035E90 80035290 3C01800E */ lui $at, %hi(D_800E6014) # $at, 0x800e +/* 035E90 80035290 3C01800E */ lui $at, %hi(D_800E6010 + 4) # $at, 0x800e /* 035E94 80035294 C4296010 */ lwc1 $f9, %lo(D_800E6010)($at) -/* 035E98 80035298 C4286014 */ lwc1 $f8, %lo(D_800E6014)($at) +/* 035E98 80035298 C4286014 */ lwc1 $f8, %lo(D_800E6010 + 4)($at) /* 035E9C 8003529C 460011A1 */ cvt.d.s $f6, $f2 /* 035EA0 800352A0 46283282 */ mul.d $f10, $f6, $f8 /* 035EA4 800352A4 46205020 */ cvt.s.d $f0, $f10 @@ -88,10 +88,10 @@ glabel func_80035260 /* 035F88 80035388 C606000C */ lwc1 $f6, 0xc($s0) /* 035F8C 8003538C C7A00038 */ lwc1 $f0, 0x38($sp) /* 035F90 80035390 46068101 */ sub.s $f4, $f16, $f6 -/* 035F94 80035394 3C01800E */ lui $at, %hi(D_800E601C) # $at, 0x800e +/* 035F94 80035394 3C01800E */ lui $at, %hi(D_800E6018 + 4) # $at, 0x800e /* 035F98 80035398 46002283 */ div.s $f10, $f4, $f0 /* 035F9C 8003539C C4236018 */ lwc1 $f3, %lo(D_800E6018)($at) -/* 035FA0 800353A0 C422601C */ lwc1 $f2, %lo(D_800E601C)($at) +/* 035FA0 800353A0 C422601C */ lwc1 $f2, %lo(D_800E6018 + 4)($at) /* 035FA4 800353A4 C6120010 */ lwc1 $f18, 0x10($s0) /* 035FA8 800353A8 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 035FAC 800353AC E60A001C */ swc1 $f10, 0x1c($s0) @@ -131,7 +131,7 @@ glabel func_80035260 /* 036034 80035434 E612001C */ swc1 $f18, 0x1c($s0) /* 036038 80035438 462022A0 */ cvt.s.d $f10, $f4 /* 03603C 8003543C E60A0024 */ swc1 $f10, 0x24($s0) -/* 036040 80035440 C4306024 */ lwc1 $f16, %lo(D_800E6024)($at) +/* 036040 80035440 C4306024 */ lwc1 $f16, %lo(D_800E6020 + 4)($at) /* 036044 80035444 C4316020 */ lwc1 $f17, %lo(D_800E6020)($at) /* 036048 80035448 460044A1 */ cvt.d.s $f18, $f8 /* 03604C 8003544C 46309182 */ mul.d $f6, $f18, $f16 diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index d4d9789e..ac2666b8 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -24,9 +24,9 @@ glabel func_800361E0 /* 036E0C 8003620C 46000086 */ mov.s $f2, $f0 /* 036E10 80036210 15E00007 */ bnez $t7, .L80036230 /* 036E14 80036214 E7A4006C */ swc1 $f4, 0x6c($sp) -/* 036E18 80036218 3C01800E */ lui $at, %hi(D_800E602C) # $at, 0x800e +/* 036E18 80036218 3C01800E */ lui $at, %hi(D_800E6028 + 4) # $at, 0x800e /* 036E1C 8003621C C42B6028 */ lwc1 $f11, %lo(D_800E6028)($at) -/* 036E20 80036220 C42A602C */ lwc1 $f10, %lo(D_800E602C)($at) +/* 036E20 80036220 C42A602C */ lwc1 $f10, %lo(D_800E6028 + 4)($at) /* 036E24 80036224 46000221 */ cvt.d.s $f8, $f0 /* 036E28 80036228 462A4482 */ mul.d $f18, $f8, $f10 /* 036E2C 8003622C 462090A0 */ cvt.s.d $f2, $f18 @@ -133,10 +133,10 @@ glabel func_800361E0 /* 036FAC 800363AC 8E0D0078 */ lw $t5, 0x78($s0) /* 036FB0 800363B0 8FA3005C */ lw $v1, 0x5c($sp) /* 036FB4 800363B4 15A00047 */ bnez $t5, .L800364D4 -/* 036FB8 800363B8 3C01800E */ lui $at, %hi(D_800E6034) # $at, 0x800e +/* 036FB8 800363B8 3C01800E */ lui $at, %hi(D_800E6030 + 4) # $at, 0x800e /* 036FBC 800363BC C7B20070 */ lwc1 $f18, 0x70($sp) /* 036FC0 800363C0 C42B6030 */ lwc1 $f11, %lo(D_800E6030)($at) -/* 036FC4 800363C4 C42A6034 */ lwc1 $f10, %lo(D_800E6034)($at) +/* 036FC4 800363C4 C42A6034 */ lwc1 $f10, %lo(D_800E6030 + 4)($at) /* 036FC8 800363C8 46009221 */ cvt.d.s $f8, $f18 /* 036FCC 800363CC 462A403C */ c.lt.d $f8, $f10 /* 036FD0 800363D0 00000000 */ nop @@ -407,10 +407,10 @@ glabel func_800361E0 /* 0373A4 800367A4 00000000 */ nop /* 0373A8 800367A8 24030010 */ li $v1, 16 .L800367AC: -/* 0373AC 800367AC 3C01800E */ lui $at, %hi(D_800E603C) # $at, 0x800e +/* 0373AC 800367AC 3C01800E */ lui $at, %hi(D_800E6038 + 4) # $at, 0x800e /* 0373B0 800367B0 0003C903 */ sra $t9, $v1, 4 /* 0373B4 800367B4 C4216038 */ lwc1 $f1, %lo(D_800E6038)($at) -/* 0373B8 800367B8 C420603C */ lwc1 $f0, %lo(D_800E603C)($at) +/* 0373B8 800367B8 C420603C */ lwc1 $f0, %lo(D_800E6038 + 4)($at) /* 0373BC 800367BC 00994021 */ addu $t0, $a0, $t9 /* 0373C0 800367C0 A6080000 */ sh $t0, ($s0) /* 0373C4 800367C4 C7B20078 */ lwc1 $f18, 0x78($sp) @@ -451,10 +451,10 @@ glabel func_800361E0 /* 03744C 8003684C 10000099 */ b .L80036AB4 /* 037450 80036850 C7AA006C */ lwc1 $f10, 0x6c($sp) .L80036854: -/* 037454 80036854 3C01800E */ lui $at, %hi(D_800E6044) # $at, 0x800e +/* 037454 80036854 3C01800E */ lui $at, %hi(D_800E6040 + 4) # $at, 0x800e /* 037458 80036858 C7A40078 */ lwc1 $f4, 0x78($sp) /* 03745C 8003685C C4216040 */ lwc1 $f1, %lo(D_800E6040)($at) -/* 037460 80036860 C4206044 */ lwc1 $f0, %lo(D_800E6044)($at) +/* 037460 80036860 C4206044 */ lwc1 $f0, %lo(D_800E6040 + 4)($at) /* 037464 80036864 460024A1 */ cvt.d.s $f18, $f4 /* 037468 80036868 46209202 */ mul.d $f8, $f18, $f0 /* 03746C 8003686C 240A0001 */ li $t2, 1 diff --git a/asm/non_matchings/unknown_032760/func_800389B8.s b/asm/non_matchings/unknown_032760/func_800389B8.s index f33667dc..406d5c38 100644 --- a/asm/non_matchings/unknown_032760/func_800389B8.s +++ b/asm/non_matchings/unknown_032760/func_800389B8.s @@ -12,9 +12,9 @@ glabel func_800389B8 /* 0395CC 800389CC AFBF0014 */ sw $ra, 0x14($sp) /* 0395D0 800389D0 15C00007 */ bnez $t6, .L800389F0 /* 0395D4 800389D4 46001006 */ mov.s $f0, $f2 -/* 0395D8 800389D8 3C01800E */ lui $at, %hi(D_800E6054) # $at, 0x800e +/* 0395D8 800389D8 3C01800E */ lui $at, %hi(D_800E6050 + 4) # $at, 0x800e /* 0395DC 800389DC C4296050 */ lwc1 $f9, %lo(D_800E6050)($at) -/* 0395E0 800389E0 C4286054 */ lwc1 $f8, %lo(D_800E6054)($at) +/* 0395E0 800389E0 C4286054 */ lwc1 $f8, %lo(D_800E6050 + 4)($at) /* 0395E4 800389E4 460011A1 */ cvt.d.s $f6, $f2 /* 0395E8 800389E8 46283282 */ mul.d $f10, $f6, $f8 /* 0395EC 800389EC 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80038AD4.s b/asm/non_matchings/unknown_032760/func_80038AD4.s index 1e4562ef..c1bb434f 100644 --- a/asm/non_matchings/unknown_032760/func_80038AD4.s +++ b/asm/non_matchings/unknown_032760/func_80038AD4.s @@ -12,9 +12,9 @@ glabel func_80038AD4 /* 0396E8 80038AE8 AFBF0014 */ sw $ra, 0x14($sp) /* 0396EC 80038AEC 15C00007 */ bnez $t6, .L80038B0C /* 0396F0 80038AF0 46001006 */ mov.s $f0, $f2 -/* 0396F4 80038AF4 3C01800E */ lui $at, %hi(D_800E605C) # $at, 0x800e +/* 0396F4 80038AF4 3C01800E */ lui $at, %hi(D_800E6058 + 4) # $at, 0x800e /* 0396F8 80038AF8 C4296058 */ lwc1 $f9, %lo(D_800E6058)($at) -/* 0396FC 80038AFC C428605C */ lwc1 $f8, %lo(D_800E605C)($at) +/* 0396FC 80038AFC C428605C */ lwc1 $f8, %lo(D_800E6058 + 4)($at) /* 039700 80038B00 460011A1 */ cvt.d.s $f6, $f2 /* 039704 80038B04 46283282 */ mul.d $f10, $f6, $f8 /* 039708 80038B08 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 9e814259..c7a5784d 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -35,9 +35,9 @@ glabel func_80039330 /* 039F60 80039360 46001006 */ mov.s $f0, $f2 /* 039F64 80039364 15E00007 */ bnez $t7, .L80039384 /* 039F68 80039368 E7A40098 */ swc1 $f4, 0x98($sp) -/* 039F6C 8003936C 3C01800E */ lui $at, %hi(D_800E6064) # $at, 0x800e +/* 039F6C 8003936C 3C01800E */ lui $at, %hi(D_800E6060 + 4) # $at, 0x800e /* 039F70 80039370 C42B6060 */ lwc1 $f11, %lo(D_800E6060)($at) -/* 039F74 80039374 C42A6064 */ lwc1 $f10, %lo(D_800E6064)($at) +/* 039F74 80039374 C42A6064 */ lwc1 $f10, %lo(D_800E6060 + 4)($at) /* 039F78 80039378 46001221 */ cvt.d.s $f8, $f2 /* 039F7C 8003937C 462A4402 */ mul.d $f16, $f8, $f10 /* 039F80 80039380 46208020 */ cvt.s.d $f0, $f16 @@ -103,10 +103,10 @@ glabel func_80039330 /* 03A064 80039464 8E190078 */ lw $t9, 0x78($s0) /* 03A068 80039468 00003025 */ move $a2, $zero /* 03A06C 8003946C 1720003C */ bnez $t9, .L80039560 -/* 03A070 80039470 3C01800E */ lui $at, %hi(D_800E606C) # $at, 0x800e +/* 03A070 80039470 3C01800E */ lui $at, %hi(D_800E6068 + 4) # $at, 0x800e /* 03A074 80039474 C7A6009C */ lwc1 $f6, 0x9c($sp) /* 03A078 80039478 C4316068 */ lwc1 $f17, %lo(D_800E6068)($at) -/* 03A07C 8003947C C430606C */ lwc1 $f16, %lo(D_800E606C)($at) +/* 03A07C 8003947C C430606C */ lwc1 $f16, %lo(D_800E6068 + 4)($at) /* 03A080 80039480 46003221 */ cvt.d.s $f8, $f6 /* 03A084 80039484 4630403C */ c.lt.d $f8, $f16 /* 03A088 80039488 00000000 */ nop @@ -567,7 +567,7 @@ glabel L80039AE0 /* 03A708 80039B08 462022A0 */ cvt.s.d $f10, $f4 /* 03A70C 80039B0C E62A0004 */ swc1 $f10, 4($s1) /* 03A710 80039B10 C6280004 */ lwc1 $f8, 4($s1) -/* 03A714 80039B14 C4326144 */ lwc1 $f18, %lo(D_800E6144)($at) +/* 03A714 80039B14 C4326144 */ lwc1 $f18, %lo(D_800E6140 + 4)($at) /* 03A718 80039B18 C4336140 */ lwc1 $f19, %lo(D_800E6140)($at) /* 03A71C 80039B1C 460041A1 */ cvt.d.s $f6, $f8 /* 03A720 80039B20 4626903C */ c.lt.d $f18, $f6 @@ -1415,10 +1415,10 @@ glabel L8003A5AC /* 03B360 8003A760 000F2403 */ sra $a0, $t7, 0x10 /* 03B364 8003A764 C7AC0048 */ lwc1 $f12, 0x48($sp) /* 03B368 8003A768 C7B200A8 */ lwc1 $f18, 0xa8($sp) -/* 03B36C 8003A76C 3C01800E */ lui $at, %hi(D_800E6154) # $at, 0x800e +/* 03B36C 8003A76C 3C01800E */ lui $at, %hi(D_800E6150 + 4) # $at, 0x800e /* 03B370 8003A770 46126402 */ mul.s $f16, $f12, $f18 /* 03B374 8003A774 C4236150 */ lwc1 $f3, %lo(D_800E6150)($at) -/* 03B378 8003A778 C4226154 */ lwc1 $f2, %lo(D_800E6154)($at) +/* 03B378 8003A778 C4226154 */ lwc1 $f2, %lo(D_800E6150 + 4)($at) /* 03B37C 8003A77C 02002025 */ move $a0, $s0 /* 03B380 8003A780 460082A1 */ cvt.d.s $f10, $f16 /* 03B384 8003A784 46225202 */ mul.d $f8, $f10, $f2 @@ -1433,11 +1433,11 @@ glabel L8003A5AC /* 03B3A8 8003A7A8 0C00455C */ jal func_80011570 /* 03B3AC 8003A7AC 00000000 */ nop /* 03B3B0 8003A7B0 8FB900B4 */ lw $t9, 0xb4($sp) -/* 03B3B4 8003A7B4 3C01800E */ lui $at, %hi(D_800E615C) # $at, 0x800e +/* 03B3B4 8003A7B4 3C01800E */ lui $at, %hi(D_800E6158 + 4) # $at, 0x800e /* 03B3B8 8003A7B8 44994000 */ mtc1 $t9, $f8 /* 03B3BC 8003A7BC C4276158 */ lwc1 $f7, %lo(D_800E6158)($at) /* 03B3C0 8003A7C0 46804121 */ cvt.d.w $f4, $f8 -/* 03B3C4 8003A7C4 C426615C */ lwc1 $f6, %lo(D_800E615C)($at) +/* 03B3C4 8003A7C4 C426615C */ lwc1 $f6, %lo(D_800E6158 + 4)($at) /* 03B3C8 8003A7C8 C6300004 */ lwc1 $f16, 4($s1) /* 03B3CC 8003A7CC 46262482 */ mul.d $f18, $f4, $f6 /* 03B3D0 8003A7D0 460082A1 */ cvt.d.s $f10, $f16 diff --git a/asm/non_matchings/unknown_032760/func_8003B4BC.s b/asm/non_matchings/unknown_032760/func_8003B4BC.s index 4ca2c046..24d3ca79 100644 --- a/asm/non_matchings/unknown_032760/func_8003B4BC.s +++ b/asm/non_matchings/unknown_032760/func_8003B4BC.s @@ -16,9 +16,9 @@ glabel func_8003B4BC /* 03C0E0 8003B4E0 AFA50054 */ sw $a1, 0x54($sp) /* 03C0E4 8003B4E4 15E00007 */ bnez $t7, .L8003B504 /* 03C0E8 8003B4E8 46000086 */ mov.s $f2, $f0 -/* 03C0EC 8003B4EC 3C01800E */ lui $at, %hi(D_800E6164) # $at, 0x800e +/* 03C0EC 8003B4EC 3C01800E */ lui $at, %hi(D_800E6160 + 4) # $at, 0x800e /* 03C0F0 8003B4F0 C4296160 */ lwc1 $f9, %lo(D_800E6160)($at) -/* 03C0F4 8003B4F4 C4286164 */ lwc1 $f8, %lo(D_800E6164)($at) +/* 03C0F4 8003B4F4 C4286164 */ lwc1 $f8, %lo(D_800E6160 + 4)($at) /* 03C0F8 8003B4F8 460001A1 */ cvt.d.s $f6, $f0 /* 03C0FC 8003B4FC 46283282 */ mul.d $f10, $f6, $f8 /* 03C100 8003B500 462050A0 */ cvt.s.d $f2, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003B988.s b/asm/non_matchings/unknown_032760/func_8003B988.s index 3fe49df6..855d9eac 100644 --- a/asm/non_matchings/unknown_032760/func_8003B988.s +++ b/asm/non_matchings/unknown_032760/func_8003B988.s @@ -19,9 +19,9 @@ glabel func_8003B988 /* 03C5B0 8003B9B0 46000086 */ mov.s $f2, $f0 /* 03C5B4 8003B9B4 17000007 */ bnez $t8, .L8003B9D4 /* 03C5B8 8003B9B8 AFAE0034 */ sw $t6, 0x34($sp) -/* 03C5BC 8003B9BC 3C01800E */ lui $at, %hi(D_800E616C) # $at, 0x800e +/* 03C5BC 8003B9BC 3C01800E */ lui $at, %hi(D_800E6168 + 4) # $at, 0x800e /* 03C5C0 8003B9C0 C4296168 */ lwc1 $f9, %lo(D_800E6168)($at) -/* 03C5C4 8003B9C4 C428616C */ lwc1 $f8, %lo(D_800E616C)($at) +/* 03C5C4 8003B9C4 C428616C */ lwc1 $f8, %lo(D_800E6168 + 4)($at) /* 03C5C8 8003B9C8 460001A1 */ cvt.d.s $f6, $f0 /* 03C5CC 8003B9CC 46283282 */ mul.d $f10, $f6, $f8 /* 03C5D0 8003B9D0 462050A0 */ cvt.s.d $f2, $f10 @@ -324,10 +324,10 @@ glabel func_8003B988 /* 03CA1C 8003BE1C 2401FFFF */ li $at, -1 /* 03CA20 8003BE20 14C30015 */ bne $a2, $v1, .L8003BE78 /* 03CA24 8003BE24 00000000 */ nop -/* 03CA28 8003BE28 3C01800E */ lui $at, %hi(D_800E6174) # $at, 0x800e +/* 03CA28 8003BE28 3C01800E */ lui $at, %hi(D_800E6170 + 4) # $at, 0x800e /* 03CA2C 8003BE2C C5120000 */ lwc1 $f18, ($t0) /* 03CA30 8003BE30 C4276170 */ lwc1 $f7, %lo(D_800E6170)($at) -/* 03CA34 8003BE34 C4266174 */ lwc1 $f6, %lo(D_800E6174)($at) +/* 03CA34 8003BE34 C4266174 */ lwc1 $f6, %lo(D_800E6170 + 4)($at) /* 03CA38 8003BE38 C6100010 */ lwc1 $f16, 0x10($s0) /* 03CA3C 8003BE3C 46009121 */ cvt.d.s $f4, $f18 /* 03CA40 8003BE40 46262200 */ add.d $f8, $f4, $f6 diff --git a/asm/non_matchings/unknown_032760/func_8003CA68.s b/asm/non_matchings/unknown_032760/func_8003CA68.s index 7204ae6d..778100e7 100644 --- a/asm/non_matchings/unknown_032760/func_8003CA68.s +++ b/asm/non_matchings/unknown_032760/func_8003CA68.s @@ -17,9 +17,9 @@ glabel func_8003CA68 /* 03D690 8003CA90 00808025 */ move $s0, $a0 /* 03D694 8003CA94 15E00007 */ bnez $t7, .L8003CAB4 /* 03D698 8003CA98 46000306 */ mov.s $f12, $f0 -/* 03D69C 8003CA9C 3C01800E */ lui $at, %hi(D_800E617C) # $at, 0x800e +/* 03D69C 8003CA9C 3C01800E */ lui $at, %hi(D_800E6178 + 4) # $at, 0x800e /* 03D6A0 8003CAA0 C4296178 */ lwc1 $f9, %lo(D_800E6178)($at) -/* 03D6A4 8003CAA4 C428617C */ lwc1 $f8, %lo(D_800E617C)($at) +/* 03D6A4 8003CAA4 C428617C */ lwc1 $f8, %lo(D_800E6178 + 4)($at) /* 03D6A8 8003CAA8 460001A1 */ cvt.d.s $f6, $f0 /* 03D6AC 8003CAAC 46283282 */ mul.d $f10, $f6, $f8 /* 03D6B0 8003CAB0 46205320 */ cvt.s.d $f12, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003D2B8.s b/asm/non_matchings/unknown_032760/func_8003D2B8.s index cbc7533b..815b39aa 100644 --- a/asm/non_matchings/unknown_032760/func_8003D2B8.s +++ b/asm/non_matchings/unknown_032760/func_8003D2B8.s @@ -15,9 +15,9 @@ glabel func_8003D2B8 /* 03DED8 8003D2D8 AFA5002C */ sw $a1, 0x2c($sp) /* 03DEDC 8003D2DC 15E00007 */ bnez $t7, .L8003D2FC /* 03DEE0 8003D2E0 46001006 */ mov.s $f0, $f2 -/* 03DEE4 8003D2E4 3C01800E */ lui $at, %hi(D_800E618C) # $at, 0x800e +/* 03DEE4 8003D2E4 3C01800E */ lui $at, %hi(D_800E6188 + 4) # $at, 0x800e /* 03DEE8 8003D2E8 C4296188 */ lwc1 $f9, %lo(D_800E6188)($at) -/* 03DEEC 8003D2EC C428618C */ lwc1 $f8, %lo(D_800E618C)($at) +/* 03DEEC 8003D2EC C428618C */ lwc1 $f8, %lo(D_800E6188 + 4)($at) /* 03DEF0 8003D2F0 460011A1 */ cvt.d.s $f6, $f2 /* 03DEF4 8003D2F4 46283282 */ mul.d $f10, $f6, $f8 /* 03DEF8 8003D2F8 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index 108cf425..d9adafde 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -19,9 +19,9 @@ glabel func_8003D5A0 /* 03E1C0 8003D5C0 AFA50074 */ sw $a1, 0x74($sp) /* 03E1C4 8003D5C4 15E00007 */ bnez $t7, .L8003D5E4 /* 03E1C8 8003D5C8 46001006 */ mov.s $f0, $f2 -/* 03E1CC 8003D5CC 3C01800E */ lui $at, %hi(D_800E6194) # $at, 0x800e +/* 03E1CC 8003D5CC 3C01800E */ lui $at, %hi(D_800E6190 + 4) # $at, 0x800e /* 03E1D0 8003D5D0 C4296190 */ lwc1 $f9, %lo(D_800E6190)($at) -/* 03E1D4 8003D5D4 C4286194 */ lwc1 $f8, %lo(D_800E6194)($at) +/* 03E1D4 8003D5D4 C4286194 */ lwc1 $f8, %lo(D_800E6190 + 4)($at) /* 03E1D8 8003D5D8 460011A1 */ cvt.d.s $f6, $f2 /* 03E1DC 8003D5DC 46283282 */ mul.d $f10, $f6, $f8 /* 03E1E0 8003D5E0 46205020 */ cvt.s.d $f0, $f10 @@ -154,9 +154,9 @@ glabel func_8003D5A0 /* 03E3CC 8003D7CC 818E0009 */ lb $t6, 9($t4) /* 03E3D0 8003D7D0 00000000 */ nop /* 03E3D4 8003D7D4 11C10016 */ beq $t6, $at, .L8003D830 -/* 03E3D8 8003D7D8 3C01800E */ lui $at, %hi(D_800E619C) # $at, 0x800e +/* 03E3D8 8003D7D8 3C01800E */ lui $at, %hi(D_800E6198 + 4) # $at, 0x800e /* 03E3DC 8003D7DC C4216198 */ lwc1 $f1, %lo(D_800E6198)($at) -/* 03E3E0 8003D7E0 C420619C */ lwc1 $f0, %lo(D_800E619C)($at) +/* 03E3E0 8003D7E0 C420619C */ lwc1 $f0, %lo(D_800E6198 + 4)($at) /* 03E3E4 8003D7E4 C60A0020 */ lwc1 $f10, 0x20($s0) /* 03E3E8 8003D7E8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 03E3EC 8003D7EC 44819800 */ mtc1 $at, $f19 diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/func_8003E140.s index 043f429c..0d1d01ac 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/func_8003E140.s @@ -34,7 +34,7 @@ glabel func_8003E140 /* 03ED98 8003E198 462054A0 */ cvt.s.d $f18, $f10 /* 03ED9C 8003E19C E4920008 */ swc1 $f18, 8($a0) /* 03EDA0 8003E1A0 C4900008 */ lwc1 $f16, 8($a0) -/* 03EDA4 8003E1A4 C42661AC */ lwc1 $f6, %lo(D_800E61AC)($at) +/* 03EDA4 8003E1A4 C42661AC */ lwc1 $f6, %lo(D_800E61A8 + 4)($at) /* 03EDA8 8003E1A8 C42761A8 */ lwc1 $f7, %lo(D_800E61A8)($at) /* 03EDAC 8003E1AC 46008021 */ cvt.d.s $f0, $f16 /* 03EDB0 8003E1B0 4626003C */ c.lt.d $f0, $f6 @@ -48,9 +48,9 @@ glabel func_8003E140 /* 03EDD0 8003E1D0 00000000 */ nop /* 03EDD4 8003E1D4 46002021 */ cvt.d.s $f0, $f4 .L8003E1D8: -/* 03EDD8 8003E1D8 3C01800E */ lui $at, %hi(D_800E61BC) # $at, 0x800e +/* 03EDD8 8003E1D8 3C01800E */ lui $at, %hi(D_800E61B8 + 4) # $at, 0x800e /* 03EDDC 8003E1DC C42B61B8 */ lwc1 $f11, %lo(D_800E61B8)($at) -/* 03EDE0 8003E1E0 C42A61BC */ lwc1 $f10, %lo(D_800E61BC)($at) +/* 03EDE0 8003E1E0 C42A61BC */ lwc1 $f10, %lo(D_800E61B8 + 4)($at) /* 03EDE4 8003E1E4 02002025 */ move $a0, $s0 /* 03EDE8 8003E1E8 462A003C */ c.lt.d $f0, $f10 /* 03EDEC 8003E1EC 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 87bd5787..ca434080 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -53,11 +53,11 @@ glabel func_8003E694 /* 03F34C 8003E74C 448B8000 */ mtc1 $t3, $f16 /* 03F350 8003E750 8D8C0300 */ lw $t4, %lo(osTvType)($t4) /* 03F354 8003E754 46808020 */ cvt.s.w $f0, $f16 -/* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F4) # $at, 0x800e +/* 03F358 8003E758 3C01800E */ lui $at, %hi(D_800E61F0 + 4) # $at, 0x800e /* 03F35C 8003E75C 15800006 */ bnez $t4, .L8003E778 /* 03F360 8003E760 46000086 */ mov.s $f2, $f0 /* 03F364 8003E764 C42561F0 */ lwc1 $f5, %lo(D_800E61F0)($at) -/* 03F368 8003E768 C42461F4 */ lwc1 $f4, %lo(D_800E61F4)($at) +/* 03F368 8003E768 C42461F4 */ lwc1 $f4, %lo(D_800E61F0 + 4)($at) /* 03F36C 8003E76C 460004A1 */ cvt.d.s $f18, $f0 /* 03F370 8003E770 46249182 */ mul.d $f6, $f18, $f4 /* 03F374 8003E774 462030A0 */ cvt.s.d $f2, $f6 diff --git a/asm/non_matchings/unknown_032760/func_8003EDD8.s b/asm/non_matchings/unknown_032760/func_8003EDD8.s index 08e1871b..70c5ced4 100644 --- a/asm/non_matchings/unknown_032760/func_8003EDD8.s +++ b/asm/non_matchings/unknown_032760/func_8003EDD8.s @@ -14,10 +14,10 @@ glabel func_8003EDD8 /* 03F9F4 8003EDF4 104000A1 */ beqz $v0, .L8003F07C /* 03F9F8 8003EDF8 00C08825 */ move $s1, $a2 /* 03F9FC 8003EDFC 8C430064 */ lw $v1, 0x64($v0) -/* 03FA00 8003EE00 3C01800E */ lui $at, %hi(D_800E61FC) # $at, 0x800e +/* 03FA00 8003EE00 3C01800E */ lui $at, %hi(D_800E61F8 + 4) # $at, 0x800e /* 03FA04 8003EE04 846E01BA */ lh $t6, 0x1ba($v1) /* 03FA08 8003EE08 C42D61F8 */ lwc1 $f13, %lo(D_800E61F8)($at) -/* 03FA0C 8003EE0C C42C61FC */ lwc1 $f12, %lo(D_800E61FC)($at) +/* 03FA0C 8003EE0C C42C61FC */ lwc1 $f12, %lo(D_800E61F8 + 4)($at) /* 03FA10 8003EE10 000E7843 */ sra $t7, $t6, 1 /* 03FA14 8003EE14 A4CF0014 */ sh $t7, 0x14($a2) /* 03FA18 8003EE18 847801BC */ lh $t8, 0x1bc($v1) diff --git a/asm/non_matchings/unknown_032760/func_8003F2E8.s b/asm/non_matchings/unknown_032760/func_8003F2E8.s index a54a1930..44bda8d0 100644 --- a/asm/non_matchings/unknown_032760/func_8003F2E8.s +++ b/asm/non_matchings/unknown_032760/func_8003F2E8.s @@ -28,9 +28,9 @@ glabel func_8003F2E8 /* 03FF1C 8003F31C 46001006 */ mov.s $f0, $f2 /* 03FF20 8003F320 15600007 */ bnez $t3, .L8003F340 /* 03FF24 8003F324 AFB90064 */ sw $t9, 0x64($sp) -/* 03FF28 8003F328 3C01800E */ lui $at, %hi(D_800E6204) # $at, 0x800e +/* 03FF28 8003F328 3C01800E */ lui $at, %hi(D_800E6200 + 4) # $at, 0x800e /* 03FF2C 8003F32C C4296200 */ lwc1 $f9, %lo(D_800E6200)($at) -/* 03FF30 8003F330 C4286204 */ lwc1 $f8, %lo(D_800E6204)($at) +/* 03FF30 8003F330 C4286204 */ lwc1 $f8, %lo(D_800E6200 + 4)($at) /* 03FF34 8003F334 460011A1 */ cvt.d.s $f6, $f2 /* 03FF38 8003F338 46283282 */ mul.d $f10, $f6, $f8 /* 03FF3C 8003F33C 46205020 */ cvt.s.d $f0, $f10 diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index ef6064ee..e1e5cb25 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -29,9 +29,9 @@ glabel func_800422F0 /* 042F20 80042320 E7B4001C */ swc1 $f20, 0x1c($sp) /* 042F24 80042324 15C00007 */ bnez $t6, .L80042344 /* 042F28 80042328 46000086 */ mov.s $f2, $f0 -/* 042F2C 8004232C 3C01800E */ lui $at, %hi(D_800E6254) # $at, 0x800e +/* 042F2C 8004232C 3C01800E */ lui $at, %hi(D_800E6250 + 4) # $at, 0x800e /* 042F30 80042330 C4296250 */ lwc1 $f9, %lo(D_800E6250)($at) -/* 042F34 80042334 C4286254 */ lwc1 $f8, %lo(D_800E6254)($at) +/* 042F34 80042334 C4286254 */ lwc1 $f8, %lo(D_800E6250 + 4)($at) /* 042F38 80042338 460001A1 */ cvt.d.s $f6, $f0 /* 042F3C 8004233C 46283282 */ mul.d $f10, $f6, $f8 /* 042F40 80042340 462050A0 */ cvt.s.d $f2, $f10 diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index 633d653d..62b5b94d 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -886,10 +886,10 @@ glabel func_80042D20 /* 0445A0 800439A0 15E1000F */ bne $t7, $at, .L800439E0 /* 0445A4 800439A4 00000000 */ nop /* 0445A8 800439A8 1060000D */ beqz $v1, .L800439E0 -/* 0445AC 800439AC 3C01800E */ lui $at, %hi(D_800E62AC) # $at, 0x800e +/* 0445AC 800439AC 3C01800E */ lui $at, %hi(D_800E62A8 + 4) # $at, 0x800e /* 0445B0 800439B0 C7B20090 */ lwc1 $f18, 0x90($sp) /* 0445B4 800439B4 C42B62A8 */ lwc1 $f11, %lo(D_800E62A8)($at) -/* 0445B8 800439B8 C42A62AC */ lwc1 $f10, %lo(D_800E62AC)($at) +/* 0445B8 800439B8 C42A62AC */ lwc1 $f10, %lo(D_800E62A8 + 4)($at) /* 0445BC 800439BC 460091A1 */ cvt.d.s $f6, $f18 /* 0445C0 800439C0 462A303C */ c.lt.d $f6, $f10 /* 0445C4 800439C4 240E0001 */ li $t6, 1 @@ -904,36 +904,36 @@ glabel func_80042D20 /* 0445E4 800439E4 8DEFD540 */ lw $t7, %lo(D_8011D540)($t7) /* 0445E8 800439E8 8FB90054 */ lw $t9, 0x54($sp) /* 0445EC 800439EC 15E00050 */ bnez $t7, .L80043B30 -/* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B4) # $at, 0x800e +/* 0445F0 800439F0 3C01800E */ lui $at, %hi(D_800E62B0 + 4) # $at, 0x800e /* 0445F4 800439F4 C72E0004 */ lwc1 $f14, 4($t9) /* 0445F8 800439F8 C43162B0 */ lwc1 $f17, %lo(D_800E62B0)($at) -/* 0445FC 800439FC C43062B4 */ lwc1 $f16, %lo(D_800E62B4)($at) +/* 0445FC 800439FC C43062B4 */ lwc1 $f16, %lo(D_800E62B0 + 4)($at) /* 044600 80043A00 46007221 */ cvt.d.s $f8, $f14 /* 044604 80043A04 46304102 */ mul.d $f4, $f8, $f16 -/* 044608 80043A08 3C01800E */ lui $at, %hi(D_800E62BC) # $at, 0x800e +/* 044608 80043A08 3C01800E */ lui $at, %hi(D_800E62B8 + 4) # $at, 0x800e /* 04460C 80043A0C C43362B8 */ lwc1 $f19, %lo(D_800E62B8)($at) -/* 044610 80043A10 C43262BC */ lwc1 $f18, %lo(D_800E62BC)($at) -/* 044614 80043A14 3C01800E */ lui $at, %hi(D_800E62C4) # $at, 0x800e +/* 044610 80043A10 C43262BC */ lwc1 $f18, %lo(D_800E62B8 + 4)($at) +/* 044614 80043A14 3C01800E */ lui $at, %hi(D_800E62C0 + 4) # $at, 0x800e /* 044618 80043A18 C42B62C0 */ lwc1 $f11, %lo(D_800E62C0)($at) -/* 04461C 80043A1C C42A62C4 */ lwc1 $f10, %lo(D_800E62C4)($at) +/* 04461C 80043A1C C42A62C4 */ lwc1 $f10, %lo(D_800E62C0 + 4)($at) /* 044620 80043A20 46322180 */ add.d $f6, $f4, $f18 /* 044624 80043A24 AFA9005C */ sw $t1, 0x5c($sp) /* 044628 80043A28 462A3203 */ div.d $f8, $f6, $f10 /* 04462C 80043A2C 0C0326B4 */ jal sqrtf /* 044630 80043A30 46204320 */ cvt.s.d $f12, $f8 /* 044634 80043A34 8FB80054 */ lw $t8, 0x54($sp) -/* 044638 80043A38 3C01800E */ lui $at, %hi(D_800E62CC) # $at, 0x800e +/* 044638 80043A38 3C01800E */ lui $at, %hi(D_800E62C8 + 4) # $at, 0x800e /* 04463C 80043A3C C7020000 */ lwc1 $f2, ($t8) /* 044640 80043A40 C42562C8 */ lwc1 $f5, %lo(D_800E62C8)($at) -/* 044644 80043A44 C42462CC */ lwc1 $f4, %lo(D_800E62CC)($at) +/* 044644 80043A44 C42462CC */ lwc1 $f4, %lo(D_800E62C8 + 4)($at) /* 044648 80043A48 46001421 */ cvt.d.s $f16, $f2 /* 04464C 80043A4C 46248482 */ mul.d $f18, $f16, $f4 -/* 044650 80043A50 3C01800E */ lui $at, %hi(D_800E62D4) # $at, 0x800e +/* 044650 80043A50 3C01800E */ lui $at, %hi(D_800E62D0 + 4) # $at, 0x800e /* 044654 80043A54 C42762D0 */ lwc1 $f7, %lo(D_800E62D0)($at) -/* 044658 80043A58 C42662D4 */ lwc1 $f6, %lo(D_800E62D4)($at) -/* 04465C 80043A5C 3C01800E */ lui $at, %hi(D_800E62DC) # $at, 0x800e +/* 044658 80043A58 C42662D4 */ lwc1 $f6, %lo(D_800E62D0 + 4)($at) +/* 04465C 80043A5C 3C01800E */ lui $at, %hi(D_800E62D8 + 4) # $at, 0x800e /* 044660 80043A60 C42962D8 */ lwc1 $f9, %lo(D_800E62D8)($at) -/* 044664 80043A64 C42862DC */ lwc1 $f8, %lo(D_800E62DC)($at) +/* 044664 80043A64 C42862DC */ lwc1 $f8, %lo(D_800E62D8 + 4)($at) /* 044668 80043A68 46269280 */ add.d $f10, $f18, $f6 /* 04466C 80043A6C E7A00080 */ swc1 $f0, 0x80($sp) /* 044670 80043A70 46285403 */ div.d $f16, $f10, $f8 @@ -958,10 +958,10 @@ glabel func_80042D20 /* 0446BC 80043ABC 1420000B */ bnez $at, .L80043AEC /* 0446C0 80043AC0 46006086 */ mov.s $f2, $f12 /* 0446C4 80043AC4 44992000 */ mtc1 $t9, $f4 -/* 0446C8 80043AC8 3C01800E */ lui $at, %hi(D_800E62E4) # $at, 0x800e +/* 0446C8 80043AC8 3C01800E */ lui $at, %hi(D_800E62E0 + 4) # $at, 0x800e /* 0446CC 80043ACC 468021A0 */ cvt.s.w $f6, $f4 /* 0446D0 80043AD0 C42B62E0 */ lwc1 $f11, %lo(D_800E62E0)($at) -/* 0446D4 80043AD4 C42A62E4 */ lwc1 $f10, %lo(D_800E62E4)($at) +/* 0446D4 80043AD4 C42A62E4 */ lwc1 $f10, %lo(D_800E62E0 + 4)($at) /* 0446D8 80043AD8 46003221 */ cvt.d.s $f8, $f6 /* 0446DC 80043ADC 462A4402 */ mul.d $f16, $f8, $f10 /* 0446E0 80043AE0 460064A1 */ cvt.d.s $f18, $f12 @@ -969,17 +969,17 @@ glabel func_80042D20 /* 0446E8 80043AE8 462020A0 */ cvt.s.d $f2, $f4 .L80043AEC: /* 0446EC 80043AEC 46021182 */ mul.s $f6, $f2, $f2 -/* 0446F0 80043AF0 3C01800E */ lui $at, %hi(D_800E62EC) # $at, 0x800e +/* 0446F0 80043AF0 3C01800E */ lui $at, %hi(D_800E62E8 + 4) # $at, 0x800e /* 0446F4 80043AF4 C42B62E8 */ lwc1 $f11, %lo(D_800E62E8)($at) -/* 0446F8 80043AF8 C42A62EC */ lwc1 $f10, %lo(D_800E62EC)($at) +/* 0446F8 80043AF8 C42A62EC */ lwc1 $f10, %lo(D_800E62E8 + 4)($at) /* 0446FC 80043AFC 46003221 */ cvt.d.s $f8, $f6 /* 044700 80043B00 462A4482 */ mul.d $f18, $f8, $f10 -/* 044704 80043B04 3C01800E */ lui $at, %hi(D_800E62F4) # $at, 0x800e +/* 044704 80043B04 3C01800E */ lui $at, %hi(D_800E62F0 + 4) # $at, 0x800e /* 044708 80043B08 C43162F0 */ lwc1 $f17, %lo(D_800E62F0)($at) -/* 04470C 80043B0C C43062F4 */ lwc1 $f16, %lo(D_800E62F4)($at) -/* 044710 80043B10 3C01800E */ lui $at, %hi(D_800E62FC) # $at, 0x800e +/* 04470C 80043B0C C43062F4 */ lwc1 $f16, %lo(D_800E62F0 + 4)($at) +/* 044710 80043B10 3C01800E */ lui $at, %hi(D_800E62F8 + 4) # $at, 0x800e /* 044714 80043B14 C42762F8 */ lwc1 $f7, %lo(D_800E62F8)($at) -/* 044718 80043B18 C42662FC */ lwc1 $f6, %lo(D_800E62FC)($at) +/* 044718 80043B18 C42662FC */ lwc1 $f6, %lo(D_800E62F8 + 4)($at) /* 04471C 80043B1C 46309101 */ sub.d $f4, $f18, $f16 /* 044720 80043B20 00000000 */ nop /* 044724 80043B24 46262203 */ div.d $f8, $f4, $f6 @@ -992,10 +992,10 @@ glabel func_80042D20 /* 04473C 80043B3C 821801CA */ lb $t8, 0x1ca($s0) /* 044740 80043B40 24010003 */ li $at, 3 /* 044744 80043B44 1701000A */ bne $t8, $at, .L80043B70 -/* 044748 80043B48 3C01800E */ lui $at, %hi(D_800E6304) # $at, 0x800e +/* 044748 80043B48 3C01800E */ lui $at, %hi(D_800E6300 + 4) # $at, 0x800e /* 04474C 80043B4C C7B20094 */ lwc1 $f18, 0x94($sp) /* 044750 80043B50 C42B6300 */ lwc1 $f11, %lo(D_800E6300)($at) -/* 044754 80043B54 C42A6304 */ lwc1 $f10, %lo(D_800E6304)($at) +/* 044754 80043B54 C42A6304 */ lwc1 $f10, %lo(D_800E6300 + 4)($at) /* 044758 80043B58 46009421 */ cvt.d.s $f16, $f18 /* 04475C 80043B5C 4630503C */ c.lt.d $f10, $f16 /* 044760 80043B60 240E0002 */ li $t6, 2 @@ -1120,10 +1120,10 @@ glabel func_80042D20 /* 044914 80043D14 24010001 */ li $at, 1 /* 044918 80043D18 17210033 */ bne $t9, $at, .L80043DE8 /* 04491C 80043D1C A4600000 */ sh $zero, ($v1) -/* 044920 80043D20 3C01800E */ lui $at, %hi(D_800E630C) # $at, 0x800e +/* 044920 80043D20 3C01800E */ lui $at, %hi(D_800E6308 + 4) # $at, 0x800e /* 044924 80043D24 C7B00094 */ lwc1 $f16, 0x94($sp) /* 044928 80043D28 C42B6308 */ lwc1 $f11, %lo(D_800E6308)($at) -/* 04492C 80043D2C C42A630C */ lwc1 $f10, %lo(D_800E630C)($at) +/* 04492C 80043D2C C42A630C */ lwc1 $f10, %lo(D_800E6308 + 4)($at) /* 044930 80043D30 46008121 */ cvt.d.s $f4, $f16 /* 044934 80043D34 4624503C */ c.lt.d $f10, $f4 /* 044938 80043D38 3C014000 */ li $at, 0x40000000 # 2.000000 @@ -1188,10 +1188,10 @@ glabel func_80042D20 /* 044A10 80043E10 AC590000 */ sw $t9, ($v0) /* 044A14 80043E14 372E4000 */ ori $t6, $t9, 0x4000 /* 044A18 80043E18 AC4E0000 */ sw $t6, ($v0) -/* 044A1C 80043E1C 3C01800E */ lui $at, %hi(D_800E6314) # $at, 0x800e +/* 044A1C 80043E1C 3C01800E */ lui $at, %hi(D_800E6310 + 4) # $at, 0x800e /* 044A20 80043E20 C610002C */ lwc1 $f16, 0x2c($s0) /* 044A24 80043E24 C4336310 */ lwc1 $f19, %lo(D_800E6310)($at) -/* 044A28 80043E28 C4326314 */ lwc1 $f18, %lo(D_800E6314)($at) +/* 044A28 80043E28 C4326314 */ lwc1 $f18, %lo(D_800E6310 + 4)($at) /* 044A2C 80043E2C 460082A1 */ cvt.d.s $f10, $f16 /* 044A30 80043E30 462A903C */ c.lt.d $f18, $f10 /* 044A34 80043E34 35D98000 */ ori $t9, $t6, 0x8000 diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 92af9e13..4f3d2469 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -614,10 +614,10 @@ glabel L80044ADC .L80044D20: /* 045920 80044D20 AC2DD528 */ sw $t5, %lo(D_8011D528)($at) .L80044D24: -/* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6354) # $at, 0x800e +/* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6350 + 4) # $at, 0x800e /* 045928 80044D28 C7B0005C */ lwc1 $f16, 0x5c($sp) /* 04592C 80044D2C C4336350 */ lwc1 $f19, %lo(D_800E6350)($at) -/* 045930 80044D30 C4326354 */ lwc1 $f18, %lo(D_800E6354)($at) +/* 045930 80044D30 C4326354 */ lwc1 $f18, %lo(D_800E6350 + 4)($at) /* 045934 80044D34 46008121 */ cvt.d.s $f4, $f16 /* 045938 80044D38 4632203C */ c.lt.d $f4, $f18 /* 04593C 80044D3C 8FAB006C */ lw $t3, 0x6c($sp) diff --git a/asm/non_matchings/unknown_043920/func_800452A0.s b/asm/non_matchings/unknown_043920/func_800452A0.s index d765453b..74e69563 100644 --- a/asm/non_matchings/unknown_043920/func_800452A0.s +++ b/asm/non_matchings/unknown_043920/func_800452A0.s @@ -647,13 +647,13 @@ glabel L80045B58 /* 04676C 80045B6C A2A001CD */ sb $zero, 0x1cd($s5) glabel L80045B70 /* 046770 80045B70 82A90173 */ lb $t1, 0x173($s5) -/* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A4) # $at, 0x800e +/* 046774 80045B74 3C01800E */ lui $at, %hi(D_800E63A0 + 4) # $at, 0x800e /* 046778 80045B78 15200002 */ bnez $t1, .L80045B84 /* 04677C 80045B7C 3C028012 */ lui $v0, %hi(D_8011D530) # $v0, 0x8012 /* 046780 80045B80 A2A001CD */ sb $zero, 0x1cd($s5) .L80045B84: /* 046784 80045B84 C42963A0 */ lwc1 $f9, %lo(D_800E63A0)($at) -/* 046788 80045B88 C42863A4 */ lwc1 $f8, %lo(D_800E63A4)($at) +/* 046788 80045B88 C42863A4 */ lwc1 $f8, %lo(D_800E63A0 + 4)($at) /* 04678C 80045B8C 460011A1 */ cvt.d.s $f6, $f2 /* 046790 80045B90 4628303C */ c.lt.d $f6, $f8 /* 046794 80045B94 2442D530 */ addiu $v0, %lo(D_8011D530) # addiu $v0, $v0, -0x2ad0 diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index 4128d38c..54c14747 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -66,10 +66,10 @@ glabel func_80046524 /* 047144 80046544 AFA5012C */ sw $a1, 0x12c($sp) /* 047148 80046548 10400009 */ beqz $v0, .L80046570 /* 04714C 8004654C 3C0A8012 */ lui $t2, %hi(D_8011D586) # $t2, 0x8012 -/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63AC) # $at, 0x800e +/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63A8 + 4) # $at, 0x800e /* 047154 80046554 C7A4012C */ lwc1 $f4, 0x12c($sp) /* 047158 80046558 C42963A8 */ lwc1 $f9, %lo(D_800E63A8)($at) -/* 04715C 8004655C C42863AC */ lwc1 $f8, %lo(D_800E63AC)($at) +/* 04715C 8004655C C42863AC */ lwc1 $f8, %lo(D_800E63A8 + 4)($at) /* 047160 80046560 460021A1 */ cvt.d.s $f6, $f4 /* 047164 80046564 46283282 */ mul.d $f10, $f6, $f8 /* 047168 80046568 46205120 */ cvt.s.d $f4, $f10 @@ -210,9 +210,9 @@ glabel func_80046524 /* 04735C 8004675C 1140001E */ beqz $t2, .L800467D8 /* 047360 80046760 00000000 */ nop /* 047364 80046764 C7A4012C */ lwc1 $f4, 0x12c($sp) -/* 047368 80046768 3C01800E */ lui $at, %hi(D_800E63B4) # $at, 0x800e +/* 047368 80046768 3C01800E */ lui $at, %hi(D_800E63B0 + 4) # $at, 0x800e /* 04736C 8004676C C42B63B0 */ lwc1 $f11, %lo(D_800E63B0)($at) -/* 047370 80046770 C42A63B4 */ lwc1 $f10, %lo(D_800E63B4)($at) +/* 047370 80046770 C42A63B4 */ lwc1 $f10, %lo(D_800E63B0 + 4)($at) /* 047374 80046774 46002221 */ cvt.d.s $f8, $f4 /* 047378 80046778 462A4182 */ mul.d $f6, $f8, $f10 /* 04737C 8004677C E7A80054 */ swc1 $f8, 0x54($sp) @@ -240,9 +240,9 @@ glabel func_80046524 /* 0473D4 800467D4 C60E002C */ lwc1 $f14, 0x2c($s0) .L800467D8: /* 0473D8 800467D8 C7A4012C */ lwc1 $f4, 0x12c($sp) -/* 0473DC 800467DC 3C01800E */ lui $at, %hi(D_800E63BC) # $at, 0x800e +/* 0473DC 800467DC 3C01800E */ lui $at, %hi(D_800E63B8 + 4) # $at, 0x800e /* 0473E0 800467E0 C42763B8 */ lwc1 $f7, %lo(D_800E63B8)($at) -/* 0473E4 800467E4 C42663BC */ lwc1 $f6, %lo(D_800E63BC)($at) +/* 0473E4 800467E4 C42663BC */ lwc1 $f6, %lo(D_800E63B8 + 4)($at) /* 0473E8 800467E8 46002221 */ cvt.d.s $f8, $f4 /* 0473EC 800467EC 46264282 */ mul.d $f10, $f8, $f6 /* 0473F0 800467F0 E7A80054 */ swc1 $f8, 0x54($sp) @@ -305,9 +305,9 @@ glabel func_80046524 /* 0474C4 800468C4 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) /* 0474C8 800468C8 45000008 */ bc1f .L800468EC /* 0474CC 800468CC 308E4000 */ andi $t6, $a0, 0x4000 -/* 0474D0 800468D0 3C01800E */ lui $at, %hi(D_800E63C4) # $at, 0x800e +/* 0474D0 800468D0 3C01800E */ lui $at, %hi(D_800E63C0 + 4) # $at, 0x800e /* 0474D4 800468D4 C42763C0 */ lwc1 $f7, %lo(D_800E63C0)($at) -/* 0474D8 800468D8 C42663C4 */ lwc1 $f6, %lo(D_800E63C4)($at) +/* 0474D8 800468D8 C42663C4 */ lwc1 $f6, %lo(D_800E63C0 + 4)($at) /* 0474DC 800468DC 460062A1 */ cvt.d.s $f10, $f12 /* 0474E0 800468E0 46265102 */ mul.d $f4, $f10, $f6 /* 0474E4 800468E4 46202220 */ cvt.s.d $f8, $f4 @@ -326,9 +326,9 @@ glabel func_80046524 /* 047514 80046914 00000000 */ nop /* 047518 80046918 45000024 */ bc1f .L800469AC .L8004691C: -/* 04751C 8004691C 3C01800E */ lui $at, %hi(D_800E63CC) # $at, 0x800e +/* 04751C 8004691C 3C01800E */ lui $at, %hi(D_800E63C8 + 4) # $at, 0x800e /* 047520 80046920 C42563C8 */ lwc1 $f5, %lo(D_800E63C8)($at) -/* 047524 80046924 C42463CC */ lwc1 $f4, %lo(D_800E63CC)($at) +/* 047524 80046924 C42463CC */ lwc1 $f4, %lo(D_800E63C8 + 4)($at) /* 047528 80046928 C7A60054 */ lwc1 $f6, 0x54($sp) /* 04752C 8004692C C60A00B8 */ lwc1 $f10, 0xb8($s0) /* 047530 80046930 46243202 */ mul.d $f8, $f6, $f4 @@ -338,7 +338,7 @@ glabel func_80046524 /* 047540 80046940 462022A0 */ cvt.s.d $f10, $f4 /* 047544 80046944 E60A00B8 */ swc1 $f10, 0xb8($s0) /* 047548 80046948 C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 04754C 8004694C C42663D4 */ lwc1 $f6, %lo(D_800E63D4)($at) +/* 04754C 8004694C C42663D4 */ lwc1 $f6, %lo(D_800E63D0 + 4)($at) /* 047550 80046950 C42763D0 */ lwc1 $f7, %lo(D_800E63D0)($at) /* 047554 80046954 46004121 */ cvt.d.s $f4, $f8 /* 047558 80046958 4624303C */ c.lt.d $f6, $f4 @@ -365,9 +365,9 @@ glabel func_80046524 /* 0475A4 800469A4 10000019 */ b .L80046A0C /* 0475A8 800469A8 3C014040 */ lui $at, 0x4040 .L800469AC: -/* 0475AC 800469AC 3C01800E */ lui $at, %hi(D_800E63E4) # $at, 0x800e +/* 0475AC 800469AC 3C01800E */ lui $at, %hi(D_800E63E0 + 4) # $at, 0x800e /* 0475B0 800469B0 C42963E0 */ lwc1 $f9, %lo(D_800E63E0)($at) -/* 0475B4 800469B4 C42863E4 */ lwc1 $f8, %lo(D_800E63E4)($at) +/* 0475B4 800469B4 C42863E4 */ lwc1 $f8, %lo(D_800E63E0 + 4)($at) /* 0475B8 800469B8 C7AB0050 */ lwc1 $f11, 0x50($sp) /* 0475BC 800469BC C7AA0054 */ lwc1 $f10, 0x54($sp) /* 0475C0 800469C0 C60400B8 */ lwc1 $f4, 0xb8($s0) @@ -406,9 +406,9 @@ glabel func_80046524 /* 047640 80046A40 4628303C */ c.lt.d $f6, $f8 /* 047644 80046A44 00000000 */ nop /* 047648 80046A48 45000007 */ bc1f .L80046A68 -/* 04764C 80046A4C 3C01800E */ lui $at, %hi(D_800E63EC) # $at, 0x800e +/* 04764C 80046A4C 3C01800E */ lui $at, %hi(D_800E63E8 + 4) # $at, 0x800e /* 047650 80046A50 C42B63E8 */ lwc1 $f11, %lo(D_800E63E8)($at) -/* 047654 80046A54 C42A63EC */ lwc1 $f10, %lo(D_800E63EC)($at) +/* 047654 80046A54 C42A63EC */ lwc1 $f10, %lo(D_800E63E8 + 4)($at) /* 047658 80046A58 46006121 */ cvt.d.s $f4, $f12 /* 04765C 80046A5C 462A2182 */ mul.d $f6, $f4, $f10 /* 047660 80046A60 46203220 */ cvt.s.d $f8, $f6 @@ -924,11 +924,11 @@ glabel func_80046524 .L800471D0: /* 047DD0 800471D0 3C01800E */ lui $at, %hi(D_800E63F0) # $at, 0x800e /* 047DD4 800471D4 C42263F0 */ lwc1 $f2, %lo(D_800E63F0)($at) -/* 047DD8 800471D8 3C01800E */ lui $at, %hi(D_800E63FC) # $at, 0x800e +/* 047DD8 800471D8 3C01800E */ lui $at, %hi(D_800E63F8 + 4) # $at, 0x800e /* 047DDC 800471DC E7A200FC */ swc1 $f2, 0xfc($sp) /* 047DE0 800471E0 C6280020 */ lwc1 $f8, 0x20($s1) /* 047DE4 800471E4 C42563F8 */ lwc1 $f5, %lo(D_800E63F8)($at) -/* 047DE8 800471E8 C42463FC */ lwc1 $f4, %lo(D_800E63FC)($at) +/* 047DE8 800471E8 C42463FC */ lwc1 $f4, %lo(D_800E63F8 + 4)($at) /* 047DEC 800471EC 46004021 */ cvt.d.s $f0, $f8 /* 047DF0 800471F0 46240182 */ mul.d $f6, $f0, $f4 /* 047DF4 800471F4 C7AB0050 */ lwc1 $f11, 0x50($sp) @@ -992,9 +992,9 @@ glabel func_80046524 /* 047ED4 800472D4 46283100 */ add.d $f4, $f6, $f8 /* 047ED8 800472D8 44814800 */ mtc1 $at, $f9 /* 047EDC 800472DC 46245182 */ mul.d $f6, $f10, $f4 -/* 047EE0 800472E0 3C01800E */ lui $at, %hi(D_800E6404) # $at, 0x800e +/* 047EE0 800472E0 3C01800E */ lui $at, %hi(D_800E6400 + 4) # $at, 0x800e /* 047EE4 800472E4 C42B6400 */ lwc1 $f11, %lo(D_800E6400)($at) -/* 047EE8 800472E8 C42A6404 */ lwc1 $f10, %lo(D_800E6404)($at) +/* 047EE8 800472E8 C42A6404 */ lwc1 $f10, %lo(D_800E6400 + 4)($at) /* 047EEC 800472EC 44804000 */ mtc1 $zero, $f8 /* 047EF0 800472F0 462A0103 */ div.d $f4, $f0, $f10 /* 047EF4 800472F4 462033A0 */ cvt.s.d $f14, $f6 @@ -1162,11 +1162,11 @@ glabel func_80046524 /* 04814C 8004754C 45000010 */ bc1f .L80047590 /* 048150 80047550 00000000 */ nop /* 048154 80047554 8E0F0148 */ lw $t7, 0x148($s0) -/* 048158 80047558 3C01800E */ lui $at, %hi(D_800E640C) # $at, 0x800e +/* 048158 80047558 3C01800E */ lui $at, %hi(D_800E6408 + 4) # $at, 0x800e /* 04815C 8004755C 15E0000C */ bnez $t7, .L80047590 /* 048160 80047560 00000000 */ nop /* 048164 80047564 C42B6408 */ lwc1 $f11, %lo(D_800E6408)($at) -/* 048168 80047568 C42A640C */ lwc1 $f10, %lo(D_800E640C)($at) +/* 048168 80047568 C42A640C */ lwc1 $f10, %lo(D_800E6408 + 4)($at) /* 04816C 8004756C 46001121 */ cvt.d.s $f4, $f2 /* 048170 80047570 462A2202 */ mul.d $f8, $f4, $f10 /* 048174 80047574 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -1185,9 +1185,9 @@ glabel func_80046524 /* 0481A0 800475A0 A3A900AF */ sb $t1, 0xaf($sp) /* 0481A4 800475A4 0C015C88 */ jal func_80057220 /* 0481A8 800475A8 E7B20104 */ swc1 $f18, 0x104($sp) -/* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6414) # $at, 0x800e +/* 0481AC 800475AC 3C01800E */ lui $at, %hi(D_800E6410 + 4) # $at, 0x800e /* 0481B0 800475B0 C4296410 */ lwc1 $f9, %lo(D_800E6410)($at) -/* 0481B4 800475B4 C4286414 */ lwc1 $f8, %lo(D_800E6414)($at) +/* 0481B4 800475B4 C4286414 */ lwc1 $f8, %lo(D_800E6410 + 4)($at) /* 0481B8 800475B8 460001A1 */ cvt.d.s $f6, $f0 /* 0481BC 800475BC 46283102 */ mul.d $f4, $f6, $f8 /* 0481C0 800475C0 C7B20104 */ lwc1 $f18, 0x104($sp) @@ -1498,10 +1498,10 @@ glabel func_80046524 /* 04863C 80047A3C 44805000 */ mtc1 $zero, $f10 /* 048640 80047A40 46002221 */ cvt.d.s $f8, $f4 /* 048644 80047A44 462A4182 */ mul.d $f6, $f8, $f10 -/* 048648 80047A48 3C01800E */ lui $at, %hi(D_800E641C) # $at, 0x800e +/* 048648 80047A48 3C01800E */ lui $at, %hi(D_800E6418 + 4) # $at, 0x800e /* 04864C 80047A4C C4296418 */ lwc1 $f9, %lo(D_800E6418)($at) -/* 048650 80047A50 C428641C */ lwc1 $f8, %lo(D_800E641C)($at) -/* 048654 80047A54 3C01800E */ lui $at, %hi(D_800E6424) # $at, 0x800e +/* 048650 80047A50 C428641C */ lwc1 $f8, %lo(D_800E6418 + 4)($at) +/* 048654 80047A54 3C01800E */ lui $at, %hi(D_800E6420 + 4) # $at, 0x800e /* 048658 80047A58 46203420 */ cvt.s.d $f16, $f6 /* 04865C 80047A5C 3C0E8012 */ lui $t6, %hi(D_8011D528) # $t6, 0x8012 /* 048660 80047A60 46008121 */ cvt.d.s $f4, $f16 @@ -1517,7 +1517,7 @@ glabel func_80046524 /* 048688 80047A88 46000307 */ neg.s $f12, $f0 .L80047A8C: /* 04868C 80047A8C C4296420 */ lwc1 $f9, %lo(D_800E6420)($at) -/* 048690 80047A90 C4286424 */ lwc1 $f8, %lo(D_800E6424)($at) +/* 048690 80047A90 C4286424 */ lwc1 $f8, %lo(D_800E6420 + 4)($at) /* 048694 80047A94 460062A1 */ cvt.d.s $f10, $f12 /* 048698 80047A98 462A403C */ c.lt.d $f8, $f10 /* 04869C 80047A9C 00000000 */ nop @@ -1547,10 +1547,10 @@ glabel func_80046524 /* 0486F8 80047AF8 10000039 */ b .L80047BE0 /* 0486FC 80047AFC E62A0024 */ swc1 $f10, 0x24($s1) .L80047B00: -/* 048700 80047B00 3C01800E */ lui $at, %hi(D_800E642C) # $at, 0x800e +/* 048700 80047B00 3C01800E */ lui $at, %hi(D_800E6428 + 4) # $at, 0x800e /* 048704 80047B04 C6040030 */ lwc1 $f4, 0x30($s0) /* 048708 80047B08 C4276428 */ lwc1 $f7, %lo(D_800E6428)($at) -/* 04870C 80047B0C C426642C */ lwc1 $f6, %lo(D_800E642C)($at) +/* 04870C 80047B0C C426642C */ lwc1 $f6, %lo(D_800E6428 + 4)($at) /* 048710 80047B10 46002021 */ cvt.d.s $f0, $f4 /* 048714 80047B14 46260202 */ mul.d $f8, $f0, $f6 /* 048718 80047B18 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) @@ -1567,10 +1567,10 @@ glabel func_80046524 /* 048744 80047B44 308D4000 */ andi $t5, $a0, 0x4000 /* 048748 80047B48 28410028 */ slti $at, $v0, 0x28 /* 04874C 80047B4C 10200009 */ beqz $at, .L80047B74 -/* 048750 80047B50 3C01800E */ lui $at, %hi(D_800E6434) # $at, 0x800e +/* 048750 80047B50 3C01800E */ lui $at, %hi(D_800E6430 + 4) # $at, 0x800e /* 048754 80047B54 C7A400F4 */ lwc1 $f4, 0xf4($sp) /* 048758 80047B58 C4296430 */ lwc1 $f9, %lo(D_800E6430)($at) -/* 04875C 80047B5C C4286434 */ lwc1 $f8, %lo(D_800E6434)($at) +/* 04875C 80047B5C C4286434 */ lwc1 $f8, %lo(D_800E6430 + 4)($at) /* 048760 80047B60 460021A1 */ cvt.d.s $f6, $f4 /* 048764 80047B64 46283282 */ mul.d $f10, $f6, $f8 /* 048768 80047B68 46205120 */ cvt.s.d $f4, $f10 @@ -1858,9 +1858,9 @@ glabel func_80046524 /* 048BA0 80047FA0 00000000 */ nop /* 048BA4 80047FA4 45000007 */ bc1f .L80047FC4 .L80047FA8: -/* 048BA8 80047FA8 3C01800E */ lui $at, %hi(D_800E643C) # $at, 0x800e +/* 048BA8 80047FA8 3C01800E */ lui $at, %hi(D_800E6438 + 4) # $at, 0x800e /* 048BAC 80047FAC C42B6438 */ lwc1 $f11, %lo(D_800E6438)($at) -/* 048BB0 80047FB0 C42A643C */ lwc1 $f10, %lo(D_800E643C)($at) +/* 048BB0 80047FB0 C42A643C */ lwc1 $f10, %lo(D_800E6438 + 4)($at) /* 048BB4 80047FB4 00000000 */ nop /* 048BB8 80047FB8 462A0102 */ mul.d $f4, $f0, $f10 /* 048BBC 80047FBC 10000003 */ b .L80047FCC @@ -1883,9 +1883,9 @@ glabel func_80046524 /* 048BF8 80047FF8 00000000 */ nop /* 048BFC 80047FFC 45000007 */ bc1f .L8004801C .L80048000: -/* 048C00 80048000 3C01800E */ lui $at, %hi(D_800E6444) # $at, 0x800e +/* 048C00 80048000 3C01800E */ lui $at, %hi(D_800E6440 + 4) # $at, 0x800e /* 048C04 80048004 C42B6440 */ lwc1 $f11, %lo(D_800E6440)($at) -/* 048C08 80048008 C42A6444 */ lwc1 $f10, %lo(D_800E6444)($at) +/* 048C08 80048008 C42A6444 */ lwc1 $f10, %lo(D_800E6440 + 4)($at) /* 048C0C 8004800C 00000000 */ nop /* 048C10 80048010 462A0102 */ mul.d $f4, $f0, $f10 /* 048C14 80048014 1000000B */ b .L80048044 @@ -1962,7 +1962,7 @@ glabel func_80046524 /* 048D18 80048118 462032A0 */ cvt.s.d $f10, $f6 /* 048D1C 8004811C E60A00D4 */ swc1 $f10, 0xd4($s0) /* 048D20 80048120 C60400D4 */ lwc1 $f4, 0xd4($s0) -/* 048D24 80048124 C428644C */ lwc1 $f8, %lo(D_800E644C)($at) +/* 048D24 80048124 C428644C */ lwc1 $f8, %lo(D_800E6448 + 4)($at) /* 048D28 80048128 C4296448 */ lwc1 $f9, %lo(D_800E6448)($at) /* 048D2C 8004812C 460020A1 */ cvt.d.s $f2, $f4 /* 048D30 80048130 4622403C */ c.lt.d $f8, $f2 @@ -2018,9 +2018,9 @@ glabel func_80046524 /* 048DEC 800481EC 00000000 */ nop /* 048DF0 800481F0 46007021 */ cvt.d.s $f0, $f14 .L800481F4: -/* 048DF4 800481F4 3C01800E */ lui $at, %hi(D_800E645C) # $at, 0x800e +/* 048DF4 800481F4 3C01800E */ lui $at, %hi(D_800E6458 + 4) # $at, 0x800e /* 048DF8 800481F8 C4296458 */ lwc1 $f9, %lo(D_800E6458)($at) -/* 048DFC 800481FC C428645C */ lwc1 $f8, %lo(D_800E645C)($at) +/* 048DFC 800481FC C428645C */ lwc1 $f8, %lo(D_800E6458 + 4)($at) /* 048E00 80048200 C62A0010 */ lwc1 $f10, 0x10($s1) /* 048E04 80048204 46280182 */ mul.d $f6, $f0, $f8 /* 048E08 80048208 C7A40118 */ lwc1 $f4, 0x118($sp) @@ -2210,7 +2210,7 @@ glabel func_80046524 /* 0490B4 800484B4 E6280020 */ swc1 $f8, 0x20($s1) /* 0490B8 800484B8 C60A0008 */ lwc1 $f10, 8($s0) /* 0490BC 800484BC C604002C */ lwc1 $f4, 0x2c($s0) -/* 0490C0 800484C0 C4286464 */ lwc1 $f8, %lo(D_800E6464)($at) +/* 0490C0 800484C0 C4286464 */ lwc1 $f8, %lo(D_800E6460 + 4)($at) /* 0490C4 800484C4 C4296460 */ lwc1 $f9, %lo(D_800E6460)($at) /* 0490C8 800484C8 46005021 */ cvt.d.s $f0, $f10 /* 0490CC 800484CC 460021A1 */ cvt.d.s $f6, $f4 diff --git a/asm/non_matchings/unknown_043920/func_80048C7C.s b/asm/non_matchings/unknown_043920/func_80048C7C.s index 117b389f..aab88adb 100644 --- a/asm/non_matchings/unknown_043920/func_80048C7C.s +++ b/asm/non_matchings/unknown_043920/func_80048C7C.s @@ -97,9 +97,9 @@ glabel L80048DAC /* 0499B0 80048DB0 10000027 */ b .L80048E50 /* 0499B4 80048DB4 A20901ED */ sb $t1, 0x1ed($s0) glabel L80048DB8 -/* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E648C) # $at, 0x800e +/* 0499B8 80048DB8 3C01800E */ lui $at, %hi(D_800E6488 + 4) # $at, 0x800e /* 0499BC 80048DBC C4216488 */ lwc1 $f1, %lo(D_800E6488)($at) -/* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E648C)($at) +/* 0499C0 80048DC0 C420648C */ lwc1 $f0, %lo(D_800E6488 + 4)($at) /* 0499C4 80048DC4 240A0078 */ li $t2, 120 /* 0499C8 80048DC8 A60A0204 */ sh $t2, 0x204($s0) /* 0499CC 80048DCC C490001C */ lwc1 $f16, 0x1c($a0) @@ -127,10 +127,10 @@ glabel L80048E18 /* 049A1C 80048E1C 240B0001 */ li $t3, 1 /* 049A20 80048E20 A20B01F1 */ sb $t3, 0x1f1($s0) /* 049A24 80048E24 E600002C */ swc1 $f0, 0x2c($s0) -/* 049A28 80048E28 3C01800E */ lui $at, %hi(D_800E6494) # $at, 0x800e +/* 049A28 80048E28 3C01800E */ lui $at, %hi(D_800E6490 + 4) # $at, 0x800e /* 049A2C 80048E2C C4860020 */ lwc1 $f6, 0x20($a0) /* 049A30 80048E30 C42B6490 */ lwc1 $f11, %lo(D_800E6490)($at) -/* 049A34 80048E34 C42A6494 */ lwc1 $f10, %lo(D_800E6494)($at) +/* 049A34 80048E34 C42A6494 */ lwc1 $f10, %lo(D_800E6490 + 4)($at) /* 049A38 80048E38 46003221 */ cvt.d.s $f8, $f6 /* 049A3C 80048E3C 462A4400 */ add.d $f16, $f8, $f10 /* 049A40 80048E40 24050139 */ li $a1, 313 diff --git a/asm/non_matchings/unknown_043920/func_80048E64.s b/asm/non_matchings/unknown_043920/func_80048E64.s index 3fbdec9e..ac090e74 100644 --- a/asm/non_matchings/unknown_043920/func_80048E64.s +++ b/asm/non_matchings/unknown_043920/func_80048E64.s @@ -158,11 +158,11 @@ glabel func_80048E64 /* 049C8C 8004908C 46100102 */ mul.s $f4, $f0, $f16 /* 049C90 80049090 3C0140C0 */ li $at, 0x40C00000 # 6.000000 /* 049C94 80049094 44814000 */ mtc1 $at, $f8 -/* 049C98 80049098 3C01800E */ lui $at, %hi(D_800E649C) # $at, 0x800e +/* 049C98 80049098 3C01800E */ lui $at, %hi(D_800E6498 + 4) # $at, 0x800e /* 049C9C 8004909C 46002187 */ neg.s $f6, $f4 /* 049CA0 800490A0 46083082 */ mul.s $f2, $f6, $f8 /* 049CA4 800490A4 C42B6498 */ lwc1 $f11, %lo(D_800E6498)($at) -/* 049CA8 800490A8 C42A649C */ lwc1 $f10, %lo(D_800E649C)($at) +/* 049CA8 800490A8 C42A649C */ lwc1 $f10, %lo(D_800E6498 + 4)($at) /* 049CAC 800490AC 3C014282 */ li $at, 0x42820000 # 65.000000 /* 049CB0 800490B0 46001121 */ cvt.d.s $f4, $f2 /* 049CB4 800490B4 4624503C */ c.lt.d $f10, $f4 diff --git a/asm/non_matchings/unknown_043920/func_800494E0.s b/asm/non_matchings/unknown_043920/func_800494E0.s index 4ebc8a01..44cb35e8 100644 --- a/asm/non_matchings/unknown_043920/func_800494E0.s +++ b/asm/non_matchings/unknown_043920/func_800494E0.s @@ -21,7 +21,7 @@ glabel func_800494E0 /* 04A118 80049518 46802020 */ cvt.s.w $f0, $f4 /* 04A11C 8004951C 44800000 */ mtc1 $zero, $f0 /* 04A120 80049520 C4A2002C */ lwc1 $f2, 0x2c($a1) -/* 04A124 80049524 3C01800E */ lui $at, %hi(D_800E64A4) # $at, 0x800e +/* 04A124 80049524 3C01800E */ lui $at, %hi(D_800E64A0 + 4) # $at, 0x800e /* 04A128 80049528 4600103C */ c.lt.s $f2, $f0 /* 04A12C 8004952C 00000000 */ nop /* 04A130 80049530 45000002 */ bc1f .L8004953C @@ -29,7 +29,7 @@ glabel func_800494E0 /* 04A138 80049538 46001087 */ neg.s $f2, $f2 .L8004953C: /* 04A13C 8004953C C42964A0 */ lwc1 $f9, %lo(D_800E64A0)($at) -/* 04A140 80049540 C42864A4 */ lwc1 $f8, %lo(D_800E64A4)($at) +/* 04A140 80049540 C42864A4 */ lwc1 $f8, %lo(D_800E64A0 + 4)($at) /* 04A144 80049544 460011A1 */ cvt.d.s $f6, $f2 /* 04A148 80049548 46283282 */ mul.d $f10, $f6, $f8 /* 04A14C 8004954C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/unknown_043920/func_80049794.s b/asm/non_matchings/unknown_043920/func_80049794.s index dfd316ec..a68ef66d 100644 --- a/asm/non_matchings/unknown_043920/func_80049794.s +++ b/asm/non_matchings/unknown_043920/func_80049794.s @@ -63,10 +63,10 @@ glabel func_80049794 /* 04A3B8 800497B8 0C00384E */ jal func_8000E138 /* 04A3BC 800497BC AFA500FC */ sw $a1, 0xfc($sp) /* 04A3C0 800497C0 10400008 */ beqz $v0, .L800497E4 -/* 04A3C4 800497C4 3C01800E */ lui $at, %hi(D_800E64AC) # $at, 0x800e +/* 04A3C4 800497C4 3C01800E */ lui $at, %hi(D_800E64A8 + 4) # $at, 0x800e /* 04A3C8 800497C8 C7A400FC */ lwc1 $f4, 0xfc($sp) /* 04A3CC 800497CC C42964A8 */ lwc1 $f9, %lo(D_800E64A8)($at) -/* 04A3D0 800497D0 C42864AC */ lwc1 $f8, %lo(D_800E64AC)($at) +/* 04A3D0 800497D0 C42864AC */ lwc1 $f8, %lo(D_800E64A8 + 4)($at) /* 04A3D4 800497D4 460021A1 */ cvt.d.s $f6, $f4 /* 04A3D8 800497D8 46283282 */ mul.d $f10, $f6, $f8 /* 04A3DC 800497DC 462054A0 */ cvt.s.d $f18, $f10 @@ -209,12 +209,12 @@ glabel func_80049794 /* 04A5D8 800499D8 1122000D */ beq $t1, $v0, .L80049A10 /* 04A5DC 800499DC 3C0E8012 */ lui $t6, %hi(D_8011D5B0) # $t6, 0x8012 /* 04A5E0 800499E0 8DCED5B0 */ lw $t6, %lo(D_8011D5B0)($t6) -/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B4) # $at, 0x800e +/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B0 + 4) # $at, 0x800e /* 04A5E8 800499E8 01C57821 */ addu $t7, $t6, $a1 /* 04A5EC 800499EC 8DF80004 */ lw $t8, 4($t7) /* 04A5F0 800499F0 C42B64B0 */ lwc1 $f11, %lo(D_800E64B0)($at) /* 04A5F4 800499F4 C7060008 */ lwc1 $f6, 8($t8) -/* 04A5F8 800499F8 C42A64B4 */ lwc1 $f10, %lo(D_800E64B4)($at) +/* 04A5F8 800499F8 C42A64B4 */ lwc1 $f10, %lo(D_800E64B0 + 4)($at) /* 04A5FC 800499FC 46003221 */ cvt.d.s $f8, $f6 /* 04A600 80049A00 462A403C */ c.lt.d $f8, $f10 /* 04A604 80049A04 00000000 */ nop @@ -406,10 +406,10 @@ glabel func_80049794 /* 04A8A8 80049CA8 3C198012 */ lui $t9, %hi(D_8011D528) # $t9, 0x8012 /* 04A8AC 80049CAC 31CF8000 */ andi $t7, $t6, 0x8000 /* 04A8B0 80049CB0 11E00019 */ beqz $t7, .L80049D18 -/* 04A8B4 80049CB4 3C01800E */ lui $at, %hi(D_800E64BC) # $at, 0x800e +/* 04A8B4 80049CB4 3C01800E */ lui $at, %hi(D_800E64B8 + 4) # $at, 0x800e /* 04A8B8 80049CB8 C7A800FC */ lwc1 $f8, 0xfc($sp) /* 04A8BC 80049CBC C42564B8 */ lwc1 $f5, %lo(D_800E64B8)($at) -/* 04A8C0 80049CC0 C42464BC */ lwc1 $f4, %lo(D_800E64BC)($at) +/* 04A8C0 80049CC0 C42464BC */ lwc1 $f4, %lo(D_800E64B8 + 4)($at) /* 04A8C4 80049CC4 46004021 */ cvt.d.s $f0, $f8 /* 04A8C8 80049CC8 46240182 */ mul.d $f6, $f0, $f4 /* 04A8CC 80049CCC C60A00B4 */ lwc1 $f10, 0xb4($s0) @@ -432,10 +432,10 @@ glabel func_80049794 /* 04A910 80049D10 10000017 */ b .L80049D70 /* 04A914 80049D14 E60800B4 */ swc1 $f8, 0xb4($s0) .L80049D18: -/* 04A918 80049D18 3C01800E */ lui $at, %hi(D_800E64C4) # $at, 0x800e +/* 04A918 80049D18 3C01800E */ lui $at, %hi(D_800E64C0 + 4) # $at, 0x800e /* 04A91C 80049D1C C7AA00FC */ lwc1 $f10, 0xfc($sp) /* 04A920 80049D20 C42764C0 */ lwc1 $f7, %lo(D_800E64C0)($at) -/* 04A924 80049D24 C42664C4 */ lwc1 $f6, %lo(D_800E64C4)($at) +/* 04A924 80049D24 C42664C4 */ lwc1 $f6, %lo(D_800E64C0 + 4)($at) /* 04A928 80049D28 46005021 */ cvt.d.s $f0, $f10 /* 04A92C 80049D2C 46260202 */ mul.d $f8, $f0, $f6 /* 04A930 80049D30 C61200B4 */ lwc1 $f18, 0xb4($s0) @@ -481,9 +481,9 @@ glabel func_80049794 /* 04A9C8 80049DC8 00000000 */ nop /* 04A9CC 80049DCC 4500002B */ bc1f .L80049E7C .L80049DD0: -/* 04A9D0 80049DD0 3C01800E */ lui $at, %hi(D_800E64CC) # $at, 0x800e +/* 04A9D0 80049DD0 3C01800E */ lui $at, %hi(D_800E64C8 + 4) # $at, 0x800e /* 04A9D4 80049DD4 C42B64C8 */ lwc1 $f11, %lo(D_800E64C8)($at) -/* 04A9D8 80049DD8 C42A64CC */ lwc1 $f10, %lo(D_800E64CC)($at) +/* 04A9D8 80049DD8 C42A64CC */ lwc1 $f10, %lo(D_800E64C8 + 4)($at) /* 04A9DC 80049DDC C60400B8 */ lwc1 $f4, 0xb8($s0) /* 04A9E0 80049DE0 462A0482 */ mul.d $f18, $f0, $f10 /* 04A9E4 80049DE4 46002221 */ cvt.d.s $f8, $f4 @@ -493,7 +493,7 @@ glabel func_80049794 /* 04A9F4 80049DF4 46203120 */ cvt.s.d $f4, $f6 /* 04A9F8 80049DF8 E60400B8 */ swc1 $f4, 0xb8($s0) /* 04A9FC 80049DFC C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 04AA00 80049E00 C42A64D4 */ lwc1 $f10, %lo(D_800E64D4)($at) +/* 04AA00 80049E00 C42A64D4 */ lwc1 $f10, %lo(D_800E64D0 + 4)($at) /* 04AA04 80049E04 C42B64D0 */ lwc1 $f11, %lo(D_800E64D0)($at) /* 04AA08 80049E08 460044A1 */ cvt.d.s $f18, $f8 /* 04AA0C 80049E0C 4632503C */ c.lt.d $f10, $f18 @@ -527,9 +527,9 @@ glabel func_80049794 /* 04AA74 80049E74 10000015 */ b .L80049ECC /* 04AA78 80049E78 E7A200C4 */ swc1 $f2, 0xc4($sp) .L80049E7C: -/* 04AA7C 80049E7C 3C01800E */ lui $at, %hi(D_800E64E4) # $at, 0x800e +/* 04AA7C 80049E7C 3C01800E */ lui $at, %hi(D_800E64E0 + 4) # $at, 0x800e /* 04AA80 80049E80 C42564E0 */ lwc1 $f5, %lo(D_800E64E0)($at) -/* 04AA84 80049E84 C42464E4 */ lwc1 $f4, %lo(D_800E64E4)($at) +/* 04AA84 80049E84 C42464E4 */ lwc1 $f4, %lo(D_800E64E0 + 4)($at) /* 04AA88 80049E88 C61200B8 */ lwc1 $f18, 0xb8($s0) /* 04AA8C 80049E8C 46240202 */ mul.d $f8, $f0, $f4 /* 04AA90 80049E90 460091A1 */ cvt.d.s $f6, $f18 @@ -915,15 +915,15 @@ glabel func_80049794 /* 04B02C 8004A42C 4626203C */ c.lt.d $f4, $f6 /* 04B030 8004A430 C7AA00C8 */ lwc1 $f10, 0xc8($sp) /* 04B034 8004A434 4500000F */ bc1f .L8004A474 -/* 04B038 8004A438 3C01800E */ lui $at, %hi(D_800E64FC) # $at, 0x800e +/* 04B038 8004A438 3C01800E */ lui $at, %hi(D_800E64F8 + 4) # $at, 0x800e /* 04B03C 8004A43C C42964F8 */ lwc1 $f9, %lo(D_800E64F8)($at) -/* 04B040 8004A440 C42864FC */ lwc1 $f8, %lo(D_800E64FC)($at) +/* 04B040 8004A440 C42864FC */ lwc1 $f8, %lo(D_800E64F8 + 4)($at) /* 04B044 8004A444 460054A1 */ cvt.d.s $f18, $f10 /* 04B048 8004A448 46289102 */ mul.d $f4, $f18, $f8 -/* 04B04C 8004A44C 3C01800E */ lui $at, %hi(D_800E6504) # $at, 0x800e +/* 04B04C 8004A44C 3C01800E */ lui $at, %hi(D_800E6500 + 4) # $at, 0x800e /* 04B050 8004A450 C7AA00C4 */ lwc1 $f10, 0xc4($sp) /* 04B054 8004A454 C4296500 */ lwc1 $f9, %lo(D_800E6500)($at) -/* 04B058 8004A458 C4286504 */ lwc1 $f8, %lo(D_800E6504)($at) +/* 04B058 8004A458 C4286504 */ lwc1 $f8, %lo(D_800E6500 + 4)($at) /* 04B05C 8004A45C 462021A0 */ cvt.s.d $f6, $f4 /* 04B060 8004A460 460054A1 */ cvt.d.s $f18, $f10 /* 04B064 8004A464 46289102 */ mul.d $f4, $f18, $f8 @@ -1776,10 +1776,10 @@ glabel func_80049794 /* 04BC8C 8004B08C 44882000 */ mtc1 $t0, $f4 /* 04BC90 8004B090 C606002C */ lwc1 $f6, 0x2c($s0) /* 04BC94 8004B094 46802220 */ cvt.s.w $f8, $f4 -/* 04BC98 8004B098 3C01800E */ lui $at, %hi(D_800E6514) # $at, 0x800e +/* 04BC98 8004B098 3C01800E */ lui $at, %hi(D_800E6510 + 4) # $at, 0x800e /* 04BC9C 8004B09C C4256510 */ lwc1 $f5, %lo(D_800E6510)($at) /* 04BCA0 8004B0A0 46083482 */ mul.s $f18, $f6, $f8 -/* 04BCA4 8004B0A4 C4246514 */ lwc1 $f4, %lo(D_800E6514)($at) +/* 04BCA4 8004B0A4 C4246514 */ lwc1 $f4, %lo(D_800E6510 + 4)($at) /* 04BCA8 8004B0A8 C628001C */ lwc1 $f8, 0x1c($s1) /* 04BCAC 8004B0AC 3C028012 */ lui $v0, %hi(D_8011D528) # $v0, 0x8012 /* 04BCB0 8004B0B0 460092A1 */ cvt.d.s $f10, $f18 @@ -1977,10 +1977,10 @@ glabel func_80049794 /* 04BF7C 8004B37C 0C015C88 */ jal func_80057220 /* 04BF80 8004B380 E7AE00DC */ swc1 $f14, 0xdc($sp) /* 04BF84 8004B384 C7AE00DC */ lwc1 $f14, 0xdc($sp) -/* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E651C) # $at, 0x800e +/* 04BF88 8004B388 3C01800E */ lui $at, %hi(D_800E6518 + 4) # $at, 0x800e /* 04BF8C 8004B38C 46007382 */ mul.s $f14, $f14, $f0 /* 04BF90 8004B390 C4296518 */ lwc1 $f9, %lo(D_800E6518)($at) -/* 04BF94 8004B394 C428651C */ lwc1 $f8, %lo(D_800E651C)($at) +/* 04BF94 8004B394 C428651C */ lwc1 $f8, %lo(D_800E6518 + 4)($at) /* 04BF98 8004B398 820201D3 */ lb $v0, 0x1d3($s0) /* 04BF9C 8004B39C 460071A1 */ cvt.d.s $f6, $f14 /* 04BFA0 8004B3A0 46283282 */ mul.d $f10, $f6, $f8 @@ -2017,9 +2017,9 @@ glabel func_80049794 /* 04C014 8004B414 820D01E2 */ lb $t5, 0x1e2($s0) /* 04C018 8004B418 C7A400C8 */ lwc1 $f4, 0xc8($sp) /* 04C01C 8004B41C 15A0000F */ bnez $t5, .L8004B45C -/* 04C020 8004B420 3C01800E */ lui $at, %hi(D_800E6524) # $at, 0x800e +/* 04C020 8004B420 3C01800E */ lui $at, %hi(D_800E6520 + 4) # $at, 0x800e /* 04C024 8004B424 C4296520 */ lwc1 $f9, %lo(D_800E6520)($at) -/* 04C028 8004B428 C4286524 */ lwc1 $f8, %lo(D_800E6524)($at) +/* 04C028 8004B428 C4286524 */ lwc1 $f8, %lo(D_800E6520 + 4)($at) /* 04C02C 8004B42C 460021A1 */ cvt.d.s $f6, $f4 /* 04C030 8004B430 4628303C */ c.lt.d $f6, $f8 /* 04C034 8004B434 00000000 */ nop @@ -2187,10 +2187,10 @@ glabel func_80049794 /* 04C29C 8004B69C 2401FFFF */ li $at, -1 /* 04C2A0 8004B6A0 1441004E */ bne $v0, $at, .L8004B7DC .L8004B6A4: -/* 04C2A4 8004B6A4 3C01800E */ lui $at, %hi(D_800E6534) # $at, 0x800e +/* 04C2A4 8004B6A4 3C01800E */ lui $at, %hi(D_800E6530 + 4) # $at, 0x800e /* 04C2A8 8004B6A8 C612002C */ lwc1 $f18, 0x2c($s0) /* 04C2AC 8004B6AC C42B6530 */ lwc1 $f11, %lo(D_800E6530)($at) -/* 04C2B0 8004B6B0 C42A6534 */ lwc1 $f10, %lo(D_800E6534)($at) +/* 04C2B0 8004B6B0 C42A6534 */ lwc1 $f10, %lo(D_800E6530 + 4)($at) /* 04C2B4 8004B6B4 460091A1 */ cvt.d.s $f6, $f18 /* 04C2B8 8004B6B8 462A3202 */ mul.d $f8, $f6, $f10 /* 04C2BC 8004B6BC 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 @@ -2302,7 +2302,7 @@ glabel func_80049794 /* 04C454 8004B854 46049281 */ sub.s $f10, $f18, $f4 /* 04C458 8004B858 E62A0024 */ swc1 $f10, 0x24($s1) /* 04C45C 8004B85C C606002C */ lwc1 $f6, 0x2c($s0) -/* 04C460 8004B860 C424653C */ lwc1 $f4, %lo(D_800E653C)($at) +/* 04C460 8004B860 C424653C */ lwc1 $f4, %lo(D_800E6538 + 4)($at) /* 04C464 8004B864 C4256538 */ lwc1 $f5, %lo(D_800E6538)($at) /* 04C468 8004B868 460034A1 */ cvt.d.s $f18, $f6 /* 04C46C 8004B86C 46249282 */ mul.d $f10, $f18, $f4 @@ -2398,9 +2398,9 @@ glabel func_80049794 /* 04C5C8 8004B9C8 00000000 */ nop /* 04C5CC 8004B9CC 45000007 */ bc1f .L8004B9EC .L8004B9D0: -/* 04C5D0 8004B9D0 3C01800E */ lui $at, %hi(D_800E6544) # $at, 0x800e +/* 04C5D0 8004B9D0 3C01800E */ lui $at, %hi(D_800E6540 + 4) # $at, 0x800e /* 04C5D4 8004B9D4 C4336540 */ lwc1 $f19, %lo(D_800E6540)($at) -/* 04C5D8 8004B9D8 C4326544 */ lwc1 $f18, %lo(D_800E6544)($at) +/* 04C5D8 8004B9D8 C4326544 */ lwc1 $f18, %lo(D_800E6540 + 4)($at) /* 04C5DC 8004B9DC 00000000 */ nop /* 04C5E0 8004B9E0 46320102 */ mul.d $f4, $f0, $f18 /* 04C5E4 8004B9E4 10000003 */ b .L8004B9F4 @@ -2421,9 +2421,9 @@ glabel func_80049794 /* 04C618 8004BA18 00000000 */ nop /* 04C61C 8004BA1C 45000007 */ bc1f .L8004BA3C .L8004BA20: -/* 04C620 8004BA20 3C01800E */ lui $at, %hi(D_800E654C) # $at, 0x800e +/* 04C620 8004BA20 3C01800E */ lui $at, %hi(D_800E6548 + 4) # $at, 0x800e /* 04C624 8004BA24 C4276548 */ lwc1 $f7, %lo(D_800E6548)($at) -/* 04C628 8004BA28 C426654C */ lwc1 $f6, %lo(D_800E654C)($at) +/* 04C628 8004BA28 C426654C */ lwc1 $f6, %lo(D_800E6548 + 4)($at) /* 04C62C 8004BA2C 00000000 */ nop /* 04C630 8004BA30 46260282 */ mul.d $f10, $f0, $f6 /* 04C634 8004BA34 10000008 */ b .L8004BA58 diff --git a/asm/non_matchings/unknown_043920/func_8004C140.s b/asm/non_matchings/unknown_043920/func_8004C140.s index 327ce778..3bcba56e 100644 --- a/asm/non_matchings/unknown_043920/func_8004C140.s +++ b/asm/non_matchings/unknown_043920/func_8004C140.s @@ -88,9 +88,9 @@ glabel func_8004C140 /* 04CE5C 8004C25C 1000000F */ b .L8004C29C /* 04CE60 8004C260 A20C01DB */ sb $t4, 0x1db($s0) .L8004C264: -/* 04CE64 8004C264 3C01800E */ lui $at, %hi(D_800E6554) # $at, 0x800e +/* 04CE64 8004C264 3C01800E */ lui $at, %hi(D_800E6550 + 4) # $at, 0x800e /* 04CE68 8004C268 C4216550 */ lwc1 $f1, %lo(D_800E6550)($at) -/* 04CE6C 8004C26C C4206554 */ lwc1 $f0, %lo(D_800E6554)($at) +/* 04CE6C 8004C26C C4206554 */ lwc1 $f0, %lo(D_800E6550 + 4)($at) /* 04CE70 8004C270 A60D0204 */ sh $t5, 0x204($s0) /* 04CE74 8004C274 C484001C */ lwc1 $f4, 0x1c($a0) /* 04CE78 8004C278 C4900024 */ lwc1 $f16, 0x24($a0) diff --git a/asm/non_matchings/unknown_043920/func_8004C2B0.s b/asm/non_matchings/unknown_043920/func_8004C2B0.s index 51c01f57..8b7490a0 100644 --- a/asm/non_matchings/unknown_043920/func_8004C2B0.s +++ b/asm/non_matchings/unknown_043920/func_8004C2B0.s @@ -102,19 +102,19 @@ glabel func_8004C2B0 /* 04CFF0 8004C3F0 3401FFFF */ li $at, 65535 /* 04CFF4 8004C3F4 00812021 */ addu $a0, $a0, $at .L8004C3F8: -/* 04CFF8 8004C3F8 3C01800E */ lui $at, %hi(D_800E655C) # $at, 0x800e +/* 04CFF8 8004C3F8 3C01800E */ lui $at, %hi(D_800E6558 + 4) # $at, 0x800e /* 04CFFC 8004C3FC C4E80094 */ lwc1 $f8, 0x94($a3) /* 04D000 8004C400 C42B6558 */ lwc1 $f11, %lo(D_800E6558)($at) -/* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E655C)($at) +/* 04D004 8004C404 C42A655C */ lwc1 $f10, %lo(D_800E6558 + 4)($at) /* 04D008 8004C408 46004021 */ cvt.d.s $f0, $f8 /* 04D00C 8004C40C 462A003C */ c.lt.d $f0, $f10 /* 04D010 8004C410 3C01800E */ lui $at, %hi(D_800E6568) # $at, 0x800e /* 04D014 8004C414 45000009 */ bc1f .L8004C43C /* 04D018 8004C418 00000000 */ nop -# Used to access D_800E6560 and D_800E6564. +# Used to access D_800E6560 and D_800E6560 + 4. /* 04D01C 8004C41C 3C01800E */ lui $at, %hi(D_800E6560) # $at, 0x800e /* 04D020 8004C420 C4256560 */ lwc1 $f5, %lo(D_800E6560)($at) -/* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6564)($at) +/* 04D024 8004C424 C4246564 */ lwc1 $f4, %lo(D_800E6560 + 4)($at) /* 04D028 8004C428 00000000 */ nop /* 04D02C 8004C42C 46240180 */ add.d $f6, $f0, $f4 /* 04D030 8004C430 46203220 */ cvt.s.d $f8, $f6 @@ -332,11 +332,11 @@ glabel func_8004C2B0 /* 04D324 8004C724 46020182 */ mul.s $f6, $f0, $f2 /* 04D328 8004C728 3C0140C0 */ li $at, 0x40C00000 # 6.000000 /* 04D32C 8004C72C 44815000 */ mtc1 $at, $f10 -/* 04D330 8004C730 3C01800E */ lui $at, %hi(D_800E6574) # $at, 0x800e +/* 04D330 8004C730 3C01800E */ lui $at, %hi(D_800E6570 + 4) # $at, 0x800e /* 04D334 8004C734 46003207 */ neg.s $f8, $f6 /* 04D338 8004C738 460A4402 */ mul.s $f16, $f8, $f10 /* 04D33C 8004C73C C4256570 */ lwc1 $f5, %lo(D_800E6570)($at) -/* 04D340 8004C740 C4246574 */ lwc1 $f4, %lo(D_800E6574)($at) +/* 04D340 8004C740 C4246574 */ lwc1 $f4, %lo(D_800E6570 + 4)($at) /* 04D344 8004C744 3C014282 */ li $at, 0x42820000 # 65.000000 /* 04D348 8004C748 460081A1 */ cvt.d.s $f6, $f16 /* 04D34C 8004C74C 4626203C */ c.lt.d $f4, $f6 @@ -521,10 +521,10 @@ glabel func_8004C2B0 /* 04D5F4 8004C9F4 3C014000 */ lui $at, 0x4000 /* 04D5F8 8004C9F8 45000009 */ bc1f .L8004CA20 /* 04D5FC 8004C9FC 00000000 */ nop -# Used to access D_800E6578 and D_800E657C. +# Used to access D_800E6578 and D_800E6578 + 4. /* 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) +/* 04D608 8004CA08 C428657C */ lwc1 $f8, %lo(D_800E6578 + 4)($at) /* 04D60C 8004CA0C 00000000 */ nop /* 04D610 8004CA10 46280181 */ sub.d $f6, $f0, $f8 /* 04D614 8004CA14 46203120 */ cvt.s.d $f4, $f6 diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index 2326d11c..f77b566a 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -174,11 +174,11 @@ glabel func_8004DE38 /* 04EC4C 8004E04C A20001F1 */ sb $zero, 0x1f1($s0) .L8004E050: /* 04EC50 8004E050 8F180300 */ lw $t8, %lo(osTvType)($t8) -/* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6594) # $at, 0x800e +/* 04EC54 8004E054 3C01800E */ lui $at, %hi(D_800E6590 + 4) # $at, 0x800e /* 04EC58 8004E058 17000006 */ bnez $t8, .L8004E074 /* 04EC5C 8004E05C 00000000 */ nop /* 04EC60 8004E060 C4256590 */ lwc1 $f5, %lo(D_800E6590)($at) -/* 04EC64 8004E064 C4246594 */ lwc1 $f4, %lo(D_800E6594)($at) +/* 04EC64 8004E064 C4246594 */ lwc1 $f4, %lo(D_800E6590 + 4)($at) /* 04EC68 8004E068 460082A1 */ cvt.d.s $f10, $f16 /* 04EC6C 8004E06C 46245182 */ mul.d $f6, $f10, $f4 /* 04EC70 8004E070 462034A0 */ cvt.s.d $f18, $f6 @@ -308,12 +308,12 @@ glabel func_8004DE38 /* 04EE2C 8004E22C 24A5D564 */ addiu $a1, %lo(D_8011D564) # addiu $a1, $a1, -0x2a9c /* 04EE30 8004E230 ACA20000 */ sw $v0, ($a1) /* 04EE34 8004E234 82080003 */ lb $t0, 3($s0) -/* 04EE38 8004E238 3C01800E */ lui $at, %hi(D_800E659C) # $at, 0x800e +/* 04EE38 8004E238 3C01800E */ lui $at, %hi(D_800E6598 + 4) # $at, 0x800e /* 04EE3C 8004E23C 00084880 */ sll $t1, $t0, 2 /* 04EE40 8004E240 00495021 */ addu $t2, $v0, $t1 /* 04EE44 8004E244 C5480000 */ lwc1 $f8, ($t2) /* 04EE48 8004E248 C4256598 */ lwc1 $f5, %lo(D_800E6598)($at) -/* 04EE4C 8004E24C C424659C */ lwc1 $f4, %lo(D_800E659C)($at) +/* 04EE4C 8004E24C C424659C */ lwc1 $f4, %lo(D_800E6598 + 4)($at) /* 04EE50 8004E250 460042A1 */ cvt.d.s $f10, $f8 /* 04EE54 8004E254 46245182 */ mul.d $f6, $f10, $f4 /* 04EE58 8004E258 3C038012 */ lui $v1, %hi(D_8011D56C) # $v1, 0x8012 @@ -1675,7 +1675,7 @@ glabel L8004ED88 /* 0501F4 8004F5F4 3C01800E */ lui $at, %hi(D_800E65F8) # $at, 0x800e /* 0501F8 8004F5F8 E7240008 */ swc1 $f4, 8($t9) /* 0501FC 8004F5FC C62A0030 */ lwc1 $f10, 0x30($s1) -/* 050200 8004F600 C42665FC */ lwc1 $f6, %lo(D_800E65FC)($at) +/* 050200 8004F600 C42665FC */ lwc1 $f6, %lo(D_800E65F8 + 4)($at) /* 050204 8004F604 C42765F8 */ lwc1 $f7, %lo(D_800E65F8)($at) /* 050208 8004F608 46005221 */ cvt.d.s $f8, $f10 /* 05020C 8004F60C 4626403C */ c.lt.d $f8, $f6 diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 611b821d..2526df9f 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -318,10 +318,10 @@ glabel func_8004F7F4 /* 05083C 8004FC3C 44809000 */ mtc1 $zero, $f18 /* 050840 8004FC40 46000121 */ cvt.d.s $f4, $f0 /* 050844 8004FC44 46322181 */ sub.d $f6, $f4, $f18 -/* 050848 8004FC48 3C01800E */ lui $at, %hi(D_800E6604) # $at, 0x800e +/* 050848 8004FC48 3C01800E */ lui $at, %hi(D_800E6600 + 4) # $at, 0x800e /* 05084C 8004FC4C 46203220 */ cvt.s.d $f8, $f6 /* 050850 8004FC50 C4316600 */ lwc1 $f17, %lo(D_800E6600)($at) -/* 050854 8004FC54 C4306604 */ lwc1 $f16, %lo(D_800E6604)($at) +/* 050854 8004FC54 C4306604 */ lwc1 $f16, %lo(D_800E6600 + 4)($at) /* 050858 8004FC58 460042A1 */ cvt.d.s $f10, $f8 /* 05085C 8004FC5C 46305102 */ mul.d $f4, $f10, $f16 /* 050860 8004FC60 C7B200C4 */ lwc1 $f18, 0xc4($sp) @@ -358,20 +358,20 @@ glabel func_8004F7F4 /* 0508D0 8004FCD0 02202025 */ move $a0, $s1 /* 0508D4 8004FCD4 1140000A */ beqz $t2, .L8004FD00 /* 0508D8 8004FCD8 02002825 */ move $a1, $s0 -/* 0508DC 8004FCDC 3C01800E */ lui $at, %hi(D_800E660C) # $at, 0x800e +/* 0508DC 8004FCDC 3C01800E */ lui $at, %hi(D_800E6608 + 4) # $at, 0x800e /* 0508E0 8004FCE0 C60800A8 */ lwc1 $f8, 0xa8($s0) /* 0508E4 8004FCE4 C4256608 */ lwc1 $f5, %lo(D_800E6608)($at) -/* 0508E8 8004FCE8 C424660C */ lwc1 $f4, %lo(D_800E660C)($at) +/* 0508E8 8004FCE8 C424660C */ lwc1 $f4, %lo(D_800E6608 + 4)($at) /* 0508EC 8004FCEC 460044A1 */ cvt.d.s $f18, $f8 /* 0508F0 8004FCF0 46249281 */ sub.d $f10, $f18, $f4 /* 0508F4 8004FCF4 462051A0 */ cvt.s.d $f6, $f10 /* 0508F8 8004FCF8 10000009 */ b .L8004FD20 /* 0508FC 8004FCFC E60600A8 */ swc1 $f6, 0xa8($s0) .L8004FD00: -/* 050900 8004FD00 3C01800E */ lui $at, %hi(D_800E6614) # $at, 0x800e +/* 050900 8004FD00 3C01800E */ lui $at, %hi(D_800E6610 + 4) # $at, 0x800e /* 050904 8004FD04 C61000A8 */ lwc1 $f16, 0xa8($s0) /* 050908 8004FD08 C4336610 */ lwc1 $f19, %lo(D_800E6610)($at) -/* 05090C 8004FD0C C4326614 */ lwc1 $f18, %lo(D_800E6614)($at) +/* 05090C 8004FD0C C4326614 */ lwc1 $f18, %lo(D_800E6610 + 4)($at) /* 050910 8004FD10 46008221 */ cvt.d.s $f8, $f16 /* 050914 8004FD14 46324101 */ sub.d $f4, $f8, $f18 /* 050918 8004FD18 462022A0 */ cvt.s.d $f10, $f4 @@ -383,15 +383,15 @@ glabel func_8004F7F4 /* 05092C 8004FD2C 0C016420 */ jal func_80059080 /* 050930 8004FD30 27A700B0 */ addiu $a3, $sp, 0xb0 /* 050934 8004FD34 920C01F0 */ lbu $t4, 0x1f0($s0) -# Used to access D_800E6620 and D_800E6624. +# Used to access D_800E6620 and D_800E6620 + 4. /* 050938 8004FD38 3C01800E */ lui $at, %hi(D_800E6620) # $at, 0x800e /* 05093C 8004FD3C 1180000A */ beqz $t4, .L8004FD68 /* 050940 8004FD40 00000000 */ nop -# Used to access D_800E6618 and D_800E661C. +# Used to access D_800E6618 and D_800E6618 + 4. /* 050944 8004FD44 3C01800E */ lui $at, %hi(D_800E6618) # $at, 0x800e /* 050948 8004FD48 C60600A8 */ lwc1 $f6, 0xa8($s0) /* 05094C 8004FD4C C4296618 */ lwc1 $f9, %lo(D_800E6618)($at) -/* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E661C)($at) +/* 050950 8004FD50 C428661C */ lwc1 $f8, %lo(D_800E6618 + 4)($at) /* 050954 8004FD54 46003421 */ cvt.d.s $f16, $f6 /* 050958 8004FD58 46288480 */ add.d $f18, $f16, $f8 /* 05095C 8004FD5C 46209120 */ cvt.s.d $f4, $f18 @@ -400,7 +400,7 @@ glabel func_8004F7F4 .L8004FD68: /* 050968 8004FD68 C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 05096C 8004FD6C C4316620 */ lwc1 $f17, %lo(D_800E6620)($at) -/* 050970 8004FD70 C4306624 */ lwc1 $f16, %lo(D_800E6624)($at) +/* 050970 8004FD70 C4306624 */ lwc1 $f16, %lo(D_800E6620 + 4)($at) /* 050974 8004FD74 460051A1 */ cvt.d.s $f6, $f10 /* 050978 8004FD78 46303200 */ add.d $f8, $f6, $f16 /* 05097C 8004FD7C 462044A0 */ cvt.s.d $f18, $f8 @@ -534,12 +534,12 @@ glabel func_8004F7F4 .L8004FF5C: /* 050B5C 8004FF5C 3C188012 */ lui $t8, %hi(D_8011D552) # $t8, 0x8012 /* 050B60 8004FF60 9718D552 */ lhu $t8, %lo(D_8011D552)($t8) -/* 050B64 8004FF64 3C01800E */ lui $at, %hi(D_800E662C) # $at, 0x800e +/* 050B64 8004FF64 3C01800E */ lui $at, %hi(D_800E6628 + 4) # $at, 0x800e /* 050B68 8004FF68 2719FFD8 */ addiu $t9, $t8, -0x28 /* 050B6C 8004FF6C 44999000 */ mtc1 $t9, $f18 /* 050B70 8004FF70 C42B6628 */ lwc1 $f11, %lo(D_800E6628)($at) /* 050B74 8004FF74 46809220 */ cvt.s.w $f8, $f18 -/* 050B78 8004FF78 C42A662C */ lwc1 $f10, %lo(D_800E662C)($at) +/* 050B78 8004FF78 C42A662C */ lwc1 $f10, %lo(D_800E6628 + 4)($at) /* 050B7C 8004FF7C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 050B80 8004FF80 46004121 */ cvt.d.s $f4, $f8 /* 050B84 8004FF84 462A2402 */ mul.d $f16, $f4, $f10 @@ -605,7 +605,7 @@ glabel func_8004F7F4 /* 050C68 80050068 C7A800B8 */ lwc1 $f8, 0xb8($sp) /* 050C6C 8005006C E7B200B4 */ swc1 $f18, 0xb4($sp) /* 050C70 80050070 821901D2 */ lb $t9, 0x1d2($s0) -/* 050C74 80050074 3C01800E */ lui $at, %hi(D_800E6634) # $at, 0x800e +/* 050C74 80050074 3C01800E */ lui $at, %hi(D_800E6630 + 4) # $at, 0x800e /* 050C78 80050078 13200009 */ beqz $t9, .L800500A0 /* 050C7C 8005007C 00000000 */ nop /* 050C80 80050080 C604011C */ lwc1 $f4, 0x11c($s0) @@ -623,7 +623,7 @@ glabel func_8004F7F4 /* 050CAC 800500AC 00000000 */ nop /* 050CB0 800500B0 C7A800B8 */ lwc1 $f8, 0xb8($sp) /* 050CB4 800500B4 C4236630 */ lwc1 $f3, %lo(D_800E6630)($at) -/* 050CB8 800500B8 C4226634 */ lwc1 $f2, %lo(D_800E6634)($at) +/* 050CB8 800500B8 C4226634 */ lwc1 $f2, %lo(D_800E6630 + 4)($at) /* 050CBC 800500BC 46004121 */ cvt.d.s $f4, $f8 /* 050CC0 800500C0 46222282 */ mul.d $f10, $f4, $f2 /* 050CC4 800500C4 C7B000B4 */ lwc1 $f16, 0xb4($sp) diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index 1938d2c6..91c53c2a 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -74,11 +74,11 @@ glabel func_80050A28 /* 051698 80050A98 31F8001F */ andi $t8, $t7, 0x1f /* 05169C 80050A9C 0338C821 */ addu $t9, $t9, $t8 /* 0516A0 80050AA0 8339CDB0 */ lb $t9, %lo(D_800DCDB0)($t9) -/* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E663C) # $at, 0x800e +/* 0516A4 80050AA4 3C01800E */ lui $at, %hi(D_800E6638 + 4) # $at, 0x800e /* 0516A8 80050AA8 44995000 */ mtc1 $t9, $f10 /* 0516AC 80050AAC C4276638 */ lwc1 $f7, %lo(D_800E6638)($at) /* 0516B0 80050AB0 468054A0 */ cvt.s.w $f18, $f10 -/* 0516B4 80050AB4 C426663C */ lwc1 $f6, %lo(D_800E663C)($at) +/* 0516B4 80050AB4 C426663C */ lwc1 $f6, %lo(D_800E6638 + 4)($at) /* 0516B8 80050AB8 C60A00A0 */ lwc1 $f10, 0xa0($s0) /* 0516BC 80050ABC 46009121 */ cvt.d.s $f4, $f18 /* 0516C0 80050AC0 46262202 */ mul.d $f8, $f4, $f6 @@ -181,10 +181,10 @@ glabel func_80050A28 /* 051824 80050C24 A20001FB */ sb $zero, 0x1fb($s0) .L80050C28: /* 051828 80050C28 AFA00060 */ sw $zero, 0x60($sp) -/* 05182C 80050C2C 3C01800E */ lui $at, %hi(D_800E6644) # $at, 0x800e +/* 05182C 80050C2C 3C01800E */ lui $at, %hi(D_800E6640 + 4) # $at, 0x800e /* 051830 80050C30 C60600B8 */ lwc1 $f6, 0xb8($s0) /* 051834 80050C34 C4256640 */ lwc1 $f5, %lo(D_800E6640)($at) -/* 051838 80050C38 C4246644 */ lwc1 $f4, %lo(D_800E6644)($at) +/* 051838 80050C38 C4246644 */ lwc1 $f4, %lo(D_800E6640 + 4)($at) /* 05183C 80050C3C 460032A1 */ cvt.d.s $f10, $f6 /* 051840 80050C40 462A203C */ c.lt.d $f4, $f10 /* 051844 80050C44 00000000 */ nop @@ -463,11 +463,11 @@ glabel func_80050A28 /* 051C2C 8005102C 13000019 */ beqz $t8, .L80051094 /* 051C30 80051030 00000000 */ nop /* 051C34 80051034 820401E6 */ lb $a0, 0x1e6($s0) -/* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E664C) # $at, 0x800e +/* 051C38 80051038 3C01800E */ lui $at, %hi(D_800E6648 + 4) # $at, 0x800e /* 051C3C 8005103C 10800015 */ beqz $a0, .L80051094 /* 051C40 80051040 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 /* 051C44 80051044 C4296648 */ lwc1 $f9, %lo(D_800E6648)($at) -/* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E664C)($at) +/* 051C48 80051048 C428664C */ lwc1 $f8, %lo(D_800E6648 + 4)($at) /* 051C4C 8005104C 46000121 */ cvt.d.s $f4, $f0 /* 051C50 80051050 46282182 */ mul.d $f6, $f4, $f8 /* 051C54 80051054 8F39D534 */ lw $t9, %lo(D_8011D534)($t9) @@ -627,7 +627,7 @@ glabel func_80050A28 /* 051E78 80051278 2406000C */ li $a2, 12 .L8005127C: /* 051E7C 8005127C 10400006 */ beqz $v0, .L80051298 -/* 051E80 80051280 3C01800E */ lui $at, %hi(D_800E6654) # $at, 0x800e +/* 051E80 80051280 3C01800E */ lui $at, %hi(D_800E6650 + 4) # $at, 0x800e /* 051E84 80051284 820A01E6 */ lb $t2, 0x1e6($s0) /* 051E88 80051288 00000000 */ nop /* 051E8C 8005128C 11400002 */ beqz $t2, .L80051298 @@ -636,19 +636,19 @@ glabel func_80050A28 .L80051298: /* 051E98 80051298 C60A002C */ lwc1 $f10, 0x2c($s0) /* 051E9C 8005129C C4256650 */ lwc1 $f5, %lo(D_800E6650)($at) -/* 051EA0 800512A0 C4246654 */ lwc1 $f4, %lo(D_800E6654)($at) +/* 051EA0 800512A0 C4246654 */ lwc1 $f4, %lo(D_800E6650 + 4)($at) /* 051EA4 800512A4 460050A1 */ cvt.d.s $f2, $f10 /* 051EA8 800512A8 4624103C */ c.lt.d $f2, $f4 /* 051EAC 800512AC 00001025 */ move $v0, $zero /* 051EB0 800512B0 45000005 */ bc1f .L800512C8 -/* 051EB4 800512B4 3C01800E */ lui $at, %hi(D_800E665C) # $at, 0x800e +/* 051EB4 800512B4 3C01800E */ lui $at, %hi(D_800E6658 + 4) # $at, 0x800e /* 051EB8 800512B8 00660019 */ multu $v1, $a2 /* 051EBC 800512BC 00001012 */ mflo $v0 /* 051EC0 800512C0 00000000 */ nop /* 051EC4 800512C4 00000000 */ nop .L800512C8: /* 051EC8 800512C8 C4296658 */ lwc1 $f9, %lo(D_800E6658)($at) -/* 051ECC 800512CC C428665C */ lwc1 $f8, %lo(D_800E665C)($at) +/* 051ECC 800512CC C428665C */ lwc1 $f8, %lo(D_800E6658 + 4)($at) /* 051ED0 800512D0 8FB90080 */ lw $t9, 0x80($sp) /* 051ED4 800512D4 4622403C */ c.lt.d $f8, $f2 /* 051ED8 800512D8 00000000 */ nop @@ -930,14 +930,14 @@ glabel func_80050A28 /* 0522E4 800516E4 460A6202 */ mul.s $f8, $f12, $f10 /* 0522E8 800516E8 C6120030 */ lwc1 $f18, 0x30($s0) /* 0522EC 800516EC 860E0000 */ lh $t6, ($s0) -/* 0522F0 800516F0 3C01800E */ lui $at, %hi(D_800E666C) # $at, 0x800e +/* 0522F0 800516F0 3C01800E */ lui $at, %hi(D_800E6668 + 4) # $at, 0x800e /* 0522F4 800516F4 46044183 */ div.s $f6, $f8, $f4 /* 0522F8 800516F8 46069280 */ add.s $f10, $f18, $f6 /* 0522FC 800516FC 146E0008 */ bne $v1, $t6, .L80051720 /* 052300 80051700 E60A0030 */ swc1 $f10, 0x30($s0) /* 052304 80051704 C6080030 */ lwc1 $f8, 0x30($s0) /* 052308 80051708 C4336668 */ lwc1 $f19, %lo(D_800E6668)($at) -/* 05230C 8005170C C432666C */ lwc1 $f18, %lo(D_800E666C)($at) +/* 05230C 8005170C C432666C */ lwc1 $f18, %lo(D_800E6668 + 4)($at) /* 052310 80051710 46004121 */ cvt.d.s $f4, $f8 /* 052314 80051714 46322182 */ mul.d $f6, $f4, $f18 /* 052318 80051718 462032A0 */ cvt.s.d $f10, $f6 @@ -987,9 +987,9 @@ glabel func_80050A28 /* 0523C0 800517C0 AC2AD554 */ sw $t2, %lo(D_8011D554)($at) /* 0523C4 800517C4 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 0523C8 800517C8 44814800 */ mtc1 $at, $f9 -/* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6674) # $at, 0x800e +/* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6670 + 4) # $at, 0x800e /* 0523D0 800517D0 C4336670 */ lwc1 $f19, %lo(D_800E6670)($at) -/* 0523D4 800517D4 C4326674 */ lwc1 $f18, %lo(D_800E6674)($at) +/* 0523D4 800517D4 C4326674 */ lwc1 $f18, %lo(D_800E6670 + 4)($at) /* 0523D8 800517D8 462C4101 */ sub.d $f4, $f8, $f12 /* 0523DC 800517DC 46322182 */ mul.d $f6, $f4, $f18 /* 0523E0 800517E0 00000000 */ nop @@ -1338,13 +1338,13 @@ glabel func_80050A28 /* 0528E4 80051CE4 C46A0004 */ lwc1 $f10, 4($v1) /* 0528E8 80051CE8 460091A1 */ cvt.d.s $f6, $f18 /* 0528EC 80051CEC 46283102 */ mul.d $f4, $f6, $f8 -/* 0528F0 80051CF0 3C01800E */ lui $at, %hi(D_800E667C) # $at, 0x800e +/* 0528F0 80051CF0 3C01800E */ lui $at, %hi(D_800E6678 + 4) # $at, 0x800e /* 0528F4 80051CF4 820B01D3 */ lb $t3, 0x1d3($s0) /* 0528F8 80051CF8 46005482 */ mul.s $f18, $f10, $f0 /* 0528FC 80051CFC C4336678 */ lwc1 $f19, %lo(D_800E6678)($at) /* 052900 80051D00 460091A1 */ cvt.d.s $f6, $f18 /* 052904 80051D04 46262200 */ add.d $f8, $f4, $f6 -/* 052908 80051D08 C432667C */ lwc1 $f18, %lo(D_800E667C)($at) +/* 052908 80051D08 C432667C */ lwc1 $f18, %lo(D_800E6678 + 4)($at) /* 05290C 80051D0C 462043A0 */ cvt.s.d $f14, $f8 /* 052910 80051D10 C7A60034 */ lwc1 $f6, 0x34($sp) /* 052914 80051D14 460072A1 */ cvt.d.s $f10, $f14 @@ -1404,9 +1404,9 @@ glabel func_80050A28 /* 0529DC 80051DDC 00000000 */ nop /* 0529E0 80051DE0 11C0002A */ beqz $t6, .L80051E8C .L80051DE4: -/* 0529E4 80051DE4 3C01800E */ lui $at, %hi(D_800E6684) # $at, 0x800e +/* 0529E4 80051DE4 3C01800E */ lui $at, %hi(D_800E6680 + 4) # $at, 0x800e /* 0529E8 80051DE8 C4296680 */ lwc1 $f9, %lo(D_800E6680)($at) -/* 0529EC 80051DEC C4286684 */ lwc1 $f8, %lo(D_800E6684)($at) +/* 0529EC 80051DEC C4286684 */ lwc1 $f8, %lo(D_800E6680 + 4)($at) /* 0529F0 80051DF0 46228181 */ sub.d $f6, $f16, $f2 /* 0529F4 80051DF4 24010004 */ li $at, 4 /* 0529F8 80051DF8 46283282 */ mul.d $f10, $f6, $f8 @@ -1436,9 +1436,9 @@ glabel func_80050A28 /* 052A54 80051E54 00000000 */ nop /* 052A58 80051E58 2B210005 */ slti $at, $t9, 5 /* 052A5C 80051E5C 14200006 */ bnez $at, .L80051E78 -/* 052A60 80051E60 3C01800E */ lui $at, %hi(D_800E668C) # $at, 0x800e +/* 052A60 80051E60 3C01800E */ lui $at, %hi(D_800E6688 + 4) # $at, 0x800e /* 052A64 80051E64 C42B6688 */ lwc1 $f11, %lo(D_800E6688)($at) -/* 052A68 80051E68 C42A668C */ lwc1 $f10, %lo(D_800E668C)($at) +/* 052A68 80051E68 C42A668C */ lwc1 $f10, %lo(D_800E6688 + 4)($at) /* 052A6C 80051E6C 46000221 */ cvt.d.s $f8, $f0 /* 052A70 80051E70 462A4482 */ mul.d $f18, $f8, $f10 /* 052A74 80051E74 46209020 */ cvt.s.d $f0, $f18 @@ -1450,10 +1450,10 @@ glabel func_80050A28 /* 052A88 80051E88 E60600B8 */ swc1 $f6, 0xb8($s0) .L80051E8C: /* 052A8C 80051E8C C60800B8 */ lwc1 $f8, 0xb8($s0) -/* 052A90 80051E90 3C01800E */ lui $at, %hi(D_800E6694) # $at, 0x800e +/* 052A90 80051E90 3C01800E */ lui $at, %hi(D_800E6690 + 4) # $at, 0x800e /* 052A94 80051E94 460E4282 */ mul.s $f10, $f8, $f14 /* 052A98 80051E98 C4256690 */ lwc1 $f5, %lo(D_800E6690)($at) -/* 052A9C 80051E9C C4246694 */ lwc1 $f4, %lo(D_800E6694)($at) +/* 052A9C 80051E9C C4246694 */ lwc1 $f4, %lo(D_800E6690 + 4)($at) /* 052AA0 80051EA0 C60800B4 */ lwc1 $f8, 0xb4($s0) /* 052AA4 80051EA4 460054A1 */ cvt.d.s $f18, $f10 /* 052AA8 80051EA8 46249182 */ mul.d $f6, $f18, $f4 @@ -1464,15 +1464,15 @@ glabel func_80050A28 /* 052ABC 80051EBC 44805000 */ mtc1 $zero, $f10 /* 052AC0 80051EC0 E612002C */ swc1 $f18, 0x2c($s0) /* 052AC4 80051EC4 C60C002C */ lwc1 $f12, 0x2c($s0) -/* 052AC8 80051EC8 C424669C */ lwc1 $f4, %lo(D_800E669C)($at) +/* 052AC8 80051EC8 C424669C */ lwc1 $f4, %lo(D_800E6698 + 4)($at) /* 052ACC 80051ECC C4256698 */ lwc1 $f5, %lo(D_800E6698)($at) /* 052AD0 80051ED0 460060A1 */ cvt.d.s $f2, $f12 /* 052AD4 80051ED4 4622203C */ c.lt.d $f4, $f2 /* 052AD8 80051ED8 00000000 */ nop /* 052ADC 80051EDC 4500000D */ bc1f .L80051F14 -/* 052AE0 80051EE0 3C01800E */ lui $at, %hi(D_800E66A4) # $at, 0x800e +/* 052AE0 80051EE0 3C01800E */ lui $at, %hi(D_800E66A0 + 4) # $at, 0x800e /* 052AE4 80051EE4 C42766A0 */ lwc1 $f7, %lo(D_800E66A0)($at) -/* 052AE8 80051EE8 C42666A4 */ lwc1 $f6, %lo(D_800E66A4)($at) +/* 052AE8 80051EE8 C42666A4 */ lwc1 $f6, %lo(D_800E66A0 + 4)($at) /* 052AEC 80051EEC 00000000 */ nop /* 052AF0 80051EF0 4626103C */ c.lt.d $f2, $f6 /* 052AF4 80051EF4 00000000 */ nop @@ -1519,7 +1519,7 @@ glabel func_80050A28 /* 052B8C 80051F8C C4C80020 */ lwc1 $f8, 0x20($a2) /* 052B90 80051F90 460A7482 */ mul.s $f18, $f14, $f10 /* 052B94 80051F94 3C0D8012 */ lui $t5, %hi(D_8011D586) # $t5, 0x8012 -/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66AC) # $at, 0x800e +/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66A8 + 4) # $at, 0x800e /* 052B9C 80051F9C 46124101 */ sub.s $f4, $f8, $f18 /* 052BA0 80051FA0 E4C40020 */ swc1 $f4, 0x20($a2) /* 052BA4 80051FA4 85ADD586 */ lh $t5, %lo(D_8011D586)($t5) @@ -1531,7 +1531,7 @@ glabel func_80050A28 .L80051FBC: /* 052BBC 80051FBC C60600B8 */ lwc1 $f6, 0xb8($s0) /* 052BC0 80051FC0 C42966A8 */ lwc1 $f9, %lo(D_800E66A8)($at) -/* 052BC4 80051FC4 C42866AC */ lwc1 $f8, %lo(D_800E66AC)($at) +/* 052BC4 80051FC4 C42866AC */ lwc1 $f8, %lo(D_800E66A8 + 4)($at) /* 052BC8 80051FC8 460032A1 */ cvt.d.s $f10, $f6 /* 052BCC 80051FCC 4628503C */ c.lt.d $f10, $f8 /* 052BD0 80051FD0 00000000 */ nop @@ -1551,11 +1551,11 @@ glabel func_80050A28 /* 052C08 80052008 44802000 */ mtc1 $zero, $f4 /* 052C0C 8005200C 460064A1 */ cvt.d.s $f18, $f12 /* 052C10 80052010 4624903C */ c.lt.d $f18, $f4 -/* 052C14 80052014 3C01800E */ lui $at, %hi(D_800E66B4) # $at, 0x800e +/* 052C14 80052014 3C01800E */ lui $at, %hi(D_800E66B0 + 4) # $at, 0x800e /* 052C18 80052018 45000020 */ bc1f .L8005209C /* 052C1C 8005201C 46006086 */ mov.s $f2, $f12 /* 052C20 80052020 C42B66B0 */ lwc1 $f11, %lo(D_800E66B0)($at) -/* 052C24 80052024 C42A66B4 */ lwc1 $f10, %lo(D_800E66B4)($at) +/* 052C24 80052024 C42A66B4 */ lwc1 $f10, %lo(D_800E66B0 + 4)($at) /* 052C28 80052028 46001087 */ neg.s $f2, $f2 /* 052C2C 8005202C 460011A1 */ cvt.d.s $f6, $f2 /* 052C30 80052030 462A3201 */ sub.d $f8, $f6, $f10 @@ -1564,7 +1564,7 @@ glabel func_80050A28 /* 052C3C 8005203C 44809000 */ mtc1 $zero, $f18 /* 052C40 80052040 46001021 */ cvt.d.s $f0, $f2 /* 052C44 80052044 4632003C */ c.lt.d $f0, $f18 -/* 052C48 80052048 3C01800E */ lui $at, %hi(D_800E66BC) # $at, 0x800e +/* 052C48 80052048 3C01800E */ lui $at, %hi(D_800E66B8 + 4) # $at, 0x800e /* 052C4C 8005204C 45000004 */ bc1f .L80052060 /* 052C50 80052050 00000000 */ nop /* 052C54 80052054 44801000 */ mtc1 $zero, $f2 @@ -1572,7 +1572,7 @@ glabel func_80050A28 /* 052C5C 8005205C 46001021 */ cvt.d.s $f0, $f2 .L80052060: /* 052C60 80052060 C42566B8 */ lwc1 $f5, %lo(D_800E66B8)($at) -/* 052C64 80052064 C42466BC */ lwc1 $f4, %lo(D_800E66BC)($at) +/* 052C64 80052064 C42466BC */ lwc1 $f4, %lo(D_800E66B8 + 4)($at) /* 052C68 80052068 3C01800E */ lui $at, %hi(D_800E66C0) # $at, 0x800e /* 052C6C 8005206C 4620203C */ c.lt.d $f4, $f0 /* 052C70 80052070 00000000 */ nop @@ -1604,10 +1604,10 @@ glabel func_80050A28 /* 052CCC 800520CC 460A4480 */ add.s $f18, $f8, $f10 /* 052CD0 800520D0 E612002C */ swc1 $f18, 0x2c($s0) .L800520D4: -/* 052CD4 800520D4 3C01800E */ lui $at, %hi(D_800E66CC) # $at, 0x800e +/* 052CD4 800520D4 3C01800E */ lui $at, %hi(D_800E66C8 + 4) # $at, 0x800e /* 052CD8 800520D8 C606002C */ lwc1 $f6, 0x2c($s0) /* 052CDC 800520DC C42B66C8 */ lwc1 $f11, %lo(D_800E66C8)($at) -/* 052CE0 800520E0 C42A66CC */ lwc1 $f10, %lo(D_800E66CC)($at) +/* 052CE0 800520E0 C42A66CC */ lwc1 $f10, %lo(D_800E66C8 + 4)($at) /* 052CE4 800520E4 46003221 */ cvt.d.s $f8, $f6 /* 052CE8 800520E8 462A4482 */ mul.d $f18, $f8, $f10 /* 052CEC 800520EC C6040008 */ lwc1 $f4, 8($s0) diff --git a/asm/non_matchings/unknown_043920/func_80052B64.s b/asm/non_matchings/unknown_043920/func_80052B64.s index c4a3ea52..6b3cf658 100644 --- a/asm/non_matchings/unknown_043920/func_80052B64.s +++ b/asm/non_matchings/unknown_043920/func_80052B64.s @@ -9,10 +9,10 @@ glabel func_80052B64 /* 05376C 80052B6C AFB00018 */ sw $s0, 0x18($sp) /* 053770 80052B70 AFA50024 */ sw $a1, 0x24($sp) /* 053774 80052B74 AFA7002C */ sw $a3, 0x2c($sp) -/* 053778 80052B78 3C01800E */ lui $at, %hi(D_800E66F4) # $at, 0x800e +/* 053778 80052B78 3C01800E */ lui $at, %hi(D_800E66F0 + 4) # $at, 0x800e /* 05377C 80052B7C C4A4002C */ lwc1 $f4, 0x2c($a1) /* 053780 80052B80 C42966F0 */ lwc1 $f9, %lo(D_800E66F0)($at) -/* 053784 80052B84 C42866F4 */ lwc1 $f8, %lo(D_800E66F4)($at) +/* 053784 80052B84 C42866F4 */ lwc1 $f8, %lo(D_800E66F0 + 4)($at) /* 053788 80052B88 460021A1 */ cvt.d.s $f6, $f4 /* 05378C 80052B8C 46283282 */ mul.d $f10, $f6, $f8 /* 053790 80052B90 44809000 */ mtc1 $zero, $f18 diff --git a/asm/non_matchings/unknown_043920/func_80052D7C.s b/asm/non_matchings/unknown_043920/func_80052D7C.s index b8f90151..647a5877 100644 --- a/asm/non_matchings/unknown_043920/func_80052D7C.s +++ b/asm/non_matchings/unknown_043920/func_80052D7C.s @@ -195,11 +195,11 @@ glabel func_80052D7C /* 053BE0 80052FE0 462084A0 */ cvt.s.d $f18, $f16 /* 053BE4 80052FE4 E4B2002C */ swc1 $f18, 0x2c($a1) .L80052FE8: -/* 053BE8 80052FE8 3C01800E */ lui $at, %hi(D_800E66FC) # $at, 0x800e +/* 053BE8 80052FE8 3C01800E */ lui $at, %hi(D_800E66F8 + 4) # $at, 0x800e /* 053BEC 80052FEC A3AF0033 */ sb $t7, 0x33($sp) /* 053BF0 80052FF0 C4A60030 */ lwc1 $f6, 0x30($a1) /* 053BF4 80052FF4 C42166F8 */ lwc1 $f1, %lo(D_800E66F8)($at) -/* 053BF8 80052FF8 C42066FC */ lwc1 $f0, %lo(D_800E66FC)($at) +/* 053BF8 80052FF8 C42066FC */ lwc1 $f0, %lo(D_800E66F8 + 4)($at) /* 053BFC 80052FFC 46003121 */ cvt.d.s $f4, $f6 /* 053C00 80053000 46202202 */ mul.d $f8, $f4, $f0 /* 053C04 80053004 C4B0002C */ lwc1 $f16, 0x2c($a1) @@ -215,7 +215,7 @@ glabel func_80052D7C /* 053C2C 8005302C 24C6D4F8 */ addiu $a2, %lo(D_8011D4F8) # addiu $a2, $a2, -0x2b08 /* 053C30 80053030 E4A4002C */ swc1 $f4, 0x2c($a1) /* 053C34 80053034 8FA40040 */ lw $a0, 0x40($sp) -/* 053C38 80053038 C4306704 */ lwc1 $f16, %lo(D_800E6704)($at) +/* 053C38 80053038 C4306704 */ lwc1 $f16, %lo(D_800E6700 + 4)($at) /* 053C3C 8005303C C4880020 */ lwc1 $f8, 0x20($a0) /* 053C40 80053040 C4316700 */ lwc1 $f17, %lo(D_800E6700)($at) /* 053C44 80053044 460042A1 */ cvt.d.s $f10, $f8 @@ -244,7 +244,7 @@ glabel func_80052D7C /* 053C9C 8005309C A0AA01E8 */ sb $t2, 0x1e8($a1) .L800530A0: /* 053CA0 800530A0 80A201D3 */ lb $v0, 0x1d3($a1) -/* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E670C) # $at, 0x800e +/* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E6708 + 4) # $at, 0x800e /* 053CA8 800530A8 18400006 */ blez $v0, .L800530C4 /* 053CAC 800530AC 24C6D554 */ addiu $a2, %lo(D_8011D554) # addiu $a2, $a2, -0x2aac /* 053CB0 800530B0 8FAB0048 */ lw $t3, 0x48($sp) @@ -258,7 +258,7 @@ glabel func_80052D7C /* 053CC8 800530C8 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 053CCC 800530CC 80A201E8 */ lb $v0, 0x1e8($a1) /* 053CD0 800530D0 C4296708 */ lwc1 $f9, %lo(D_800E6708)($at) -/* 053CD4 800530D4 C428670C */ lwc1 $f8, %lo(D_800E670C)($at) +/* 053CD4 800530D4 C428670C */ lwc1 $f8, %lo(D_800E6708 + 4)($at) /* 053CD8 800530D8 46005421 */ cvt.d.s $f16, $f10 /* 053CDC 800530DC 4630403C */ c.lt.d $f8, $f16 /* 053CE0 800530E0 00027080 */ sll $t6, $v0, 2 @@ -286,11 +286,11 @@ glabel func_80052D7C /* 053D34 80053134 44803000 */ mtc1 $zero, $f6 /* 053D38 80053138 46009021 */ cvt.d.s $f0, $f18 /* 053D3C 8005313C 4620303C */ c.lt.d $f6, $f0 -/* 053D40 80053140 3C01800E */ lui $at, %hi(D_800E6714) # $at, 0x800e +/* 053D40 80053140 3C01800E */ lui $at, %hi(D_800E6710 + 4) # $at, 0x800e /* 053D44 80053144 45000007 */ bc1f .L80053164 /* 053D48 80053148 00000000 */ nop /* 053D4C 8005314C C4256710 */ lwc1 $f5, %lo(D_800E6710)($at) -/* 053D50 80053150 C4246714 */ lwc1 $f4, %lo(D_800E6714)($at) +/* 053D50 80053150 C4246714 */ lwc1 $f4, %lo(D_800E6710 + 4)($at) /* 053D54 80053154 00000000 */ nop /* 053D58 80053158 46240281 */ sub.d $f10, $f0, $f4 /* 053D5C 8005315C 46205220 */ cvt.s.d $f8, $f10 @@ -305,10 +305,10 @@ glabel func_80052D7C /* 053D7C 8005317C 00000000 */ nop /* 053D80 80053180 00001825 */ move $v1, $zero .L80053184: -/* 053D84 80053184 3C01800E */ lui $at, %hi(D_800E671C) # $at, 0x800e +/* 053D84 80053184 3C01800E */ lui $at, %hi(D_800E6718 + 4) # $at, 0x800e /* 053D88 80053188 C5500020 */ lwc1 $f16, 0x20($t2) /* 053D8C 8005318C C4336718 */ lwc1 $f19, %lo(D_800E6718)($at) -/* 053D90 80053190 C432671C */ lwc1 $f18, %lo(D_800E671C)($at) +/* 053D90 80053190 C432671C */ lwc1 $f18, %lo(D_800E6718 + 4)($at) /* 053D94 80053194 46008021 */ cvt.d.s $f0, $f16 /* 053D98 80053198 46320182 */ mul.d $f6, $f0, $f18 /* 053D9C 8005319C C7A4004C */ lwc1 $f4, 0x4c($sp) @@ -349,10 +349,10 @@ glabel func_80052D7C /* 053E20 80053220 24010003 */ li $at, 3 /* 053E24 80053224 14410023 */ bne $v0, $at, .L800532B4 .L80053228: -/* 053E28 80053228 3C01800E */ lui $at, %hi(D_800E672C) # $at, 0x800e +/* 053E28 80053228 3C01800E */ lui $at, %hi(D_800E6728 + 4) # $at, 0x800e /* 053E2C 8005322C C4A40030 */ lwc1 $f4, 0x30($a1) /* 053E30 80053230 C4216728 */ lwc1 $f1, %lo(D_800E6728)($at) -/* 053E34 80053234 C420672C */ lwc1 $f0, %lo(D_800E672C)($at) +/* 053E34 80053234 C420672C */ lwc1 $f0, %lo(D_800E6728 + 4)($at) /* 053E38 80053238 460021A1 */ cvt.d.s $f6, $f4 /* 053E3C 8005323C 46203282 */ mul.d $f10, $f6, $f0 /* 053E40 80053240 C4B0002C */ lwc1 $f16, 0x2c($a1) @@ -366,10 +366,10 @@ glabel func_80052D7C /* 053E60 80053260 E4A6002C */ swc1 $f6, 0x2c($a1) /* 053E64 80053264 14200009 */ bnez $at, .L8005328C /* 053E68 80053268 A3AB0033 */ sb $t3, 0x33($sp) -/* 053E6C 8005326C 3C01800E */ lui $at, %hi(D_800E6734) # $at, 0x800e +/* 053E6C 8005326C 3C01800E */ lui $at, %hi(D_800E6730 + 4) # $at, 0x800e /* 053E70 80053270 C4AA002C */ lwc1 $f10, 0x2c($a1) /* 053E74 80053274 C4316730 */ lwc1 $f17, %lo(D_800E6730)($at) -/* 053E78 80053278 C4306734 */ lwc1 $f16, %lo(D_800E6734)($at) +/* 053E78 80053278 C4306734 */ lwc1 $f16, %lo(D_800E6730 + 4)($at) /* 053E7C 8005327C 46005221 */ cvt.d.s $f8, $f10 /* 053E80 80053280 46304481 */ sub.d $f18, $f8, $f16 /* 053E84 80053284 46209120 */ cvt.s.d $f4, $f18 @@ -377,10 +377,10 @@ glabel func_80052D7C .L8005328C: /* 053E8C 8005328C 2861FFCE */ slti $at, $v1, -0x32 /* 053E90 80053290 10200008 */ beqz $at, .L800532B4 -/* 053E94 80053294 3C01800E */ lui $at, %hi(D_800E673C) # $at, 0x800e +/* 053E94 80053294 3C01800E */ lui $at, %hi(D_800E6738 + 4) # $at, 0x800e /* 053E98 80053298 C4A6002C */ lwc1 $f6, 0x2c($a1) /* 053E9C 8005329C C4296738 */ lwc1 $f9, %lo(D_800E6738)($at) -/* 053EA0 800532A0 C428673C */ lwc1 $f8, %lo(D_800E673C)($at) +/* 053EA0 800532A0 C428673C */ lwc1 $f8, %lo(D_800E6738 + 4)($at) /* 053EA4 800532A4 460032A1 */ cvt.d.s $f10, $f6 /* 053EA8 800532A8 46285400 */ add.d $f16, $f10, $f8 /* 053EAC 800532AC 462084A0 */ cvt.s.d $f18, $f16 @@ -412,18 +412,18 @@ glabel func_80052D7C /* 053F10 80053310 80B901D3 */ lb $t9, 0x1d3($a1) .L80053314: /* 053F14 80053314 14200006 */ bnez $at, .L80053330 -/* 053F18 80053318 3C01800E */ lui $at, %hi(D_800E6744) # $at, 0x800e +/* 053F18 80053318 3C01800E */ lui $at, %hi(D_800E6740 + 4) # $at, 0x800e /* 053F1C 8005331C C4276740 */ lwc1 $f7, %lo(D_800E6740)($at) -/* 053F20 80053320 C4266744 */ lwc1 $f6, %lo(D_800E6744)($at) +/* 053F20 80053320 C4266744 */ lwc1 $f6, %lo(D_800E6740 + 4)($at) /* 053F24 80053324 46001121 */ cvt.d.s $f4, $f2 /* 053F28 80053328 46262282 */ mul.d $f10, $f4, $f6 /* 053F2C 8005332C 462050A0 */ cvt.s.d $f2, $f10 .L80053330: /* 053F30 80053330 2861FFCE */ slti $at, $v1, -0x32 /* 053F34 80053334 10200006 */ beqz $at, .L80053350 -/* 053F38 80053338 3C01800E */ lui $at, %hi(D_800E674C) # $at, 0x800e +/* 053F38 80053338 3C01800E */ lui $at, %hi(D_800E6748 + 4) # $at, 0x800e /* 053F3C 8005333C C4316748 */ lwc1 $f17, %lo(D_800E6748)($at) -/* 053F40 80053340 C430674C */ lwc1 $f16, %lo(D_800E674C)($at) +/* 053F40 80053340 C430674C */ lwc1 $f16, %lo(D_800E6748 + 4)($at) /* 053F44 80053344 46001221 */ cvt.d.s $f8, $f2 /* 053F48 80053348 46304482 */ mul.d $f18, $f8, $f16 /* 053F4C 8005334C 462090A0 */ cvt.s.d $f2, $f18 diff --git a/asm/non_matchings/unknown_043920/func_80053478.s b/asm/non_matchings/unknown_043920/func_80053478.s index 17e71be2..4acb685e 100644 --- a/asm/non_matchings/unknown_043920/func_80053478.s +++ b/asm/non_matchings/unknown_043920/func_80053478.s @@ -14,14 +14,14 @@ glabel func_80053478 /* 054080 80053480 44806000 */ mtc1 $zero, $f12 /* 054084 80053484 460000A1 */ cvt.d.s $f2, $f0 /* 054088 80053488 462C103C */ c.lt.d $f2, $f12 -/* 05408C 8005348C 3C01800E */ lui $at, %hi(D_800E6754) # $at, 0x800e +/* 05408C 8005348C 3C01800E */ lui $at, %hi(D_800E6750 + 4) # $at, 0x800e /* 054090 80053490 45000003 */ bc1f .L800534A0 /* 054094 80053494 00000000 */ nop /* 054098 80053498 46000007 */ neg.s $f0, $f0 /* 05409C 8005349C 460000A1 */ cvt.d.s $f2, $f0 .L800534A0: /* 0540A0 800534A0 C4256750 */ lwc1 $f5, %lo(D_800E6750)($at) -/* 0540A4 800534A4 C4246754 */ lwc1 $f4, %lo(D_800E6754)($at) +/* 0540A4 800534A4 C4246754 */ lwc1 $f4, %lo(D_800E6750 + 4)($at) /* 0540A8 800534A8 3C01800E */ lui $at, %hi(D_800E6758) # $at, 0x800e /* 0540AC 800534AC 4622203C */ c.lt.d $f4, $f2 /* 0540B0 800534B0 00000000 */ nop @@ -31,9 +31,9 @@ glabel func_80053478 /* 0540C0 800534C0 00000000 */ nop /* 0540C4 800534C4 460000A1 */ cvt.d.s $f2, $f0 .L800534C8: -/* 0540C8 800534C8 3C01800E */ lui $at, %hi(D_800E6764) # $at, 0x800e +/* 0540C8 800534C8 3C01800E */ lui $at, %hi(D_800E6760 + 4) # $at, 0x800e /* 0540CC 800534CC C4276760 */ lwc1 $f7, %lo(D_800E6760)($at) -/* 0540D0 800534D0 C4266764 */ lwc1 $f6, %lo(D_800E6764)($at) +/* 0540D0 800534D0 C4266764 */ lwc1 $f6, %lo(D_800E6760 + 4)($at) /* 0540D4 800534D4 3C014268 */ li $at, 0x42680000 # 58.000000 /* 0540D8 800534D8 46261201 */ sub.d $f8, $f2, $f6 /* 0540DC 800534DC 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_043920/func_80053750.s b/asm/non_matchings/unknown_043920/func_80053750.s index 5d594aa1..42662baa 100644 --- a/asm/non_matchings/unknown_043920/func_80053750.s +++ b/asm/non_matchings/unknown_043920/func_80053750.s @@ -52,10 +52,10 @@ glabel func_80053750 /* 0543EC 800537EC 44810000 */ mtc1 $at, $f0 /* 0543F0 800537F0 00000000 */ nop .L800537F4: -/* 0543F4 800537F4 3C01800E */ lui $at, %hi(D_800E678C) # $at, 0x800e +/* 0543F4 800537F4 3C01800E */ lui $at, %hi(D_800E6788 + 4) # $at, 0x800e /* 0543F8 800537F8 C4C600B8 */ lwc1 $f6, 0xb8($a2) /* 0543FC 800537FC C4236788 */ lwc1 $f3, %lo(D_800E6788)($at) -/* 054400 80053800 C422678C */ lwc1 $f2, %lo(D_800E678C)($at) +/* 054400 80053800 C422678C */ lwc1 $f2, %lo(D_800E6788 + 4)($at) /* 054404 80053804 46003221 */ cvt.d.s $f8, $f6 /* 054408 80053808 4628103C */ c.lt.d $f2, $f8 /* 05440C 8005380C 24020001 */ li $v0, 1 @@ -328,7 +328,7 @@ glabel func_80053750 /* 0547CC 80053BCC 80CB01FB */ lb $t3, 0x1fb($a2) /* 0547D0 80053BD0 24070001 */ li $a3, 1 /* 0547D4 80053BD4 1160002B */ beqz $t3, .L80053C84 -/* 0547D8 80053BD8 3C01800E */ lui $at, %hi(D_800E6794) # $at, 0x800e +/* 0547D8 80053BD8 3C01800E */ lui $at, %hi(D_800E6790 + 4) # $at, 0x800e /* 0547DC 80053BDC 00001025 */ move $v0, $zero /* 0547E0 80053BE0 24030008 */ li $v1, 8 .L80053BE4: @@ -376,10 +376,10 @@ glabel func_80053750 /* 054880 80053C80 AC8B0074 */ sw $t3, 0x74($a0) .L80053C84: /* 054884 80053C84 C4336790 */ lwc1 $f19, %lo(D_800E6790)($at) -/* 054888 80053C88 C4326794 */ lwc1 $f18, %lo(D_800E6794)($at) -/* 05488C 80053C8C 3C01800E */ lui $at, %hi(D_800E679C) # $at, 0x800e +/* 054888 80053C88 C4326794 */ lwc1 $f18, %lo(D_800E6790 + 4)($at) +/* 05488C 80053C8C 3C01800E */ lui $at, %hi(D_800E6798 + 4) # $at, 0x800e /* 054890 80053C90 C4316798 */ lwc1 $f17, %lo(D_800E6798)($at) -/* 054894 80053C94 C430679C */ lwc1 $f16, %lo(D_800E679C)($at) +/* 054894 80053C94 C430679C */ lwc1 $f16, %lo(D_800E6798 + 4)($at) /* 054898 80053C98 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 05489C 80053C9C 44817800 */ mtc1 $at, $f15 /* 0548A0 80053CA0 3C01C120 */ li $at, 0xC1200000 # -10.000000 diff --git a/asm/non_matchings/unknown_043920/func_80053E9C.s b/asm/non_matchings/unknown_043920/func_80053E9C.s index f3468f6a..fb5d6c41 100644 --- a/asm/non_matchings/unknown_043920/func_80053E9C.s +++ b/asm/non_matchings/unknown_043920/func_80053E9C.s @@ -167,10 +167,10 @@ glabel L800540C4 /* 054CC8 800540C8 240C0001 */ li $t4, 1 /* 054CCC 800540CC A20C01F1 */ sb $t4, 0x1f1($s0) /* 054CD0 800540D0 E60A002C */ swc1 $f10, 0x2c($s0) -/* 054CD4 800540D4 3C01800E */ lui $at, %hi(D_800E67C4) # $at, 0x800e +/* 054CD4 800540D4 3C01800E */ lui $at, %hi(D_800E67C0 + 4) # $at, 0x800e /* 054CD8 800540D8 C4900020 */ lwc1 $f16, 0x20($a0) /* 054CDC 800540DC C42567C0 */ lwc1 $f5, %lo(D_800E67C0)($at) -/* 054CE0 800540E0 C42467C4 */ lwc1 $f4, %lo(D_800E67C4)($at) +/* 054CE0 800540E0 C42467C4 */ lwc1 $f4, %lo(D_800E67C0 + 4)($at) /* 054CE4 800540E4 460084A1 */ cvt.d.s $f18, $f16 /* 054CE8 800540E8 46249180 */ add.d $f6, $f18, $f4 /* 054CEC 800540EC 24050139 */ li $a1, 313 diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index 00671236..75a0d35f 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -103,20 +103,20 @@ glabel func_80054110 /* 054E64 80054264 02202025 */ move $a0, $s1 /* 054E68 80054268 1100000A */ beqz $t0, .L80054294 /* 054E6C 8005426C 02002825 */ move $a1, $s0 -/* 054E70 80054270 3C01800E */ lui $at, %hi(D_800E67CC) # $at, 0x800e +/* 054E70 80054270 3C01800E */ lui $at, %hi(D_800E67C8 + 4) # $at, 0x800e /* 054E74 80054274 C60400A8 */ lwc1 $f4, 0xa8($s0) /* 054E78 80054278 C42967C8 */ lwc1 $f9, %lo(D_800E67C8)($at) -/* 054E7C 8005427C C42867CC */ lwc1 $f8, %lo(D_800E67CC)($at) +/* 054E7C 8005427C C42867CC */ lwc1 $f8, %lo(D_800E67C8 + 4)($at) /* 054E80 80054280 460021A1 */ cvt.d.s $f6, $f4 /* 054E84 80054284 46283401 */ sub.d $f16, $f6, $f8 /* 054E88 80054288 462082A0 */ cvt.s.d $f10, $f16 /* 054E8C 8005428C 10000009 */ b .L800542B4 /* 054E90 80054290 E60A00A8 */ swc1 $f10, 0xa8($s0) .L80054294: -/* 054E94 80054294 3C01800E */ lui $at, %hi(D_800E67D4) # $at, 0x800e +/* 054E94 80054294 3C01800E */ lui $at, %hi(D_800E67D0 + 4) # $at, 0x800e /* 054E98 80054298 C61200A8 */ lwc1 $f18, 0xa8($s0) /* 054E9C 8005429C C42767D0 */ lwc1 $f7, %lo(D_800E67D0)($at) -/* 054EA0 800542A0 C42667D4 */ lwc1 $f6, %lo(D_800E67D4)($at) +/* 054EA0 800542A0 C42667D4 */ lwc1 $f6, %lo(D_800E67D0 + 4)($at) /* 054EA4 800542A4 46009121 */ cvt.d.s $f4, $f18 /* 054EA8 800542A8 46262201 */ sub.d $f8, $f4, $f6 /* 054EAC 800542AC 46204420 */ cvt.s.d $f16, $f8 @@ -128,15 +128,15 @@ glabel func_80054110 /* 054EC0 800542C0 0C016420 */ jal func_80059080 /* 054EC4 800542C4 27A700A0 */ addiu $a3, $sp, 0xa0 /* 054EC8 800542C8 920A01F0 */ lbu $t2, 0x1f0($s0) -# Used to access D_800E67E0 and D_800E67E4. +# Used to access D_800E67E0 and D_800E67E0 + 4. /* 054ECC 800542CC 3C01800E */ lui $at, %hi(D_800E67E0) # $at, 0x800e /* 054ED0 800542D0 1140000A */ beqz $t2, .L800542FC /* 054ED4 800542D4 00000000 */ nop -# Used to access D_800E67D8 and D_800E67DC. +# Used to access D_800E67D8 and D_800E67D8 + 4. /* 054ED8 800542D8 3C01800E */ lui $at, %hi(D_800E67D8) # $at, 0x800e /* 054EDC 800542DC C60A00A8 */ lwc1 $f10, 0xa8($s0) /* 054EE0 800542E0 C42567D8 */ lwc1 $f5, %lo(D_800E67D8)($at) -/* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67DC)($at) +/* 054EE4 800542E4 C42467DC */ lwc1 $f4, %lo(D_800E67D8 + 4)($at) /* 054EE8 800542E8 460054A1 */ cvt.d.s $f18, $f10 /* 054EEC 800542EC 46249180 */ add.d $f6, $f18, $f4 /* 054EF0 800542F0 46203220 */ cvt.s.d $f8, $f6 @@ -145,7 +145,7 @@ glabel func_80054110 .L800542FC: /* 054EFC 800542FC C61000A8 */ lwc1 $f16, 0xa8($s0) /* 054F00 80054300 C43367E0 */ lwc1 $f19, %lo(D_800E67E0)($at) -/* 054F04 80054304 C43267E4 */ lwc1 $f18, %lo(D_800E67E4)($at) +/* 054F04 80054304 C43267E4 */ lwc1 $f18, %lo(D_800E67E0 + 4)($at) /* 054F08 80054308 460082A1 */ cvt.d.s $f10, $f16 /* 054F0C 8005430C 46325100 */ add.d $f4, $f10, $f18 /* 054F10 80054310 462021A0 */ cvt.s.d $f6, $f4 diff --git a/asm/non_matchings/unknown_043920/func_8005492C.s b/asm/non_matchings/unknown_043920/func_8005492C.s index f2e9087d..bcaf035a 100644 --- a/asm/non_matchings/unknown_043920/func_8005492C.s +++ b/asm/non_matchings/unknown_043920/func_8005492C.s @@ -68,7 +68,7 @@ glabel func_8005492C /* 0555C8 800549C8 2403000C */ li $v1, 12 .L800549CC: /* 0555CC 800549CC 10400006 */ beqz $v0, .L800549E8 -/* 0555D0 800549D0 3C01800E */ lui $at, %hi(D_800E67EC) # $at, 0x800e +/* 0555D0 800549D0 3C01800E */ lui $at, %hi(D_800E67E8 + 4) # $at, 0x800e /* 0555D4 800549D4 80B801E6 */ lb $t8, 0x1e6($a1) /* 0555D8 800549D8 00000000 */ nop /* 0555DC 800549DC 13000002 */ beqz $t8, .L800549E8 @@ -77,19 +77,19 @@ glabel func_8005492C .L800549E8: /* 0555E8 800549E8 C4A4002C */ lwc1 $f4, 0x2c($a1) /* 0555EC 800549EC C42767E8 */ lwc1 $f7, %lo(D_800E67E8)($at) -/* 0555F0 800549F0 C42667EC */ lwc1 $f6, %lo(D_800E67EC)($at) +/* 0555F0 800549F0 C42667EC */ lwc1 $f6, %lo(D_800E67E8 + 4)($at) /* 0555F4 800549F4 46002021 */ cvt.d.s $f0, $f4 /* 0555F8 800549F8 4626003C */ c.lt.d $f0, $f6 /* 0555FC 800549FC 00001025 */ move $v0, $zero /* 055600 80054A00 45000005 */ bc1f .L80054A18 -/* 055604 80054A04 3C01800E */ lui $at, %hi(D_800E67F4) # $at, 0x800e +/* 055604 80054A04 3C01800E */ lui $at, %hi(D_800E67F0 + 4) # $at, 0x800e /* 055608 80054A08 00830019 */ multu $a0, $v1 /* 05560C 80054A0C 00001012 */ mflo $v0 /* 055610 80054A10 00000000 */ nop /* 055614 80054A14 00000000 */ nop .L80054A18: /* 055618 80054A18 C42967F0 */ lwc1 $f9, %lo(D_800E67F0)($at) -/* 05561C 80054A1C C42867F4 */ lwc1 $f8, %lo(D_800E67F4)($at) +/* 05561C 80054A1C C42867F4 */ lwc1 $f8, %lo(D_800E67F0 + 4)($at) /* 055620 80054A20 8FA80050 */ lw $t0, 0x50($sp) /* 055624 80054A24 4620403C */ c.lt.d $f8, $f0 /* 055628 80054A28 00000000 */ nop @@ -127,10 +127,10 @@ glabel func_8005492C /* 0556A4 80054AA4 0C014D1E */ jal func_80053478 /* 0556A8 80054AA8 AFA5004C */ sw $a1, 0x4c($sp) /* 0556AC 80054AAC 8FA5004C */ lw $a1, 0x4c($sp) -/* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67FC) # $at, 0x800e +/* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67F8 + 4) # $at, 0x800e /* 0556B4 80054AB4 C4A40030 */ lwc1 $f4, 0x30($a1) /* 0556B8 80054AB8 C42967F8 */ lwc1 $f9, %lo(D_800E67F8)($at) -/* 0556BC 80054ABC C42867FC */ lwc1 $f8, %lo(D_800E67FC)($at) +/* 0556BC 80054ABC C42867FC */ lwc1 $f8, %lo(D_800E67F8 + 4)($at) /* 0556C0 80054AC0 460021A1 */ cvt.d.s $f6, $f4 /* 0556C4 80054AC4 46283282 */ mul.d $f10, $f6, $f8 /* 0556C8 80054AC8 44809000 */ mtc1 $zero, $f18 @@ -294,7 +294,7 @@ glabel func_8005492C /* 055918 80054D18 46005202 */ mul.s $f8, $f10, $f0 /* 05591C 80054D1C 460041A1 */ cvt.d.s $f6, $f8 /* 055920 80054D20 46262280 */ add.d $f10, $f4, $f6 -/* 055924 80054D24 C424680C */ lwc1 $f4, %lo(D_800E680C)($at) +/* 055924 80054D24 C424680C */ lwc1 $f4, %lo(D_800E6808 + 4)($at) /* 055928 80054D28 462050A0 */ cvt.s.d $f2, $f10 /* 05592C 80054D2C C4256808 */ lwc1 $f5, %lo(D_800E6808)($at) /* 055930 80054D30 46001221 */ cvt.d.s $f8, $f2 @@ -342,14 +342,14 @@ glabel func_8005492C /* 0559C8 80054DC8 00000000 */ nop /* 0559CC 80054DCC 44818800 */ mtc1 $at, $f17 /* 0559D0 80054DD0 44808000 */ mtc1 $zero, $f16 -/* 0559D4 80054DD4 3C01800E */ lui $at, %hi(D_800E6814) # $at, 0x800e +/* 0559D4 80054DD4 3C01800E */ lui $at, %hi(D_800E6810 + 4) # $at, 0x800e /* 0559D8 80054DD8 4630003C */ c.lt.d $f0, $f16 /* 0559DC 80054DDC 00000000 */ nop /* 0559E0 80054DE0 45000017 */ bc1f .L80054E40 /* 0559E4 80054DE4 00000000 */ nop /* 0559E8 80054DE8 46208201 */ sub.d $f8, $f16, $f0 /* 0559EC 80054DEC C4256810 */ lwc1 $f5, %lo(D_800E6810)($at) -/* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6814)($at) +/* 0559F0 80054DF0 C4246814 */ lwc1 $f4, %lo(D_800E6810 + 4)($at) /* 0559F4 80054DF4 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 /* 0559F8 80054DF8 46244182 */ mul.d $f6, $f8, $f4 /* 0559FC 80054DFC 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) @@ -371,10 +371,10 @@ glabel func_8005492C /* 055A3C 80054E3C 00000000 */ nop .L80054E40: /* 055A40 80054E40 C4A800B8 */ lwc1 $f8, 0xb8($a1) -/* 055A44 80054E44 3C01800E */ lui $at, %hi(D_800E681C) # $at, 0x800e +/* 055A44 80054E44 3C01800E */ lui $at, %hi(D_800E6818 + 4) # $at, 0x800e /* 055A48 80054E48 46024102 */ mul.s $f4, $f8, $f2 /* 055A4C 80054E4C C42B6818 */ lwc1 $f11, %lo(D_800E6818)($at) -/* 055A50 80054E50 C42A681C */ lwc1 $f10, %lo(D_800E681C)($at) +/* 055A50 80054E50 C42A681C */ lwc1 $f10, %lo(D_800E6818 + 4)($at) /* 055A54 80054E54 3C01800E */ lui $at, %hi(D_800E6820) # $at, 0x800e /* 055A58 80054E58 460021A1 */ cvt.d.s $f6, $f4 /* 055A5C 80054E5C 462A3202 */ mul.d $f8, $f6, $f10 @@ -385,15 +385,15 @@ glabel func_8005492C /* 055A70 80054E70 46066281 */ sub.s $f10, $f12, $f6 /* 055A74 80054E74 E4AA002C */ swc1 $f10, 0x2c($a1) /* 055A78 80054E78 C4AC002C */ lwc1 $f12, 0x2c($a1) -/* 055A7C 80054E7C C4286824 */ lwc1 $f8, %lo(D_800E6824)($at) +/* 055A7C 80054E7C C4286824 */ lwc1 $f8, %lo(D_800E6820 + 4)($at) /* 055A80 80054E80 C4296820 */ lwc1 $f9, %lo(D_800E6820)($at) /* 055A84 80054E84 46006021 */ cvt.d.s $f0, $f12 /* 055A88 80054E88 4620403C */ c.lt.d $f8, $f0 -/* 055A8C 80054E8C 3C01800E */ lui $at, %hi(D_800E682C) # $at, 0x800e +/* 055A8C 80054E8C 3C01800E */ lui $at, %hi(D_800E6828 + 4) # $at, 0x800e /* 055A90 80054E90 4500000B */ bc1f .L80054EC0 /* 055A94 80054E94 00000000 */ nop /* 055A98 80054E98 C4256828 */ lwc1 $f5, %lo(D_800E6828)($at) -/* 055A9C 80054E9C C424682C */ lwc1 $f4, %lo(D_800E682C)($at) +/* 055A9C 80054E9C C424682C */ lwc1 $f4, %lo(D_800E6828 + 4)($at) /* 055AA0 80054EA0 00000000 */ nop /* 055AA4 80054EA4 4624003C */ c.lt.d $f0, $f4 /* 055AA8 80054EA8 00000000 */ nop @@ -442,10 +442,10 @@ glabel func_8005492C /* 055B48 80054F48 462A2182 */ mul.d $f6, $f4, $f10 /* 055B4C 80054F4C 46203020 */ cvt.s.d $f0, $f6 .L80054F50: -/* 055B50 80054F50 3C01800E */ lui $at, %hi(D_800E6834) # $at, 0x800e +/* 055B50 80054F50 3C01800E */ lui $at, %hi(D_800E6830 + 4) # $at, 0x800e /* 055B54 80054F54 C4A800B8 */ lwc1 $f8, 0xb8($a1) /* 055B58 80054F58 C42B6830 */ lwc1 $f11, %lo(D_800E6830)($at) -/* 055B5C 80054F5C C42A6834 */ lwc1 $f10, %lo(D_800E6834)($at) +/* 055B5C 80054F5C C42A6834 */ lwc1 $f10, %lo(D_800E6830 + 4)($at) /* 055B60 80054F60 46004121 */ cvt.d.s $f4, $f8 /* 055B64 80054F64 462A203C */ c.lt.d $f4, $f10 /* 055B68 80054F68 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80054FD0.s b/asm/non_matchings/unknown_043920/func_80054FD0.s index 6f457e33..22c40dfa 100644 --- a/asm/non_matchings/unknown_043920/func_80054FD0.s +++ b/asm/non_matchings/unknown_043920/func_80054FD0.s @@ -274,10 +274,10 @@ glabel func_80054FD0 /* 055FD8 800553D8 24010001 */ li $at, 1 /* 055FDC 800553DC 15E10069 */ bne $t7, $at, .L80055584 .L800553E0: -/* 055FE0 800553E0 3C01800E */ lui $at, %hi(D_800E683C) # $at, 0x800e +/* 055FE0 800553E0 3C01800E */ lui $at, %hi(D_800E6838 + 4) # $at, 0x800e /* 055FE4 800553E4 C60A002C */ lwc1 $f10, 0x2c($s0) /* 055FE8 800553E8 C4276838 */ lwc1 $f7, %lo(D_800E6838)($at) -/* 055FEC 800553EC C426683C */ lwc1 $f6, %lo(D_800E683C)($at) +/* 055FEC 800553EC C426683C */ lwc1 $f6, %lo(D_800E6838 + 4)($at) /* 055FF0 800553F0 46005121 */ cvt.d.s $f4, $f10 /* 055FF4 800553F4 46262202 */ mul.d $f8, $f4, $f6 /* 055FF8 800553F8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -378,7 +378,7 @@ glabel func_80054FD0 /* 056160 80055560 46062202 */ mul.s $f8, $f4, $f6 /* 056164 80055564 46005121 */ cvt.d.s $f4, $f10 /* 056168 80055568 E6080120 */ swc1 $f8, 0x120($s0) -/* 05616C 8005556C C4266844 */ lwc1 $f6, %lo(D_800E6844)($at) +/* 05616C 8005556C C4266844 */ lwc1 $f6, %lo(D_800E6840 + 4)($at) /* 056170 80055570 C4276840 */ lwc1 $f7, %lo(D_800E6840)($at) /* 056174 80055574 E6100030 */ swc1 $f16, 0x30($s0) /* 056178 80055578 46262202 */ mul.d $f8, $f4, $f6 diff --git a/asm/non_matchings/unknown_043920/func_80055EC0.s b/asm/non_matchings/unknown_043920/func_80055EC0.s index f6c00f7d..eac677bb 100644 --- a/asm/non_matchings/unknown_043920/func_80055EC0.s +++ b/asm/non_matchings/unknown_043920/func_80055EC0.s @@ -110,7 +110,7 @@ glabel func_80055EC0 /* 056C3C 8005603C 00000000 */ nop /* 056C40 80056040 A479002E */ sh $t9, 0x2e($v1) /* 056C44 80056044 C4E8001C */ lwc1 $f8, 0x1c($a3) -/* 056C48 80056048 C420684C */ lwc1 $f0, %lo(D_800E684C)($at) +/* 056C48 80056048 C420684C */ lwc1 $f0, %lo(D_800E6848 + 4)($at) /* 056C4C 8005604C C4216848 */ lwc1 $f1, %lo(D_800E6848)($at) /* 056C50 80056050 460041A1 */ cvt.d.s $f6, $f8 /* 056C54 80056054 46203282 */ mul.d $f10, $f6, $f0 diff --git a/asm/non_matchings/unknown_043920/func_80057A40.s b/asm/non_matchings/unknown_043920/func_80057A40.s index d7f55626..fb195734 100644 --- a/asm/non_matchings/unknown_043920/func_80057A40.s +++ b/asm/non_matchings/unknown_043920/func_80057A40.s @@ -195,15 +195,15 @@ glabel L80057CAC .L80057CD0: glabel L80057CD0 /* 0588D0 80057CD0 3C038012 */ lui $v1, %hi(D_8011D586) # $v1, 0x8012 -/* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F4) # $at, 0x800e +/* 0588D4 80057CD4 3C01800E */ lui $at, %hi(D_800E68F0 + 4) # $at, 0x800e /* 0588D8 80057CD8 2463D586 */ addiu $v1, %lo(D_8011D586) # addiu $v1, $v1, -0x2a7a /* 0588DC 80057CDC C42168F0 */ lwc1 $f1, %lo(D_800E68F0)($at) -/* 0588E0 80057CE0 C42068F4 */ lwc1 $f0, %lo(D_800E68F4)($at) +/* 0588E0 80057CE0 C42068F4 */ lwc1 $f0, %lo(D_800E68F0 + 4)($at) /* 0588E4 80057CE4 84790000 */ lh $t9, ($v1) -/* 0588E8 80057CE8 3C01800E */ lui $at, %hi(D_800E68FC) # $at, 0x800e +/* 0588E8 80057CE8 3C01800E */ lui $at, %hi(D_800E68F8 + 4) # $at, 0x800e /* 0588EC 80057CEC 44992000 */ mtc1 $t9, $f4 /* 0588F0 80057CF0 C42D68F8 */ lwc1 $f13, %lo(D_800E68F8)($at) -/* 0588F4 80057CF4 C42C68FC */ lwc1 $f12, %lo(D_800E68FC)($at) +/* 0588F4 80057CF4 C42C68FC */ lwc1 $f12, %lo(D_800E68F8 + 4)($at) /* 0588F8 80057CF8 468021A0 */ cvt.s.w $f6, $f4 /* 0588FC 80057CFC 8FA80038 */ lw $t0, 0x38($sp) /* 058900 80057D00 3C014620 */ li $at, 0x46200000 # 10240.000000 @@ -251,10 +251,10 @@ glabel L80057CD0 /* 0589A8 80057DA8 E7A30018 */ swc1 $f3, 0x18($sp) /* 0589AC 80057DAC 3C078012 */ lui $a3, %hi(D_8011D508) # $a3, 0x8012 /* 0589B0 80057DB0 24E7D508 */ addiu $a3, %lo(D_8011D508) # addiu $a3, $a3, -0x2af8 -/* 0589B4 80057DB4 3C01800E */ lui $at, %hi(D_800E6904) # $at, 0x800e +/* 0589B4 80057DB4 3C01800E */ lui $at, %hi(D_800E6900 + 4) # $at, 0x800e /* 0589B8 80057DB8 8CE20000 */ lw $v0, ($a3) /* 0589BC 80057DBC C4316900 */ lwc1 $f17, %lo(D_800E6900)($at) -/* 0589C0 80057DC0 C4306904 */ lwc1 $f16, %lo(D_800E6904)($at) +/* 0589C0 80057DC0 C4306904 */ lwc1 $f16, %lo(D_800E6900 + 4)($at) /* 0589C4 80057DC4 C44A0010 */ lwc1 $f10, 0x10($v0) /* 0589C8 80057DC8 46000221 */ cvt.d.s $f8, $f0 /* 0589CC 80057DCC 46304180 */ add.d $f6, $f8, $f16 @@ -317,13 +317,13 @@ glabel L80057CD0 /* 058AB0 80057EB0 15C0001D */ bnez $t6, .L80057F28 /* 058AB4 80057EB4 00000000 */ nop /* 058AB8 80057EB8 846F0000 */ lh $t7, ($v1) -/* 058ABC 80057EBC 3C01800E */ lui $at, %hi(D_800E690C) # $at, 0x800e +/* 058ABC 80057EBC 3C01800E */ lui $at, %hi(D_800E6908 + 4) # $at, 0x800e /* 058AC0 80057EC0 15E00019 */ bnez $t7, .L80057F28 /* 058AC4 80057EC4 00000000 */ nop /* 058AC8 80057EC8 8CE20000 */ lw $v0, ($a3) /* 058ACC 80057ECC C4216908 */ lwc1 $f1, %lo(D_800E6908)($at) /* 058AD0 80057ED0 C4480024 */ lwc1 $f8, 0x24($v0) -/* 058AD4 80057ED4 C420690C */ lwc1 $f0, %lo(D_800E690C)($at) +/* 058AD4 80057ED4 C420690C */ lwc1 $f0, %lo(D_800E6908 + 4)($at) /* 058AD8 80057ED8 460044A1 */ cvt.d.s $f18, $f8 /* 058ADC 80057EDC 46209402 */ mul.d $f16, $f18, $f0 /* 058AE0 80057EE0 462082A0 */ cvt.s.d $f10, $f16 diff --git a/asm/non_matchings/unknown_043920/func_800581E8.s b/asm/non_matchings/unknown_043920/func_800581E8.s index 286d056a..6971b13d 100644 --- a/asm/non_matchings/unknown_043920/func_800581E8.s +++ b/asm/non_matchings/unknown_043920/func_800581E8.s @@ -225,9 +225,9 @@ glabel func_800581E8 /* 0590F4 800584F4 00000000 */ nop .L800584F8: /* 0590F8 800584F8 460C2302 */ mul.s $f12, $f4, $f12 -/* 0590FC 800584FC 3C01800E */ lui $at, %hi(D_800E6914) # $at, 0x800e +/* 0590FC 800584FC 3C01800E */ lui $at, %hi(D_800E6910 + 4) # $at, 0x800e /* 059100 80058500 C4276910 */ lwc1 $f7, %lo(D_800E6910)($at) -/* 059104 80058504 C4266914 */ lwc1 $f6, %lo(D_800E6914)($at) +/* 059104 80058504 C4266914 */ lwc1 $f6, %lo(D_800E6910 + 4)($at) /* 059108 80058508 46006221 */ cvt.d.s $f8, $f12 /* 05910C 8005850C 4628303C */ c.lt.d $f6, $f8 /* 059110 80058510 3C014282 */ li $at, 0x42820000 # 65.000000 @@ -376,10 +376,10 @@ glabel func_800581E8 /* 059330 80058730 E7A80044 */ swc1 $f8, 0x44($sp) /* 059334 80058734 11E00023 */ beqz $t7, .L800587C4 /* 059338 80058738 46007086 */ mov.s $f2, $f14 -/* 05933C 8005873C 3C01800E */ lui $at, %hi(D_800E691C) # $at, 0x800e +/* 05933C 8005873C 3C01800E */ lui $at, %hi(D_800E6918 + 4) # $at, 0x800e /* 059340 80058740 C4E40030 */ lwc1 $f4, 0x30($a3) /* 059344 80058744 C4276918 */ lwc1 $f7, %lo(D_800E6918)($at) -/* 059348 80058748 C426691C */ lwc1 $f6, %lo(D_800E691C)($at) +/* 059348 80058748 C426691C */ lwc1 $f6, %lo(D_800E6918 + 4)($at) /* 05934C 8005874C 460022A1 */ cvt.d.s $f10, $f4 /* 059350 80058750 46265202 */ mul.d $f8, $f10, $f6 /* 059354 80058754 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 diff --git a/asm/non_matchings/unknown_043920/func_80059208.s b/asm/non_matchings/unknown_043920/func_80059208.s index 184399a2..d462935a 100644 --- a/asm/non_matchings/unknown_043920/func_80059208.s +++ b/asm/non_matchings/unknown_043920/func_80059208.s @@ -34,10 +34,10 @@ glabel func_80059208 /* 059E70 80059270 44802000 */ mtc1 $zero, $f4 /* 059E74 80059274 46003221 */ cvt.d.s $f8, $f6 /* 059E78 80059278 46282281 */ sub.d $f10, $f4, $f8 -/* 059E7C 8005927C 3C01800E */ lui $at, %hi(D_800E6924) # $at, 0x800e +/* 059E7C 8005927C 3C01800E */ lui $at, %hi(D_800E6920 + 4) # $at, 0x800e /* 059E80 80059280 46205020 */ cvt.s.d $f0, $f10 /* 059E84 80059284 C4316920 */ lwc1 $f17, %lo(D_800E6920)($at) -/* 059E88 80059288 C4306924 */ lwc1 $f16, %lo(D_800E6924)($at) +/* 059E88 80059288 C4306924 */ lwc1 $f16, %lo(D_800E6920 + 4)($at) /* 059E8C 8005928C 460000A1 */ cvt.d.s $f2, $f0 /* 059E90 80059290 4630103C */ c.lt.d $f2, $f16 /* 059E94 80059294 82240192 */ lb $a0, 0x192($s1) diff --git a/asm/non_matchings/unknown_043920/func_80059790.s b/asm/non_matchings/unknown_043920/func_80059790.s index f24b3bc5..9cc85e8a 100644 --- a/asm/non_matchings/unknown_043920/func_80059790.s +++ b/asm/non_matchings/unknown_043920/func_80059790.s @@ -10,10 +10,10 @@ glabel func_80059790 /* 05A39C 8005979C 15C10012 */ bne $t6, $at, .L800597E8 /* 05A3A0 800597A0 24080E10 */ li $t0, 3600 /* 05A3A4 800597A4 44842000 */ mtc1 $a0, $f4 -/* 05A3A8 800597A8 3C01800E */ lui $at, %hi(D_800E692C) # $at, 0x800e +/* 05A3A8 800597A8 3C01800E */ lui $at, %hi(D_800E6928 + 4) # $at, 0x800e /* 05A3AC 800597AC 468021A0 */ cvt.s.w $f6, $f4 /* 05A3B0 800597B0 C42B6928 */ lwc1 $f11, %lo(D_800E6928)($at) -/* 05A3B4 800597B4 C42A692C */ lwc1 $f10, %lo(D_800E692C)($at) +/* 05A3B4 800597B4 C42A692C */ lwc1 $f10, %lo(D_800E6928 + 4)($at) /* 05A3B8 800597B8 46003221 */ cvt.d.s $f8, $f6 /* 05A3BC 800597BC 462A4402 */ mul.d $f16, $f8, $f10 /* 05A3C0 800597C0 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/unknown_043920/func_80059E40.s b/asm/non_matchings/unknown_043920/func_80059E40.s index 708dbc1f..e9cbcfb6 100644 --- a/asm/non_matchings/unknown_043920/func_80059E40.s +++ b/asm/non_matchings/unknown_043920/func_80059E40.s @@ -32,9 +32,9 @@ glabel func_80059E40 /* 05AA98 80059E98 46060083 */ div.s $f2, $f0, $f6 /* 05AA9C 80059E9C 24010002 */ li $at, 2 /* 05AAA0 80059EA0 14A1000B */ bne $a1, $at, .L80059ED0 -/* 05AAA4 80059EA4 3C01800E */ lui $at, %hi(D_800E6934) # $at, 0x800e +/* 05AAA4 80059EA4 3C01800E */ lui $at, %hi(D_800E6930 + 4) # $at, 0x800e /* 05AAA8 80059EA8 C42B6930 */ lwc1 $f11, %lo(D_800E6930)($at) -/* 05AAAC 80059EAC C42A6934 */ lwc1 $f10, %lo(D_800E6934)($at) +/* 05AAAC 80059EAC C42A6934 */ lwc1 $f10, %lo(D_800E6930 + 4)($at) /* 05AAB0 80059EB0 46000221 */ cvt.d.s $f8, $f0 /* 05AAB4 80059EB4 462A4402 */ mul.d $f16, $f8, $f10 /* 05AAB8 80059EB8 3C01403E */ li $at, 0x403E0000 # 2.968750 @@ -310,12 +310,12 @@ glabel func_80059E40 /* 05AEBC 8005A2BC C7A20094 */ lwc1 $f2, 0x94($sp) /* 05AEC0 8005A2C0 A602002E */ sh $v0, 0x2e($s0) /* 05AEC4 8005A2C4 8FAF0060 */ lw $t7, 0x60($sp) -/* 05AEC8 8005A2C8 3C01800E */ lui $at, %hi(D_800E693C) # $at, 0x800e +/* 05AEC8 8005A2C8 3C01800E */ lui $at, %hi(D_800E6938 + 4) # $at, 0x800e /* 05AECC 8005A2CC 25F90003 */ addiu $t9, $t7, 3 /* 05AED0 8005A2D0 15B90033 */ bne $t5, $t9, .L8005A3A0 /* 05AED4 8005A2D4 24020001 */ li $v0, 1 /* 05AED8 8005A2D8 C42D6938 */ lwc1 $f13, %lo(D_800E6938)($at) -/* 05AEDC 8005A2DC C42C693C */ lwc1 $f12, %lo(D_800E693C)($at) +/* 05AEDC 8005A2DC C42C693C */ lwc1 $f12, %lo(D_800E6938 + 4)($at) /* 05AEE0 8005A2E0 46001021 */ cvt.d.s $f0, $f2 /* 05AEE4 8005A2E4 4620603E */ c.le.d $f12, $f0 /* 05AEE8 8005A2E8 8E020064 */ lw $v0, 0x64($s0) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index af6c2bc8..6ad63a63 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -81,12 +81,12 @@ glabel func_8005A6F0 /* 05B3A4 8005A7A4 2463D564 */ addiu $v1, %lo(D_8011D564) # addiu $v1, $v1, -0x2a9c /* 05B3A8 8005A7A8 AC620000 */ sw $v0, ($v1) /* 05B3AC 8005A7AC 82190003 */ lb $t9, 3($s0) -/* 05B3B0 8005A7B0 3C01800E */ lui $at, %hi(D_800E6944) # $at, 0x800e +/* 05B3B0 8005A7B0 3C01800E */ lui $at, %hi(D_800E6940 + 4) # $at, 0x800e /* 05B3B4 8005A7B4 00196880 */ sll $t5, $t9, 2 /* 05B3B8 8005A7B8 004D7021 */ addu $t6, $v0, $t5 /* 05B3BC 8005A7BC C5C40000 */ lwc1 $f4, ($t6) /* 05B3C0 8005A7C0 C4296940 */ lwc1 $f9, %lo(D_800E6940)($at) -/* 05B3C4 8005A7C4 C4286944 */ lwc1 $f8, %lo(D_800E6944)($at) +/* 05B3C4 8005A7C4 C4286944 */ lwc1 $f8, %lo(D_800E6940 + 4)($at) /* 05B3C8 8005A7C8 460021A1 */ cvt.d.s $f6, $f4 /* 05B3CC 8005A7CC 46283282 */ mul.d $f10, $f6, $f8 /* 05B3D0 8005A7D0 3C0C8012 */ lui $t4, %hi(D_8011D56C) # $t4, 0x8012 @@ -295,7 +295,7 @@ glabel func_8005A6F0 /* 05B6B4 8005AAB4 00000000 */ nop .L8005AAB8: /* 05B6B8 8005AAB8 10E0000B */ beqz $a3, .L8005AAE8 -/* 05B6BC 8005AABC 3C01800E */ lui $at, %hi(D_800E6954) # $at, 0x800e +/* 05B6BC 8005AABC 3C01800E */ lui $at, %hi(D_800E6950 + 4) # $at, 0x800e /* 05B6C0 8005AAC0 8FA400A0 */ lw $a0, 0xa0($sp) /* 05B6C4 8005AAC4 C4EA000C */ lwc1 $f10, 0xc($a3) /* 05B6C8 8005AAC8 C492000C */ lwc1 $f18, 0xc($a0) @@ -311,7 +311,7 @@ glabel func_8005A6F0 /* 05B6EC 8005AAEC 11000011 */ beqz $t0, .L8005AB34 /* 05B6F0 8005AAF0 00000000 */ nop /* 05B6F4 8005AAF4 C4256950 */ lwc1 $f5, %lo(D_800E6950)($at) -/* 05B6F8 8005AAF8 C4246954 */ lwc1 $f4, %lo(D_800E6954)($at) +/* 05B6F8 8005AAF8 C4246954 */ lwc1 $f4, %lo(D_800E6950 + 4)($at) /* 05B6FC 8005AAFC 460014A1 */ cvt.d.s $f18, $f2 /* 05B700 8005AB00 4632203E */ c.le.d $f4, $f18 /* 05B704 8005AB04 00000000 */ nop @@ -351,9 +351,9 @@ glabel func_8005A6F0 /* 05B780 8005AB80 82020201 */ lb $v0, 0x201($s0) /* 05B784 8005AB84 00000000 */ nop /* 05B788 8005AB88 1440000B */ bnez $v0, .L8005ABB8 -/* 05B78C 8005AB8C 3C01800E */ lui $at, %hi(D_800E6964) # $at, 0x800e +/* 05B78C 8005AB8C 3C01800E */ lui $at, %hi(D_800E6960 + 4) # $at, 0x800e /* 05B790 8005AB90 C4276960 */ lwc1 $f7, %lo(D_800E6960)($at) -/* 05B794 8005AB94 C4266964 */ lwc1 $f6, %lo(D_800E6964)($at) +/* 05B794 8005AB94 C4266964 */ lwc1 $f6, %lo(D_800E6960 + 4)($at) /* 05B798 8005AB98 46001121 */ cvt.d.s $f4, $f2 /* 05B79C 8005AB9C 4626203C */ c.lt.d $f4, $f6 /* 05B7A0 8005ABA0 240D001E */ li $t5, 30 @@ -849,11 +849,11 @@ glabel L8005B1B0 /* 05BEC4 8005B2C4 44802000 */ mtc1 $zero, $f4 /* 05BEC8 8005B2C8 46005021 */ cvt.d.s $f0, $f10 /* 05BECC 8005B2CC 4624003C */ c.lt.d $f0, $f4 -/* 05BED0 8005B2D0 3C01800E */ lui $at, %hi(D_800E69A4) # $at, 0x800e +/* 05BED0 8005B2D0 3C01800E */ lui $at, %hi(D_800E69A0 + 4) # $at, 0x800e /* 05BED4 8005B2D4 45000007 */ bc1f .L8005B2F4 /* 05BED8 8005B2D8 00000000 */ nop /* 05BEDC 8005B2DC C42769A0 */ lwc1 $f7, %lo(D_800E69A0)($at) -/* 05BEE0 8005B2E0 C42669A4 */ lwc1 $f6, %lo(D_800E69A4)($at) +/* 05BEE0 8005B2E0 C42669A4 */ lwc1 $f6, %lo(D_800E69A0 + 4)($at) /* 05BEE4 8005B2E4 00000000 */ nop /* 05BEE8 8005B2E8 46260482 */ mul.d $f18, $f0, $f6 /* 05BEEC 8005B2EC 46209220 */ cvt.s.d $f8, $f18 @@ -1181,7 +1181,7 @@ glabel L8005B1B0 /* 05C384 8005B784 3C01800E */ lui $at, %hi(D_800E69B8) # $at, 0x800e /* 05C388 8005B788 E5C60008 */ swc1 $f6, 8($t6) /* 05C38C 8005B78C C4640030 */ lwc1 $f4, 0x30($v1) -/* 05C390 8005B790 C42869BC */ lwc1 $f8, %lo(D_800E69BC)($at) +/* 05C390 8005B790 C42869BC */ lwc1 $f8, %lo(D_800E69B8 + 4)($at) /* 05C394 8005B794 C42969B8 */ lwc1 $f9, %lo(D_800E69B8)($at) /* 05C398 8005B798 460024A1 */ cvt.d.s $f18, $f4 /* 05C39C 8005B79C 4628903C */ c.lt.d $f18, $f8 diff --git a/asm/non_matchings/unknown_043920/func_8005B818.s b/asm/non_matchings/unknown_043920/func_8005B818.s index 12682972..186548ab 100644 --- a/asm/non_matchings/unknown_043920/func_8005B818.s +++ b/asm/non_matchings/unknown_043920/func_8005B818.s @@ -61,7 +61,7 @@ glabel func_8005B818 /* 05C4B4 8005B8B4 E7A20094 */ swc1 $f2, 0x94($sp) /* 05C4B8 8005B8B8 C6200124 */ lwc1 $f0, 0x124($s1) /* 05C4BC 8005B8BC 44813000 */ mtc1 $at, $f6 -/* 05C4C0 8005B8C0 3C01800E */ lui $at, %hi(D_800E69C4) # $at, 0x800e +/* 05C4C0 8005B8C0 3C01800E */ lui $at, %hi(D_800E69C0 + 4) # $at, 0x800e /* 05C4C4 8005B8C4 4606003C */ c.lt.s $f0, $f6 /* 05C4C8 8005B8C8 00000000 */ nop /* 05C4CC 8005B8CC 45000005 */ bc1f .L8005B8E4 @@ -82,15 +82,15 @@ glabel func_8005B818 /* 05C504 8005B904 00000000 */ nop .L8005B908: /* 05C508 8005B908 C42569C0 */ lwc1 $f5, %lo(D_800E69C0)($at) -/* 05C50C 8005B90C C42469C4 */ lwc1 $f4, %lo(D_800E69C4)($at) +/* 05C50C 8005B90C C42469C4 */ lwc1 $f4, %lo(D_800E69C0 + 4)($at) /* 05C510 8005B910 460004A1 */ cvt.d.s $f18, $f0 /* 05C514 8005B914 46249182 */ mul.d $f6, $f18, $f4 -/* 05C518 8005B918 3C01800E */ lui $at, %hi(D_800E69CC) # $at, 0x800e +/* 05C518 8005B918 3C01800E */ lui $at, %hi(D_800E69C8 + 4) # $at, 0x800e /* 05C51C 8005B91C C42969C8 */ lwc1 $f9, %lo(D_800E69C8)($at) -/* 05C520 8005B920 C42869CC */ lwc1 $f8, %lo(D_800E69CC)($at) -/* 05C524 8005B924 3C01800E */ lui $at, %hi(D_800E69D4) # $at, 0x800e +/* 05C520 8005B920 C42869CC */ lwc1 $f8, %lo(D_800E69C8 + 4)($at) +/* 05C524 8005B924 3C01800E */ lui $at, %hi(D_800E69D0 + 4) # $at, 0x800e /* 05C528 8005B928 C43369D0 */ lwc1 $f19, %lo(D_800E69D0)($at) -/* 05C52C 8005B92C C43269D4 */ lwc1 $f18, %lo(D_800E69D4)($at) +/* 05C52C 8005B92C C43269D4 */ lwc1 $f18, %lo(D_800E69D0 + 4)($at) /* 05C530 8005B930 46283280 */ add.d $f10, $f6, $f8 /* 05C534 8005B934 00000000 */ nop /* 05C538 8005B938 46325103 */ div.d $f4, $f10, $f18 @@ -100,9 +100,9 @@ glabel func_8005B818 /* 05C548 8005B948 46000306 */ mov.s $f12, $f0 /* 05C54C 8005B94C 11C00007 */ beqz $t6, .L8005B96C /* 05C550 8005B950 27A30100 */ addiu $v1, $sp, 0x100 -/* 05C554 8005B954 3C01800E */ lui $at, %hi(D_800E69DC) # $at, 0x800e +/* 05C554 8005B954 3C01800E */ lui $at, %hi(D_800E69D8 + 4) # $at, 0x800e /* 05C558 8005B958 C42969D8 */ lwc1 $f9, %lo(D_800E69D8)($at) -/* 05C55C 8005B95C C42869DC */ lwc1 $f8, %lo(D_800E69DC)($at) +/* 05C55C 8005B95C C42869DC */ lwc1 $f8, %lo(D_800E69D8 + 4)($at) /* 05C560 8005B960 460001A1 */ cvt.d.s $f6, $f0 /* 05C564 8005B964 46283282 */ mul.d $f10, $f6, $f8 /* 05C568 8005B968 46205320 */ cvt.s.d $f12, $f10 @@ -138,10 +138,10 @@ glabel func_8005B818 /* 05C5D0 8005B9D0 00001025 */ move $v0, $zero .L8005B9D4: /* 05C5D4 8005B9D4 44829000 */ mtc1 $v0, $f18 -/* 05C5D8 8005B9D8 3C01800E */ lui $at, %hi(D_800E69E4) # $at, 0x800e +/* 05C5D8 8005B9D8 3C01800E */ lui $at, %hi(D_800E69E0 + 4) # $at, 0x800e /* 05C5DC 8005B9DC 46809120 */ cvt.s.w $f4, $f18 /* 05C5E0 8005B9E0 C42969E0 */ lwc1 $f9, %lo(D_800E69E0)($at) -/* 05C5E4 8005B9E4 C42869E4 */ lwc1 $f8, %lo(D_800E69E4)($at) +/* 05C5E4 8005B9E4 C42869E4 */ lwc1 $f8, %lo(D_800E69E0 + 4)($at) /* 05C5E8 8005B9E8 460021A1 */ cvt.d.s $f6, $f4 /* 05C5EC 8005B9EC 00000000 */ nop /* 05C5F0 8005B9F0 46283283 */ div.d $f10, $f6, $f8 @@ -373,7 +373,7 @@ glabel func_8005B818 /* 05C94C 8005BD4C 461E0303 */ div.s $f12, $f0, $f30 /* 05C950 8005BD50 44809000 */ mtc1 $zero, $f18 /* 05C954 8005BD54 C7A6008C */ lwc1 $f6, 0x8c($sp) -/* 05C958 8005BD58 3C01800E */ lui $at, %hi(D_800E69F4) # $at, 0x800e +/* 05C958 8005BD58 3C01800E */ lui $at, %hi(D_800E69F0 + 4) # $at, 0x800e /* 05C95C 8005BD5C 460C9032 */ c.eq.s $f18, $f12 /* 05C960 8005BD60 00000000 */ nop /* 05C964 8005BD64 45010007 */ bc1t .L8005BD84 @@ -387,7 +387,7 @@ glabel func_8005B818 .L8005BD84: /* 05C984 8005BD84 C63200AC */ lwc1 $f18, 0xac($s1) /* 05C988 8005BD88 C42969F0 */ lwc1 $f9, %lo(D_800E69F0)($at) -/* 05C98C 8005BD8C C42869F4 */ lwc1 $f8, %lo(D_800E69F4)($at) +/* 05C98C 8005BD8C C42869F4 */ lwc1 $f8, %lo(D_800E69F0 + 4)($at) /* 05C990 8005BD90 460091A1 */ cvt.d.s $f6, $f18 /* 05C994 8005BD94 46283100 */ add.d $f4, $f6, $f8 /* 05C998 8005BD98 2410FFFF */ li $s0, -1 @@ -425,9 +425,9 @@ glabel func_8005B818 /* 05CA14 8005BE14 46044300 */ add.s $f12, $f8, $f4 /* 05CA18 8005BE18 00000000 */ nop /* 05CA1C 8005BE1C 461E0303 */ div.s $f12, $f0, $f30 -/* 05CA20 8005BE20 3C01800E */ lui $at, %hi(D_800E69FC) # $at, 0x800e +/* 05CA20 8005BE20 3C01800E */ lui $at, %hi(D_800E69F8 + 4) # $at, 0x800e /* 05CA24 8005BE24 C43169F8 */ lwc1 $f17, %lo(D_800E69F8)($at) -/* 05CA28 8005BE28 C43069FC */ lwc1 $f16, %lo(D_800E69FC)($at) +/* 05CA28 8005BE28 C43069FC */ lwc1 $f16, %lo(D_800E69F8 + 4)($at) /* 05CA2C 8005BE2C C7A30060 */ lwc1 $f3, 0x60($sp) /* 05CA30 8005BE30 C7A20064 */ lwc1 $f2, 0x64($sp) /* 05CA34 8005BE34 00000000 */ nop diff --git a/asm/non_matchings/unknown_05CEF0/func_8005C364.s b/asm/non_matchings/unknown_05CEF0/func_8005C364.s index 7d3bd883..c05bce2c 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005C364.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005C364.s @@ -136,10 +136,10 @@ glabel func_8005C364 /* 05D140 8005C540 44816000 */ mtc1 $at, $f12 /* 05D144 8005C544 0C01A7CA */ jal func_80069F28 /* 05D148 8005C548 00000000 */ nop -/* 05D14C 8005C54C 3C01800E */ lui $at, %hi(D_800E6A14) # $at, 0x800e +/* 05D14C 8005C54C 3C01800E */ lui $at, %hi(D_800E6A10 + 4) # $at, 0x800e /* 05D150 8005C550 C604002C */ lwc1 $f4, 0x2c($s0) /* 05D154 8005C554 C4296A10 */ lwc1 $f9, %lo(D_800E6A10)($at) -/* 05D158 8005C558 C4286A14 */ lwc1 $f8, %lo(D_800E6A14)($at) +/* 05D158 8005C558 C4286A14 */ lwc1 $f8, %lo(D_800E6A10 + 4)($at) /* 05D15C 8005C55C 460021A1 */ cvt.d.s $f6, $f4 /* 05D160 8005C560 46283282 */ mul.d $f10, $f6, $f8 /* 05D164 8005C564 44808000 */ mtc1 $zero, $f16 @@ -193,7 +193,7 @@ glabel func_8005C364 /* 05D21C 8005C61C 4624003C */ c.lt.d $f0, $f4 /* 05D220 8005C620 240C0001 */ li $t4, 1 /* 05D224 8005C624 45000010 */ bc1f .L8005C668 -/* 05D228 8005C628 3C01800E */ lui $at, %hi(D_800E6A1C) # $at, 0x800e +/* 05D228 8005C628 3C01800E */ lui $at, %hi(D_800E6A18 + 4) # $at, 0x800e /* 05D22C 8005C62C A22C003B */ sb $t4, 0x3b($s1) /* 05D230 8005C630 C7A8005C */ lwc1 $f8, 0x5c($sp) /* 05D234 8005C634 C606002C */ lwc1 $f6, 0x2c($s0) @@ -211,14 +211,14 @@ glabel func_8005C364 /* 05D264 8005C664 E604000C */ swc1 $f4, 0xc($s0) .L8005C668: /* 05D268 8005C668 C4296A18 */ lwc1 $f9, %lo(D_800E6A18)($at) -/* 05D26C 8005C66C C4286A1C */ lwc1 $f8, %lo(D_800E6A1C)($at) -/* 05D270 8005C670 3C01800E */ lui $at, %hi(D_800E6A24) # $at, 0x800e +/* 05D26C 8005C66C C4286A1C */ lwc1 $f8, %lo(D_800E6A18 + 4)($at) +/* 05D270 8005C670 3C01800E */ lui $at, %hi(D_800E6A20 + 4) # $at, 0x800e /* 05D274 8005C674 4628003C */ c.lt.d $f0, $f8 /* 05D278 8005C678 240D0002 */ li $t5, 2 /* 05D27C 8005C67C 45010008 */ bc1t .L8005C6A0 /* 05D280 8005C680 00000000 */ nop /* 05D284 8005C684 C42B6A20 */ lwc1 $f11, %lo(D_800E6A20)($at) -/* 05D288 8005C688 C42A6A24 */ lwc1 $f10, %lo(D_800E6A24)($at) +/* 05D288 8005C688 C42A6A24 */ lwc1 $f10, %lo(D_800E6A20 + 4)($at) /* 05D28C 8005C68C 00000000 */ nop /* 05D290 8005C690 4620503C */ c.lt.d $f10, $f0 /* 05D294 8005C694 00000000 */ nop @@ -362,9 +362,9 @@ glabel func_8005C364 /* 05D48C 8005C88C 460E7102 */ mul.s $f4, $f14, $f14 /* 05D490 8005C890 0C0326B4 */ jal sqrtf /* 05D494 8005C894 46049300 */ add.s $f12, $f18, $f4 -/* 05D498 8005C898 3C01800E */ lui $at, %hi(D_800E6A2C) # $at, 0x800e +/* 05D498 8005C898 3C01800E */ lui $at, %hi(D_800E6A28 + 4) # $at, 0x800e /* 05D49C 8005C89C C4296A28 */ lwc1 $f9, %lo(D_800E6A28)($at) -/* 05D4A0 8005C8A0 C4286A2C */ lwc1 $f8, %lo(D_800E6A2C)($at) +/* 05D4A0 8005C8A0 C4286A2C */ lwc1 $f8, %lo(D_800E6A28 + 4)($at) /* 05D4A4 8005C8A4 460001A1 */ cvt.d.s $f6, $f0 /* 05D4A8 8005C8A8 4628303C */ c.lt.d $f6, $f8 /* 05D4AC 8005C8AC 8FA50038 */ lw $a1, 0x38($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s index e4eaaede..8836a3c2 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D0D0.s @@ -143,10 +143,10 @@ glabel func_8005D0D0 /* 05DEC4 8005D2C4 0C01A7CA */ jal func_80069F28 /* 05DEC8 8005D2C8 00000000 */ nop /* 05DECC 8005D2CC A2000187 */ sb $zero, 0x187($s0) -/* 05DED0 8005D2D0 3C01800E */ lui $at, %hi(D_800E6A34) # $at, 0x800e +/* 05DED0 8005D2D0 3C01800E */ lui $at, %hi(D_800E6A30 + 4) # $at, 0x800e /* 05DED4 8005D2D4 C604002C */ lwc1 $f4, 0x2c($s0) /* 05DED8 8005D2D8 C4296A30 */ lwc1 $f9, %lo(D_800E6A30)($at) -/* 05DEDC 8005D2DC C4286A34 */ lwc1 $f8, %lo(D_800E6A34)($at) +/* 05DEDC 8005D2DC C4286A34 */ lwc1 $f8, %lo(D_800E6A30 + 4)($at) /* 05DEE0 8005D2E0 460021A1 */ cvt.d.s $f6, $f4 /* 05DEE4 8005D2E4 46283282 */ mul.d $f10, $f6, $f8 /* 05DEE8 8005D2E8 3C01401E */ li $at, 0x401E0000 # 2.468750 @@ -203,7 +203,7 @@ glabel func_8005D0D0 /* 05DFA8 8005D3A8 44809000 */ mtc1 $zero, $f18 /* 05DFAC 8005D3AC 46005021 */ cvt.d.s $f0, $f10 /* 05DFB0 8005D3B0 4632003C */ c.lt.d $f0, $f18 -/* 05DFB4 8005D3B4 3C01800E */ lui $at, %hi(D_800E6A3C) # $at, 0x800e +/* 05DFB4 8005D3B4 3C01800E */ lui $at, %hi(D_800E6A38 + 4) # $at, 0x800e /* 05DFB8 8005D3B8 45000036 */ bc1f .L8005D494 /* 05DFBC 8005D3BC 00000000 */ nop /* 05DFC0 8005D3C0 10600024 */ beqz $v1, .L8005D454 @@ -265,14 +265,14 @@ glabel func_8005D0D0 /* 05E090 8005D490 E612000C */ swc1 $f18, 0xc($s0) .L8005D494: /* 05E094 8005D494 C4296A38 */ lwc1 $f9, %lo(D_800E6A38)($at) -/* 05E098 8005D498 C4286A3C */ lwc1 $f8, %lo(D_800E6A3C)($at) -/* 05E09C 8005D49C 3C01800E */ lui $at, %hi(D_800E6A44) # $at, 0x800e +/* 05E098 8005D498 C4286A3C */ lwc1 $f8, %lo(D_800E6A38 + 4)($at) +/* 05E09C 8005D49C 3C01800E */ lui $at, %hi(D_800E6A40 + 4) # $at, 0x800e /* 05E0A0 8005D4A0 4628003C */ c.lt.d $f0, $f8 /* 05E0A4 8005D4A4 240F0001 */ li $t7, 1 /* 05E0A8 8005D4A8 45010008 */ bc1t .L8005D4CC /* 05E0AC 8005D4AC 24180001 */ li $t8, 1 /* 05E0B0 8005D4B0 C4276A40 */ lwc1 $f7, %lo(D_800E6A40)($at) -/* 05E0B4 8005D4B4 C4266A44 */ lwc1 $f6, %lo(D_800E6A44)($at) +/* 05E0B4 8005D4B4 C4266A44 */ lwc1 $f6, %lo(D_800E6A40 + 4)($at) /* 05E0B8 8005D4B8 24190002 */ li $t9, 2 /* 05E0BC 8005D4BC 4620303C */ c.lt.d $f6, $f0 /* 05E0C0 8005D4C0 240A0002 */ li $t2, 2 @@ -411,9 +411,9 @@ glabel func_8005D0D0 /* 05E2AC 8005D6AC 460E7102 */ mul.s $f4, $f14, $f14 /* 05E2B0 8005D6B0 0C0326B4 */ jal sqrtf /* 05E2B4 8005D6B4 46049300 */ add.s $f12, $f18, $f4 -/* 05E2B8 8005D6B8 3C01800E */ lui $at, %hi(D_800E6A4C) # $at, 0x800e +/* 05E2B8 8005D6B8 3C01800E */ lui $at, %hi(D_800E6A48 + 4) # $at, 0x800e /* 05E2BC 8005D6BC C4296A48 */ lwc1 $f9, %lo(D_800E6A48)($at) -/* 05E2C0 8005D6C0 C4286A4C */ lwc1 $f8, %lo(D_800E6A4C)($at) +/* 05E2C0 8005D6C0 C4286A4C */ lwc1 $f8, %lo(D_800E6A48 + 4)($at) /* 05E2C4 8005D6C4 460001A1 */ cvt.d.s $f6, $f0 /* 05E2C8 8005D6C8 4628303C */ c.lt.d $f6, $f8 /* 05E2CC 8005D6CC C7AE0050 */ lwc1 $f14, 0x50($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005D820.s b/asm/non_matchings/unknown_05DCD0/func_8005D820.s index f523bf35..86307223 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005D820.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005D820.s @@ -32,21 +32,21 @@ glabel func_8005D820 /* 05E44C 8005D84C 0C01729E */ jal func_8005CA78 /* 05E450 8005D850 2484CE20 */ addiu $a0, %lo(D_800DCE20) # addiu $a0, $a0, -0x31e0 /* 05E454 8005D854 822E003B */ lb $t6, 0x3b($s1) -/* 05E458 8005D858 3C01800E */ lui $at, %hi(D_800E6A54) # $at, 0x800e +/* 05E458 8005D858 3C01800E */ lui $at, %hi(D_800E6A50 + 4) # $at, 0x800e /* 05E45C 8005D85C A7AE005E */ sh $t6, 0x5e($sp) /* 05E460 8005D860 860F016A */ lh $t7, 0x16a($s0) /* 05E464 8005D864 862A0018 */ lh $t2, 0x18($s1) /* 05E468 8005D868 A7AF005A */ sh $t7, 0x5a($sp) /* 05E46C 8005D86C C604002C */ lwc1 $f4, 0x2c($s0) /* 05E470 8005D870 C4276A50 */ lwc1 $f7, %lo(D_800E6A50)($at) -/* 05E474 8005D874 C4266A54 */ lwc1 $f6, %lo(D_800E6A54)($at) +/* 05E474 8005D874 C4266A54 */ lwc1 $f6, %lo(D_800E6A50 + 4)($at) /* 05E478 8005D878 46002021 */ cvt.d.s $f0, $f4 /* 05E47C 8005D87C 4626003C */ c.lt.d $f0, $f6 /* 05E480 8005D880 00000000 */ nop /* 05E484 8005D884 45000009 */ bc1f .L8005D8AC -/* 05E488 8005D888 3C01800E */ lui $at, %hi(D_800E6A5C) # $at, 0x800e +/* 05E488 8005D888 3C01800E */ lui $at, %hi(D_800E6A58 + 4) # $at, 0x800e /* 05E48C 8005D88C C4296A58 */ lwc1 $f9, %lo(D_800E6A58)($at) -/* 05E490 8005D890 C4286A5C */ lwc1 $f8, %lo(D_800E6A5C)($at) +/* 05E490 8005D890 C4286A5C */ lwc1 $f8, %lo(D_800E6A58 + 4)($at) /* 05E494 8005D894 8FB80074 */ lw $t8, 0x74($sp) /* 05E498 8005D898 4620403C */ c.lt.d $f8, $f0 /* 05E49C 8005D89C 00000000 */ nop @@ -157,10 +157,10 @@ glabel func_8005D820 /* 05E620 8005DA20 44816000 */ mtc1 $at, $f12 /* 05E624 8005DA24 0C01A7CA */ jal func_80069F28 /* 05E628 8005DA28 00000000 */ nop -/* 05E62C 8005DA2C 3C01800E */ lui $at, %hi(D_800E6A64) # $at, 0x800e +/* 05E62C 8005DA2C 3C01800E */ lui $at, %hi(D_800E6A60 + 4) # $at, 0x800e /* 05E630 8005DA30 C62A001C */ lwc1 $f10, 0x1c($s1) /* 05E634 8005DA34 C4216A60 */ lwc1 $f1, %lo(D_800E6A60)($at) -/* 05E638 8005DA38 C4206A64 */ lwc1 $f0, %lo(D_800E6A64)($at) +/* 05E638 8005DA38 C4206A64 */ lwc1 $f0, %lo(D_800E6A60 + 4)($at) /* 05E63C 8005DA3C 460054A1 */ cvt.d.s $f18, $f10 /* 05E640 8005DA40 46209102 */ mul.d $f4, $f18, $f0 /* 05E644 8005DA44 C6280024 */ lwc1 $f8, 0x24($s1) @@ -227,10 +227,10 @@ glabel func_8005D820 /* 05E730 8005DB30 460C3202 */ mul.s $f8, $f6, $f12 /* 05E734 8005DB34 000C6900 */ sll $t5, $t4, 4 /* 05E738 8005DB38 25AEFFEF */ addiu $t6, $t5, -0x11 -/* 05E73C 8005DB3C 3C01800E */ lui $at, %hi(D_800E6A6C) # $at, 0x800e +/* 05E73C 8005DB3C 3C01800E */ lui $at, %hi(D_800E6A68 + 4) # $at, 0x800e /* 05E740 8005DB40 448E2000 */ mtc1 $t6, $f4 /* 05E744 8005DB44 C4336A68 */ lwc1 $f19, %lo(D_800E6A68)($at) -/* 05E748 8005DB48 C4326A6C */ lwc1 $f18, %lo(D_800E6A6C)($at) +/* 05E748 8005DB48 C4326A6C */ lwc1 $f18, %lo(D_800E6A68 + 4)($at) /* 05E74C 8005DB4C 460042A1 */ cvt.d.s $f10, $f8 /* 05E750 8005DB50 46802520 */ cvt.s.w $f20, $f4 /* 05E754 8005DB54 44803000 */ mtc1 $zero, $f6 @@ -444,7 +444,7 @@ glabel L8005DCE8 /* 05EA3C 8005DE3C 4458F800 */ cfc1 $t8, $31 .L8005DE40: /* 05EA40 8005DE40 14C3000B */ bne $a2, $v1, .L8005DE70 -/* 05EA44 8005DE44 3C01800E */ lui $at, %hi(D_800E6A8C) # $at, 0x800e +/* 05EA44 8005DE44 3C01800E */ lui $at, %hi(D_800E6A88 + 4) # $at, 0x800e /* 05EA48 8005DE48 921901CD */ lbu $t9, 0x1cd($s0) /* 05EA4C 8005DE4C 24010004 */ li $at, 4 /* 05EA50 8005DE50 17210003 */ bne $t9, $at, .L8005DE60 @@ -460,14 +460,14 @@ glabel L8005DCE8 .L8005DE70: /* 05EA70 8005DE70 C604002C */ lwc1 $f4, 0x2c($s0) /* 05EA74 8005DE74 C4276A88 */ lwc1 $f7, %lo(D_800E6A88)($at) -/* 05EA78 8005DE78 C4266A8C */ lwc1 $f6, %lo(D_800E6A8C)($at) +/* 05EA78 8005DE78 C4266A8C */ lwc1 $f6, %lo(D_800E6A88 + 4)($at) /* 05EA7C 8005DE7C 46002021 */ cvt.d.s $f0, $f4 /* 05EA80 8005DE80 4620303C */ c.lt.d $f6, $f0 -/* 05EA84 8005DE84 3C01800E */ lui $at, %hi(D_800E6A94) # $at, 0x800e +/* 05EA84 8005DE84 3C01800E */ lui $at, %hi(D_800E6A90 + 4) # $at, 0x800e /* 05EA88 8005DE88 4500001C */ bc1f .L8005DEFC /* 05EA8C 8005DE8C 00000000 */ nop /* 05EA90 8005DE90 C4296A90 */ lwc1 $f9, %lo(D_800E6A90)($at) -/* 05EA94 8005DE94 C4286A94 */ lwc1 $f8, %lo(D_800E6A94)($at) +/* 05EA94 8005DE94 C4286A94 */ lwc1 $f8, %lo(D_800E6A90 + 4)($at) /* 05EA98 8005DE98 00000000 */ nop /* 05EA9C 8005DE9C 4628003C */ c.lt.d $f0, $f8 /* 05EAA0 8005DEA0 00000000 */ nop @@ -613,9 +613,9 @@ glabel L8005DCE8 /* 05ECA8 8005E0A8 460E7202 */ mul.s $f8, $f14, $f14 /* 05ECAC 8005E0AC 0C0326B4 */ jal sqrtf /* 05ECB0 8005E0B0 46082300 */ add.s $f12, $f4, $f8 -/* 05ECB4 8005E0B4 3C01800E */ lui $at, %hi(D_800E6A9C) # $at, 0x800e +/* 05ECB4 8005E0B4 3C01800E */ lui $at, %hi(D_800E6A98 + 4) # $at, 0x800e /* 05ECB8 8005E0B8 C4336A98 */ lwc1 $f19, %lo(D_800E6A98)($at) -/* 05ECBC 8005E0BC C4326A9C */ lwc1 $f18, %lo(D_800E6A9C)($at) +/* 05ECBC 8005E0BC C4326A9C */ lwc1 $f18, %lo(D_800E6A98 + 4)($at) /* 05ECC0 8005E0C0 460002A1 */ cvt.d.s $f10, $f0 /* 05ECC4 8005E0C4 4632503C */ c.lt.d $f10, $f18 /* 05ECC8 8005E0C8 C7AE0050 */ lwc1 $f14, 0x50($sp) diff --git a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s index 19701edb..8ff41016 100644 --- a/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s +++ b/asm/non_matchings/unknown_05F0C0/func_8005E4C0.s @@ -140,10 +140,10 @@ glabel func_8005E4C0 /* 05F2B8 8005E6B8 44816000 */ mtc1 $at, $f12 /* 05F2BC 8005E6BC 0C01A7CA */ jal func_80069F28 /* 05F2C0 8005E6C0 00000000 */ nop -/* 05F2C4 8005E6C4 3C01800E */ lui $at, %hi(D_800E6AA4) # $at, 0x800e +/* 05F2C4 8005E6C4 3C01800E */ lui $at, %hi(D_800E6AA0 + 4) # $at, 0x800e /* 05F2C8 8005E6C8 C604002C */ lwc1 $f4, 0x2c($s0) /* 05F2CC 8005E6CC C4296AA0 */ lwc1 $f9, %lo(D_800E6AA0)($at) -/* 05F2D0 8005E6D0 C4286AA4 */ lwc1 $f8, %lo(D_800E6AA4)($at) +/* 05F2D0 8005E6D0 C4286AA4 */ lwc1 $f8, %lo(D_800E6AA0 + 4)($at) /* 05F2D4 8005E6D4 460021A1 */ cvt.d.s $f6, $f4 /* 05F2D8 8005E6D8 46283282 */ mul.d $f10, $f6, $f8 /* 05F2DC 8005E6DC 44808000 */ mtc1 $zero, $f16 @@ -305,9 +305,9 @@ glabel func_8005E4C0 /* 05F520 8005E920 460E7282 */ mul.s $f10, $f14, $f14 /* 05F524 8005E924 0C0326B4 */ jal sqrtf /* 05F528 8005E928 460A4300 */ add.s $f12, $f8, $f10 -/* 05F52C 8005E92C 3C01800E */ lui $at, %hi(D_800E6AAC) # $at, 0x800e +/* 05F52C 8005E92C 3C01800E */ lui $at, %hi(D_800E6AA8 + 4) # $at, 0x800e /* 05F530 8005E930 C4256AA8 */ lwc1 $f5, %lo(D_800E6AA8)($at) -/* 05F534 8005E934 C4246AAC */ lwc1 $f4, %lo(D_800E6AAC)($at) +/* 05F534 8005E934 C4246AAC */ lwc1 $f4, %lo(D_800E6AA8 + 4)($at) /* 05F538 8005E938 460004A1 */ cvt.d.s $f18, $f0 /* 05F53C 8005E93C 4624903C */ c.lt.d $f18, $f4 /* 05F540 8005E940 8FA50038 */ lw $a1, 0x38($sp) diff --git a/asm/non_matchings/unknown_05F690/func_8005EA90.s b/asm/non_matchings/unknown_05F690/func_8005EA90.s index 11c123e4..1e7f1d55 100644 --- a/asm/non_matchings/unknown_05F690/func_8005EA90.s +++ b/asm/non_matchings/unknown_05F690/func_8005EA90.s @@ -29,13 +29,13 @@ glabel func_8005EA90 /* 05F6B8 8005EAB8 2484CE60 */ addiu $a0, %lo(D_800DCE60) # addiu $a0, $a0, -0x31a0 /* 05F6BC 8005EABC A20001EC */ sb $zero, 0x1ec($s0) /* 05F6C0 8005EAC0 822E003B */ lb $t6, 0x3b($s1) -/* 05F6C4 8005EAC4 3C01800E */ lui $at, %hi(D_800E6AB4) # $at, 0x800e +/* 05F6C4 8005EAC4 3C01800E */ lui $at, %hi(D_800E6AB0 + 4) # $at, 0x800e /* 05F6C8 8005EAC8 A7AE003E */ sh $t6, 0x3e($sp) /* 05F6CC 8005EACC 862F0018 */ lh $t7, 0x18($s1) /* 05F6D0 8005EAD0 C4276AB0 */ lwc1 $f7, %lo(D_800E6AB0)($at) /* 05F6D4 8005EAD4 A7AF003C */ sh $t7, 0x3c($sp) /* 05F6D8 8005EAD8 8618016A */ lh $t8, 0x16a($s0) -/* 05F6DC 8005EADC C4266AB4 */ lwc1 $f6, %lo(D_800E6AB4)($at) +/* 05F6DC 8005EADC C4266AB4 */ lwc1 $f6, %lo(D_800E6AB0 + 4)($at) /* 05F6E0 8005EAE0 A7B8003A */ sh $t8, 0x3a($sp) /* 05F6E4 8005EAE4 C604002C */ lwc1 $f4, 0x2c($s0) /* 05F6E8 8005EAE8 00000000 */ nop @@ -43,9 +43,9 @@ glabel func_8005EA90 /* 05F6F0 8005EAF0 4626003C */ c.lt.d $f0, $f6 /* 05F6F4 8005EAF4 00000000 */ nop /* 05F6F8 8005EAF8 45000009 */ bc1f .L8005EB20 -/* 05F6FC 8005EAFC 3C01800E */ lui $at, %hi(D_800E6ABC) # $at, 0x800e +/* 05F6FC 8005EAFC 3C01800E */ lui $at, %hi(D_800E6AB8 + 4) # $at, 0x800e /* 05F700 8005EB00 C4296AB8 */ lwc1 $f9, %lo(D_800E6AB8)($at) -/* 05F704 8005EB04 C4286ABC */ lwc1 $f8, %lo(D_800E6ABC)($at) +/* 05F704 8005EB04 C4286ABC */ lwc1 $f8, %lo(D_800E6AB8 + 4)($at) /* 05F708 8005EB08 8FB90054 */ lw $t9, 0x54($sp) /* 05F70C 8005EB0C 4620403C */ c.lt.d $f8, $f0 /* 05F710 8005EB10 00000000 */ nop @@ -153,10 +153,10 @@ glabel func_8005EA90 /* 05F890 8005EC90 44816000 */ mtc1 $at, $f12 /* 05F894 8005EC94 0C01A7CA */ jal func_80069F28 /* 05F898 8005EC98 00000000 */ nop -/* 05F89C 8005EC9C 3C01800E */ lui $at, %hi(D_800E6AC4) # $at, 0x800e +/* 05F89C 8005EC9C 3C01800E */ lui $at, %hi(D_800E6AC0 + 4) # $at, 0x800e /* 05F8A0 8005ECA0 C62A001C */ lwc1 $f10, 0x1c($s1) /* 05F8A4 8005ECA4 C4216AC0 */ lwc1 $f1, %lo(D_800E6AC0)($at) -/* 05F8A8 8005ECA8 C4206AC4 */ lwc1 $f0, %lo(D_800E6AC4)($at) +/* 05F8A8 8005ECA8 C4206AC4 */ lwc1 $f0, %lo(D_800E6AC0 + 4)($at) /* 05F8AC 8005ECAC 46005121 */ cvt.d.s $f4, $f10 /* 05F8B0 8005ECB0 46202182 */ mul.d $f6, $f4, $f0 /* 05F8B4 8005ECB4 C62A0024 */ lwc1 $f10, 0x24($s1) @@ -238,13 +238,13 @@ glabel func_8005EA90 /* 05F9D8 8005EDD8 460E3202 */ mul.s $f8, $f6, $f14 /* 05F9DC 8005EDDC 01AE7821 */ addu $t7, $t5, $t6 /* 05F9E0 8005EDE0 8DF80004 */ lw $t8, 4($t7) -/* 05F9E4 8005EDE4 3C01800E */ lui $at, %hi(D_800E6ACC) # $at, 0x800e +/* 05F9E4 8005EDE4 3C01800E */ lui $at, %hi(D_800E6AC8 + 4) # $at, 0x800e /* 05F9E8 8005EDE8 0018C900 */ sll $t9, $t8, 4 /* 05F9EC 8005EDEC 272AFFEF */ addiu $t2, $t9, -0x11 /* 05F9F0 8005EDF0 448A2000 */ mtc1 $t2, $f4 /* 05F9F4 8005EDF4 C4256AC8 */ lwc1 $f5, %lo(D_800E6AC8)($at) /* 05F9F8 8005EDF8 468020A0 */ cvt.s.w $f2, $f4 -/* 05F9FC 8005EDFC C4246ACC */ lwc1 $f4, %lo(D_800E6ACC)($at) +/* 05F9FC 8005EDFC C4246ACC */ lwc1 $f4, %lo(D_800E6AC8 + 4)($at) /* 05FA00 8005EE00 44804800 */ mtc1 $zero, $f9 /* 05FA04 8005EE04 460042A1 */ cvt.d.s $f10, $f8 /* 05FA08 8005EE08 46245182 */ mul.d $f6, $f10, $f4 @@ -446,7 +446,7 @@ glabel L8005EF98 /* 05FCC0 8005F0C0 444EF800 */ cfc1 $t6, $31 .L8005F0C4: /* 05FCC4 8005F0C4 14E3000B */ bne $a3, $v1, .L8005F0F4 -/* 05FCC8 8005F0C8 3C01800E */ lui $at, %hi(D_800E6AEC) # $at, 0x800e +/* 05FCC8 8005F0C8 3C01800E */ lui $at, %hi(D_800E6AE8 + 4) # $at, 0x800e /* 05FCCC 8005F0CC 920B01CD */ lbu $t3, 0x1cd($s0) /* 05FCD0 8005F0D0 24010004 */ li $at, 4 /* 05FCD4 8005F0D4 15610003 */ bne $t3, $at, .L8005F0E4 @@ -462,14 +462,14 @@ glabel L8005EF98 .L8005F0F4: /* 05FCF4 8005F0F4 C608002C */ lwc1 $f8, 0x2c($s0) /* 05FCF8 8005F0F8 C42B6AE8 */ lwc1 $f11, %lo(D_800E6AE8)($at) -/* 05FCFC 8005F0FC C42A6AEC */ lwc1 $f10, %lo(D_800E6AEC)($at) +/* 05FCFC 8005F0FC C42A6AEC */ lwc1 $f10, %lo(D_800E6AE8 + 4)($at) /* 05FD00 8005F100 46004021 */ cvt.d.s $f0, $f8 /* 05FD04 8005F104 4620503C */ c.lt.d $f10, $f0 -/* 05FD08 8005F108 3C01800E */ lui $at, %hi(D_800E6AF4) # $at, 0x800e +/* 05FD08 8005F108 3C01800E */ lui $at, %hi(D_800E6AF0 + 4) # $at, 0x800e /* 05FD0C 8005F10C 4500001C */ bc1f .L8005F180 /* 05FD10 8005F110 00000000 */ nop /* 05FD14 8005F114 C4256AF0 */ lwc1 $f5, %lo(D_800E6AF0)($at) -/* 05FD18 8005F118 C4246AF4 */ lwc1 $f4, %lo(D_800E6AF4)($at) +/* 05FD18 8005F118 C4246AF4 */ lwc1 $f4, %lo(D_800E6AF0 + 4)($at) /* 05FD1C 8005F11C 00000000 */ nop /* 05FD20 8005F120 4624003C */ c.lt.d $f0, $f4 /* 05FD24 8005F124 00000000 */ nop diff --git a/asm/non_matchings/unknown_05F690/func_8005F310.s b/asm/non_matchings/unknown_05F690/func_8005F310.s index 5cf32d49..bc831341 100644 --- a/asm/non_matchings/unknown_05F690/func_8005F310.s +++ b/asm/non_matchings/unknown_05F690/func_8005F310.s @@ -22,7 +22,7 @@ glabel func_8005F310 /* 05FF3C 8005F33C 3C01800E */ lui $at, %hi(D_800E6B00) # $at, 0x800e /* 05FF40 8005F340 A0E001EC */ sb $zero, 0x1ec($a3) /* 05FF44 8005F344 820E003B */ lb $t6, 0x3b($s0) -/* 05FF48 8005F348 C4266B04 */ lwc1 $f6, %lo(D_800E6B04)($at) +/* 05FF48 8005F348 C4266B04 */ lwc1 $f6, %lo(D_800E6B00 + 4)($at) /* 05FF4C 8005F34C A7AE003E */ sh $t6, 0x3e($sp) /* 05FF50 8005F350 860F0018 */ lh $t7, 0x18($s0) /* 05FF54 8005F354 C4276B00 */ lwc1 $f7, %lo(D_800E6B00)($at) @@ -36,9 +36,9 @@ glabel func_8005F310 /* 05FF74 8005F374 4626003C */ c.lt.d $f0, $f6 /* 05FF78 8005F378 00000000 */ nop /* 05FF7C 8005F37C 45000009 */ bc1f .L8005F3A4 -/* 05FF80 8005F380 3C01800E */ lui $at, %hi(D_800E6B0C) # $at, 0x800e +/* 05FF80 8005F380 3C01800E */ lui $at, %hi(D_800E6B08 + 4) # $at, 0x800e /* 05FF84 8005F384 C4296B08 */ lwc1 $f9, %lo(D_800E6B08)($at) -/* 05FF88 8005F388 C4286B0C */ lwc1 $f8, %lo(D_800E6B0C)($at) +/* 05FF88 8005F388 C4286B0C */ lwc1 $f8, %lo(D_800E6B08 + 4)($at) /* 05FF8C 8005F38C 8FB90054 */ lw $t9, 0x54($sp) /* 05FF90 8005F390 4620403C */ c.lt.d $f8, $f0 /* 05FF94 8005F394 00000000 */ nop @@ -153,10 +153,10 @@ glabel func_8005F310 /* 06012C 8005F52C 44816000 */ mtc1 $at, $f12 /* 060130 8005F530 0C01A7CA */ jal func_80069F28 /* 060134 8005F534 00000000 */ nop -/* 060138 8005F538 3C01800E */ lui $at, %hi(D_800E6B14) # $at, 0x800e +/* 060138 8005F538 3C01800E */ lui $at, %hi(D_800E6B10 + 4) # $at, 0x800e /* 06013C 8005F53C C60A001C */ lwc1 $f10, 0x1c($s0) /* 060140 8005F540 C4216B10 */ lwc1 $f1, %lo(D_800E6B10)($at) -/* 060144 8005F544 C4206B14 */ lwc1 $f0, %lo(D_800E6B14)($at) +/* 060144 8005F544 C4206B14 */ lwc1 $f0, %lo(D_800E6B10 + 4)($at) /* 060148 8005F548 46005121 */ cvt.d.s $f4, $f10 /* 06014C 8005F54C 46202182 */ mul.d $f6, $f4, $f0 /* 060150 8005F550 C60A0024 */ lwc1 $f10, 0x24($s0) diff --git a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s index c59c988d..6a10fe67 100644 --- a/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s +++ b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s @@ -8,10 +8,10 @@ glabel __timeToSamplesNoRound /* 066358 80065758 44852000 */ mtc1 $a1, $f4 /* 06635C 8006575C 448E4000 */ mtc1 $t6, $f8 /* 066360 80065760 468021A0 */ cvt.s.w $f6, $f4 -/* 066364 80065764 3C01800E */ lui $at, %hi(D_800E6EC4) # $at, 0x800e +/* 066364 80065764 3C01800E */ lui $at, %hi(D_800E6EC0 + 4) # $at, 0x800e /* 066368 80065768 C4256EC0 */ lwc1 $f5, %lo(D_800E6EC0)($at) /* 06636C 8006576C 468042A0 */ cvt.s.w $f10, $f8 -/* 066370 80065770 C4246EC4 */ lwc1 $f4, %lo(D_800E6EC4)($at) +/* 066370 80065770 C4246EC4 */ lwc1 $f4, %lo(D_800E6EC0 + 4)($at) /* 066374 80065774 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 066378 80065778 460A3402 */ mul.s $f16, $f6, $f10 /* 06637C 8006577C 44803000 */ mtc1 $zero, $f6 diff --git a/asm/non_matchings/unknown_072E50/func_80072578.s b/asm/non_matchings/unknown_072E50/func_80072578.s index 2e2f24f5..00a6d20e 100644 --- a/asm/non_matchings/unknown_072E50/func_80072578.s +++ b/asm/non_matchings/unknown_072E50/func_80072578.s @@ -42,10 +42,10 @@ glabel func_80072578 /* 073204 80072604 01F8C824 */ and $t9, $t7, $t8 /* 073208 80072608 A10E0000 */ sb $t6, ($t0) /* 07320C 8007260C A1390000 */ sb $t9, ($t1) -/* 073210 80072610 3C01800E */ lui $at, %hi(D_800E77E4) # $at, 0x800e +/* 073210 80072610 3C01800E */ lui $at, %hi(D_800E77E0 + 4) # $at, 0x800e /* 073214 80072614 468021A1 */ cvt.d.w $f6, $f4 /* 073218 80072618 C42977E0 */ lwc1 $f9, %lo(D_800E77E0)($at) -/* 07321C 8007261C C42877E4 */ lwc1 $f8, %lo(D_800E77E4)($at) +/* 07321C 8007261C C42877E4 */ lwc1 $f8, %lo(D_800E77E0 + 4)($at) /* 073220 80072620 01402025 */ move $a0, $t2 /* 073224 80072624 46283282 */ mul.d $f10, $f6, $f8 /* 073228 80072628 000A5080 */ sll $t2, $t2, 2 diff --git a/asm/non_matchings/unknown_072E50/func_80072718.s b/asm/non_matchings/unknown_072E50/func_80072718.s index 3a54a123..9c920bc7 100644 --- a/asm/non_matchings/unknown_072E50/func_80072718.s +++ b/asm/non_matchings/unknown_072E50/func_80072718.s @@ -125,13 +125,13 @@ glabel func_80072718 /* 0734D0 800728D0 8C84E48C */ lw $a0, %lo(D_800DE48C)($a0) /* 0734D4 800728D4 00000000 */ nop .L800728D8: -/* 0734D8 800728D8 3C01800E */ lui $at, %hi(D_800E77EC) # $at, 0x800e +/* 0734D8 800728D8 3C01800E */ lui $at, %hi(D_800E77E8 + 4) # $at, 0x800e /* 0734DC 800728DC C43777E8 */ lwc1 $f23, %lo(D_800E77E8)($at) -/* 0734E0 800728E0 C43677EC */ lwc1 $f22, %lo(D_800E77EC)($at) -/* 0734E4 800728E4 3C01800E */ lui $at, %hi(D_800E77F4) # $at, 0x800e +/* 0734E0 800728E0 C43677EC */ lwc1 $f22, %lo(D_800E77E8 + 4)($at) +/* 0734E4 800728E4 3C01800E */ lui $at, %hi(D_800E77F0 + 4) # $at, 0x800e /* 0734E8 800728E8 3C108012 */ lui $s0, %hi(D_801241B8) # $s0, 0x8012 /* 0734EC 800728EC C43577F0 */ lwc1 $f21, %lo(D_800E77F0)($at) -/* 0734F0 800728F0 C43477F4 */ lwc1 $f20, %lo(D_800E77F4)($at) +/* 0734F0 800728F0 C43477F4 */ lwc1 $f20, %lo(D_800E77F0 + 4)($at) /* 0734F4 800728F4 261041B8 */ addiu $s0, %lo(D_801241B8) # addiu $s0, $s0, 0x41b8 /* 0734F8 800728F8 00009825 */ move $s3, $zero /* 0734FC 800728FC 24030001 */ li $v1, 1 diff --git a/asm/non_matchings/unknown_072E50/func_80074EB8.s b/asm/non_matchings/unknown_072E50/func_80074EB8.s index a6e39c7c..642c0b0d 100644 --- a/asm/non_matchings/unknown_072E50/func_80074EB8.s +++ b/asm/non_matchings/unknown_072E50/func_80074EB8.s @@ -1,7 +1,8 @@ .rdata glabel D_800E7768 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E7778 +.word 0 .text glabel func_80074EB8 diff --git a/asm/non_matchings/unknown_072E50/func_80075000.s b/asm/non_matchings/unknown_072E50/func_80075000.s index d1da6c0b..f42f161d 100644 --- a/asm/non_matchings/unknown_072E50/func_80075000.s +++ b/asm/non_matchings/unknown_072E50/func_80075000.s @@ -1,10 +1,12 @@ .rdata glabel D_800E777C -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E778C +.word 0 glabel D_800E7790 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77A0 +.word 0 .text glabel func_80075000 diff --git a/asm/non_matchings/unknown_072E50/func_800753D8.s b/asm/non_matchings/unknown_072E50/func_800753D8.s index d6639ec9..60f637b7 100644 --- a/asm/non_matchings/unknown_072E50/func_800753D8.s +++ b/asm/non_matchings/unknown_072E50/func_800753D8.s @@ -1,10 +1,12 @@ .rdata glabel D_800E77A4 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77B4 +.word 0 glabel D_800E77B8 -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77C8 +.word 0 .text glabel func_800753D8 diff --git a/asm/non_matchings/unknown_072E50/func_800756D4.s b/asm/non_matchings/unknown_072E50/func_800756D4.s index 48ce3b2f..160caded 100644 --- a/asm/non_matchings/unknown_072E50/func_800756D4.s +++ b/asm/non_matchings/unknown_072E50/func_800756D4.s @@ -1,7 +1,8 @@ .rdata glabel D_800E77CC -.asciz "DKRACING-GHOSTS\0" -.ascii "\0\0\0" # padding +.asciz "DKRACING-GHOSTS" +glabel D_800E77DC +.word 0 .text glabel func_800756D4 diff --git a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s index 5ac43352..a8cfffc2 100644 --- a/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s +++ b/asm/non_matchings/unknown_080500/MenuLogoScreenLoop.s @@ -137,14 +137,14 @@ glabel MenuLogoScreenLoop /* 083950 80082D50 240400FF */ li $a0, 255 /* 083954 80082D54 44818800 */ mtc1 $at, $f17 /* 083958 80082D58 44808000 */ mtc1 $zero, $f16 -/* 08395C 80082D5C 3C01800F */ lui $at, %hi(D_800E839C) # $at, 0x800f +/* 08395C 80082D5C 3C01800F */ lui $at, %hi(D_800E8398 + 4) # $at, 0x800f /* 083960 80082D60 4620803E */ c.le.d $f16, $f0 /* 083964 80082D64 00000000 */ nop /* 083968 80082D68 45000011 */ bc1f .L80082DB0 /* 08396C 80082D6C 00000000 */ nop /* 083970 80082D70 46206481 */ sub.d $f18, $f12, $f0 /* 083974 80082D74 C4258398 */ lwc1 $f5, %lo(D_800E8398)($at) -/* 083978 80082D78 C424839C */ lwc1 $f4, %lo(D_800E839C)($at) +/* 083978 80082D78 C424839C */ lwc1 $f4, %lo(D_800E8398 + 4)($at) /* 08397C 80082D7C 00000000 */ nop /* 083980 80082D80 46249182 */ mul.d $f6, $f18, $f4 /* 083984 80082D84 444DF800 */ cfc1 $t5, $31 @@ -169,14 +169,14 @@ glabel MenuLogoScreenLoop /* 0839CC 80082DCC 00000000 */ nop /* 0839D0 80082DD0 44811800 */ mtc1 $at, $f3 /* 0839D4 80082DD4 44801000 */ mtc1 $zero, $f2 -/* 0839D8 80082DD8 3C01800F */ lui $at, %hi(D_800E83A4) # $at, 0x800f +/* 0839D8 80082DD8 3C01800F */ lui $at, %hi(D_800E83A0 + 4) # $at, 0x800f /* 0839DC 80082DDC 4620103E */ c.le.d $f2, $f0 /* 0839E0 80082DE0 00000000 */ nop /* 0839E4 80082DE4 45000011 */ bc1f .L80082E2C /* 0839E8 80082DE8 00000000 */ nop /* 0839EC 80082DEC 46220401 */ sub.d $f16, $f0, $f2 /* 0839F0 80082DF0 C43383A0 */ lwc1 $f19, %lo(D_800E83A0)($at) -/* 0839F4 80082DF4 C43283A4 */ lwc1 $f18, %lo(D_800E83A4)($at) +/* 0839F4 80082DF4 C43283A4 */ lwc1 $f18, %lo(D_800E83A0 + 4)($at) /* 0839F8 80082DF8 00000000 */ nop /* 0839FC 80082DFC 46328102 */ mul.d $f4, $f16, $f18 /* 083A00 80082E00 444EF800 */ cfc1 $t6, $31 @@ -252,9 +252,9 @@ glabel MenuLogoScreenLoop /* 083B10 80082F10 3C014021 */ li $at, 0x40210000 # 2.515625 /* 083B14 80082F14 44815800 */ mtc1 $at, $f11 /* 083B18 80082F18 44805000 */ mtc1 $zero, $f10 -/* 083B1C 80082F1C 3C01800F */ lui $at, %hi(D_800E83AC) # $at, 0x800f +/* 083B1C 80082F1C 3C01800F */ lui $at, %hi(D_800E83A8 + 4) # $at, 0x800f /* 083B20 80082F20 C43383A8 */ lwc1 $f19, %lo(D_800E83A8)($at) -/* 083B24 80082F24 C43283AC */ lwc1 $f18, %lo(D_800E83AC)($at) +/* 083B24 80082F24 C43283AC */ lwc1 $f18, %lo(D_800E83A8 + 4)($at) /* 083B28 80082F28 46205401 */ sub.d $f16, $f10, $f0 /* 083B2C 80082F2C 46328102 */ mul.d $f4, $f16, $f18 /* 083B30 80082F30 444BF800 */ cfc1 $t3, $31 diff --git a/asm/non_matchings/unknown_080500/func_8008FA54.s b/asm/non_matchings/unknown_080500/func_8008FA54.s index 4420b1d1..17603d31 100644 --- a/asm/non_matchings/unknown_080500/func_8008FA54.s +++ b/asm/non_matchings/unknown_080500/func_8008FA54.s @@ -138,9 +138,9 @@ glabel func_8008FA54 /* 090844 8008FC44 46006086 */ mov.s $f2, $f12 /* 090848 8008FC48 17200007 */ bnez $t9, .L8008FC68 /* 09084C 8008FC4C 46006006 */ mov.s $f0, $f12 -/* 090850 8008FC50 3C01800F */ lui $at, %hi(D_800E84D4) # $at, 0x800f +/* 090850 8008FC50 3C01800F */ lui $at, %hi(D_800E84D0 + 4) # $at, 0x800f /* 090854 8008FC54 C42784D0 */ lwc1 $f7, %lo(D_800E84D0)($at) -/* 090858 8008FC58 C42684D4 */ lwc1 $f6, %lo(D_800E84D4)($at) +/* 090858 8008FC58 C42684D4 */ lwc1 $f6, %lo(D_800E84D0 + 4)($at) /* 09085C 8008FC5C 46006121 */ cvt.d.s $f4, $f12 /* 090860 8008FC60 46262202 */ mul.d $f8, $f4, $f6 /* 090864 8008FC64 46204020 */ cvt.s.d $f0, $f8 diff --git a/asm/non_matchings/unknown_080500/func_800904E8.s b/asm/non_matchings/unknown_080500/func_800904E8.s index ebe5599c..276faded 100644 --- a/asm/non_matchings/unknown_080500/func_800904E8.s +++ b/asm/non_matchings/unknown_080500/func_800904E8.s @@ -20,11 +20,11 @@ glabel func_800904E8 /* 091114 80090514 C42E69E8 */ lwc1 $f14, %lo(D_801269E8)($at) /* 091118 80090518 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012 /* 09111C 8009051C C43069EC */ lwc1 $f16, %lo(D_801269EC)($at) -/* 091120 80090520 3C01800F */ lui $at, %hi(D_800E84E4) # $at, 0x800f +/* 091120 80090520 3C01800F */ lui $at, %hi(D_800E84E0 + 4) # $at, 0x800f /* 091124 80090524 3C088012 */ lui $t0, %hi(D_801269E4) # $t0, 0x8012 /* 091128 80090528 3C038012 */ lui $v1, %hi(D_801269DC) # $v1, 0x8012 /* 09112C 8009052C C42184E0 */ lwc1 $f1, %lo(D_800E84E0)($at) -/* 091130 80090530 C42084E4 */ lwc1 $f0, %lo(D_800E84E4)($at) +/* 091130 80090530 C42084E4 */ lwc1 $f0, %lo(D_800E84E0 + 4)($at) /* 091134 80090534 246369DC */ addiu $v1, %lo(D_801269DC) # addiu $v1, $v1, 0x69dc /* 091138 80090538 250869E4 */ addiu $t0, %lo(D_801269E4) # addiu $t0, $t0, 0x69e4 /* 09113C 8009053C C4660000 */ lwc1 $f6, ($v1) @@ -67,9 +67,9 @@ glabel func_800904E8 /* 0911C8 800905C8 E5080000 */ swc1 $f8, ($t0) /* 0911CC 800905CC 1045004D */ beq $v0, $a1, .L80090704 .L800905D0: -/* 0911D0 800905D0 3C01800F */ lui $at, %hi(D_800E84EC) # $at, 0x800f +/* 0911D0 800905D0 3C01800F */ lui $at, %hi(D_800E84E8 + 4) # $at, 0x800f /* 0911D4 800905D4 C42184E8 */ lwc1 $f1, %lo(D_800E84E8)($at) -/* 0911D8 800905D8 C42084EC */ lwc1 $f0, %lo(D_800E84EC)($at) +/* 0911D8 800905D8 C42084EC */ lwc1 $f0, %lo(D_800E84E8 + 4)($at) /* 0911DC 800905DC 3C018012 */ lui $at, %hi(D_801269E8) # $at, 0x8012 /* 0911E0 800905E0 C42E69E8 */ lwc1 $f14, %lo(D_801269E8)($at) /* 0911E4 800905E4 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index 81f7bf5f..7a0cb2dd 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -181,13 +181,13 @@ glabel func_8009F034 /* 09FE68 8009F268 4481A000 */ mtc1 $at, $f20 /* 09FE6C 8009F26C 3C013FE8 */ li $at, 0x3FE80000 # 1.812500 /* 09FE70 8009F270 44818800 */ mtc1 $at, $f17 -/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86AC) # $at, 0x800f +/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86A8 + 4) # $at, 0x800f /* 09FE78 8009F278 27186CE0 */ addiu $t8, %lo(D_80126CE0) # addiu $t8, $t8, 0x6ce0 /* 09FE7C 8009F27C 3C10800E */ lui $s0, %hi(D_800E25C4) # $s0, 0x800e /* 09FE80 8009F280 3C098012 */ lui $t1, %hi(D_80126CF0) # $t1, 0x8012 /* 09FE84 8009F284 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012 /* 09FE88 8009F288 C42F86A8 */ lwc1 $f15, %lo(D_800E86A8)($at) -/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86AC)($at) +/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86A8 + 4)($at) /* 09FE90 8009F290 44808000 */ mtc1 $zero, $f16 /* 09FE94 8009F294 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc /* 09FE98 8009F298 25296CF0 */ addiu $t1, %lo(D_80126CF0) # addiu $t1, $t1, 0x6cf0 @@ -912,12 +912,12 @@ glabel func_8009F034 /* 0A0924 8009FD24 AFA70090 */ sw $a3, 0x90($sp) /* 0A0928 8009FD28 3C014120 */ li $at, 0x41200000 # 10.000000 /* 0A092C 8009FD2C 44811000 */ mtc1 $at, $f2 -/* 0A0930 8009FD30 3C01800F */ lui $at, %hi(D_800E86EC) # $at, 0x800f +/* 0A0930 8009FD30 3C01800F */ lui $at, %hi(D_800E86E8 + 4) # $at, 0x800f /* 0A0934 8009FD34 C42D86E8 */ lwc1 $f13, %lo(D_800E86E8)($at) -/* 0A0938 8009FD38 C42C86EC */ lwc1 $f12, %lo(D_800E86EC)($at) -/* 0A093C 8009FD3C 3C01800F */ lui $at, %hi(D_800E86F4) # $at, 0x800f +/* 0A0938 8009FD38 C42C86EC */ lwc1 $f12, %lo(D_800E86E8 + 4)($at) +/* 0A093C 8009FD3C 3C01800F */ lui $at, %hi(D_800E86F0 + 4) # $at, 0x800f /* 0A0940 8009FD40 C42F86F0 */ lwc1 $f15, %lo(D_800E86F0)($at) -/* 0A0944 8009FD44 C42E86F4 */ lwc1 $f14, %lo(D_800E86F4)($at) +/* 0A0944 8009FD44 C42E86F4 */ lwc1 $f14, %lo(D_800E86F0 + 4)($at) /* 0A0948 8009FD48 3C013FE8 */ li $at, 0x3FE80000 # 1.812500 /* 0A094C 8009FD4C 44818800 */ mtc1 $at, $f17 /* 0A0950 8009FD50 3C014080 */ li $at, 0x40800000 # 4.000000 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s index 76e44600..3ab4de32 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A14F0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A14F0.s @@ -188,11 +188,11 @@ glabel func_800A14F0 /* 0A238C 800A178C 3C01425C */ li $at, 0x425C0000 # 55.000000 /* 0A2390 800A1790 46009124 */ cvt.w.s $f4, $f18 /* 0A2394 800A1794 44811000 */ mtc1 $at, $f2 -/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8724) # $at, 0x800f +/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8720 + 4) # $at, 0x800f /* 0A239C 800A179C 44192000 */ mfc1 $t9, $f4 /* 0A23A0 800A17A0 44D8F800 */ ctc1 $t8, $31 /* 0A23A4 800A17A4 C4218720 */ lwc1 $f1, %lo(D_800E8720)($at) -/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8724)($at) +/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8720 + 4)($at) /* 0A23AC 800A17AC AFB90038 */ sw $t9, 0x38($sp) /* 0A23B0 800A17B0 46803320 */ cvt.s.w $f12, $f6 .L800A17B4: @@ -216,9 +216,9 @@ glabel func_800A14F0 /* 0A23F4 800A17F4 E7AC0018 */ swc1 $f12, 0x18($sp) /* 0A23F8 800A17F8 0C028669 */ jal func_800A19A4 /* 0A23FC 800A17FC E7AE0020 */ swc1 $f14, 0x20($sp) -/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E872C) # $at, 0x800f +/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E8728 + 4) # $at, 0x800f /* 0A2404 800A1804 C4218728 */ lwc1 $f1, %lo(D_800E8728)($at) -/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E872C)($at) +/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E8728 + 4)($at) /* 0A240C 800A180C 3C01425C */ li $at, 0x425C0000 # 55.000000 /* 0A2410 800A1810 3C038012 */ lui $v1, %hi(D_80126D37) # $v1, 0x8012 /* 0A2414 800A1814 3C068012 */ lui $a2, %hi(D_80126CDC) # $a2, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s index 3d690a9b..25869f4a 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A1E48.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A1E48.s @@ -58,12 +58,12 @@ glabel func_800A1E48 /* 0A2B0C 800A1F0C 37210003 */ ori $at, $t9, 3 /* 0A2B10 800A1F10 38210002 */ xori $at, $at, 2 /* 0A2B14 800A1F14 44C1F800 */ ctc1 $at, $31 -/* 0A2B18 800A1F18 3C01800F */ lui $at, %hi(D_800E8734) # $at, 0x800f +/* 0A2B18 800A1F18 3C01800F */ lui $at, %hi(D_800E8730 + 4) # $at, 0x800f /* 0A2B1C 800A1F1C 460042A4 */ cvt.w.s $f10, $f8 /* 0A2B20 800A1F20 C4358730 */ lwc1 $f21, %lo(D_800E8730)($at) /* 0A2B24 800A1F24 44D9F800 */ ctc1 $t9, $31 /* 0A2B28 800A1F28 44085000 */ mfc1 $t0, $f10 -/* 0A2B2C 800A1F2C C4348734 */ lwc1 $f20, %lo(D_800E8734)($at) +/* 0A2B2C 800A1F2C C4348734 */ lwc1 $f20, %lo(D_800E8730 + 4)($at) /* 0A2B30 800A1F30 26B56D37 */ addiu $s5, %lo(D_80126D37) # addiu $s5, $s5, 0x6d37 /* 0A2B34 800A1F34 00009025 */ move $s2, $zero /* 0A2B38 800A1F38 241E0002 */ li $fp, 2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index b0a9a997..f59a9926 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -327,10 +327,10 @@ glabel func_800A277C /* 0A37E0 800A2BE0 17000012 */ bnez $t8, .L800A2C2C /* 0A37E4 800A2BE4 00000000 */ nop /* 0A37E8 800A2BE8 44892000 */ mtc1 $t1, $f4 -/* 0A37EC 800A2BEC 3C01800F */ lui $at, %hi(D_800E873C) # $at, 0x800f +/* 0A37EC 800A2BEC 3C01800F */ lui $at, %hi(D_800E8738 + 4) # $at, 0x800f /* 0A37F0 800A2BF0 468021A0 */ cvt.s.w $f6, $f4 /* 0A37F4 800A2BF4 C42B8738 */ lwc1 $f11, %lo(D_800E8738)($at) -/* 0A37F8 800A2BF8 C42A873C */ lwc1 $f10, %lo(D_800E873C)($at) +/* 0A37F8 800A2BF8 C42A873C */ lwc1 $f10, %lo(D_800E8738 + 4)($at) /* 0A37FC 800A2BFC 46003221 */ cvt.d.s $f8, $f6 /* 0A3800 800A2C00 462A4102 */ mul.d $f4, $f8, $f10 /* 0A3804 800A2C04 444FF800 */ cfc1 $t7, $31 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A6254.s b/asm/non_matchings/unknown_09F8F0/func_800A6254.s index 7541e545..536068ce 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A6254.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A6254.s @@ -247,11 +247,11 @@ glabel L800A63D8 /* 0A71C8 800A65C8 00000000 */ nop /* 0A71CC 800A65CC 8C8E0000 */ lw $t6, ($a0) .L800A65D0: -/* 0A71D0 800A65D0 3C01800F */ lui $at, %hi(D_800E875C) # $at, 0x800f +/* 0A71D0 800A65D0 3C01800F */ lui $at, %hi(D_800E8758 + 4) # $at, 0x800f /* 0A71D4 800A65D4 15C0002D */ bnez $t6, .L800A668C /* 0A71D8 800A65D8 00000000 */ nop /* 0A71DC 800A65DC C4318758 */ lwc1 $f17, %lo(D_800E8758)($at) -/* 0A71E0 800A65E0 C430875C */ lwc1 $f16, %lo(D_800E875C)($at) +/* 0A71E0 800A65E0 C430875C */ lwc1 $f16, %lo(D_800E8758 + 4)($at) /* 0A71E4 800A65E4 46000121 */ cvt.d.s $f4, $f0 /* 0A71E8 800A65E8 46302182 */ mul.d $f6, $f4, $f16 /* 0A71EC 800A65EC 3C014080 */ li $at, 0x40800000 # 4.000000 @@ -346,11 +346,11 @@ glabel L800A63D8 /* 0A7338 800A6738 00000000 */ nop /* 0A733C 800A673C 8C8F0000 */ lw $t7, ($a0) .L800A6740: -/* 0A7340 800A6740 3C01800F */ lui $at, %hi(D_800E8764) # $at, 0x800f +/* 0A7340 800A6740 3C01800F */ lui $at, %hi(D_800E8760 + 4) # $at, 0x800f /* 0A7344 800A6744 15E0002A */ bnez $t7, .L800A67F0 /* 0A7348 800A6748 00000000 */ nop /* 0A734C 800A674C C4318760 */ lwc1 $f17, %lo(D_800E8760)($at) -/* 0A7350 800A6750 C4308764 */ lwc1 $f16, %lo(D_800E8764)($at) +/* 0A7350 800A6750 C4308764 */ lwc1 $f16, %lo(D_800E8760 + 4)($at) /* 0A7354 800A6754 46000221 */ cvt.d.s $f8, $f0 /* 0A7358 800A6758 46304282 */ mul.d $f10, $f8, $f16 /* 0A735C 800A675C 46001121 */ cvt.d.s $f4, $f2 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A7520.s b/asm/non_matchings/unknown_09F8F0/func_800A7520.s index cf4681b5..5383658e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A7520.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A7520.s @@ -69,11 +69,11 @@ glabel func_800A7520 /* 0A81F0 800A75F0 00000000 */ nop /* 0A81F4 800A75F4 A4590044 */ sh $t9, 0x44($v0) /* 0A81F8 800A75F8 8D020000 */ lw $v0, ($t0) -/* 0A81FC 800A75FC 3C01800F */ lui $at, %hi(D_800E8784) # $at, 0x800f +/* 0A81FC 800A75FC 3C01800F */ lui $at, %hi(D_800E8780 + 4) # $at, 0x800f /* 0A8200 800A7600 804A005B */ lb $t2, 0x5b($v0) /* 0A8204 800A7604 C4298780 */ lwc1 $f9, %lo(D_800E8780)($at) /* 0A8208 800A7608 448A2000 */ mtc1 $t2, $f4 -/* 0A820C 800A760C C4288784 */ lwc1 $f8, %lo(D_800E8784)($at) +/* 0A820C 800A760C C4288784 */ lwc1 $f8, %lo(D_800E8780 + 4)($at) /* 0A8210 800A7610 468021A1 */ cvt.d.w $f6, $f4 /* 0A8214 800A7614 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 /* 0A8218 800A7618 44818800 */ mtc1 $at, $f17 @@ -132,10 +132,10 @@ glabel func_800A7520 /* 0A82E0 800A76E0 15C0002A */ bnez $t6, .L800A778C /* 0A82E4 800A76E4 00000000 */ nop /* 0A82E8 800A76E8 44834000 */ mtc1 $v1, $f8 -/* 0A82EC 800A76EC 3C01800F */ lui $at, %hi(D_800E878C) # $at, 0x800f +/* 0A82EC 800A76EC 3C01800F */ lui $at, %hi(D_800E8788 + 4) # $at, 0x800f /* 0A82F0 800A76F0 468042A0 */ cvt.s.w $f10, $f8 /* 0A82F4 800A76F4 C4338788 */ lwc1 $f19, %lo(D_800E8788)($at) -/* 0A82F8 800A76F8 C432878C */ lwc1 $f18, %lo(D_800E878C)($at) +/* 0A82F8 800A76F8 C432878C */ lwc1 $f18, %lo(D_800E8788 + 4)($at) /* 0A82FC 800A76FC 46005421 */ cvt.d.s $f16, $f10 /* 0A8300 800A7700 46328102 */ mul.d $f4, $f16, $f18 /* 0A8304 800A7704 3C014010 */ li $at, 0x40100000 # 2.250000 @@ -155,9 +155,9 @@ glabel func_800A7520 /* 0A833C 800A773C 0004C400 */ sll $t8, $a0, 0x10 /* 0A8340 800A7740 0C01C1F1 */ jal func_800707C4 /* 0A8344 800A7744 00182403 */ sra $a0, $t8, 0x10 -/* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8794) # $at, 0x800f +/* 0A8348 800A7748 3C01800F */ lui $at, %hi(D_800E8790 + 4) # $at, 0x800f /* 0A834C 800A774C C4318790 */ lwc1 $f17, %lo(D_800E8790)($at) -/* 0A8350 800A7750 C4308794 */ lwc1 $f16, %lo(D_800E8794)($at) +/* 0A8350 800A7750 C4308794 */ lwc1 $f16, %lo(D_800E8790 + 4)($at) /* 0A8354 800A7754 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012 /* 0A8358 800A7758 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc /* 0A835C 800A775C 460004A1 */ cvt.d.s $f18, $f0 @@ -296,11 +296,11 @@ glabel func_800A7520 /* 0A854C 800A794C 00036B00 */ sll $t5, $v1, 0xc /* 0A8550 800A7950 A44D0044 */ sh $t5, 0x44($v0) /* 0A8554 800A7954 8D020000 */ lw $v0, ($t0) -/* 0A8558 800A7958 3C01800F */ lui $at, %hi(D_800E879C) # $at, 0x800f +/* 0A8558 800A7958 3C01800F */ lui $at, %hi(D_800E8798 + 4) # $at, 0x800f /* 0A855C 800A795C 804E005B */ lb $t6, 0x5b($v0) /* 0A8560 800A7960 C42B8798 */ lwc1 $f11, %lo(D_800E8798)($at) /* 0A8564 800A7964 448E4000 */ mtc1 $t6, $f8 -/* 0A8568 800A7968 C42A879C */ lwc1 $f10, %lo(D_800E879C)($at) +/* 0A8568 800A7968 C42A879C */ lwc1 $f10, %lo(D_800E8798 + 4)($at) /* 0A856C 800A796C 46804121 */ cvt.d.w $f4, $f8 /* 0A8570 800A7970 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 /* 0A8574 800A7974 44818800 */ mtc1 $at, $f17 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index 4917c93b..c9775500 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -369,10 +369,10 @@ glabel func_800A8474 /* 0A958C 800A898C 44074000 */ mfc1 $a3, $f8 /* 0A9590 800A8990 44D8F800 */ ctc1 $t8, $31 /* 0A9594 800A8994 15800020 */ bnez $t4, .L800A8A18 -# Used to access D_800E87A0 and D_800E87A4. +# Used to access D_800E87A0 and D_800E87A0 + 4. /* 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) +/* 0A95A0 800A89A0 C42087A4 */ lwc1 $f0, %lo(D_800E87A0 + 4)($at) /* 0A95A4 800A89A4 8E420000 */ lw $v0, ($s2) /* 0A95A8 800A89A8 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0A95AC 800A89AC 44814000 */ mtc1 $at, $f8 @@ -956,12 +956,12 @@ glabel func_800A8474 /* 0A9E54 800A9254 AFA60054 */ sw $a2, 0x54($sp) /* 0A9E58 800A9258 0C02917C */ jal func_800A45F0 /* 0A9E5C 800A925C AFA300D0 */ sw $v1, 0xd0($sp) -# Used to access D_800E87B8 and D_800E87BC. +# Used to access D_800E87B8 and D_800E87B8 + 4. /* 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) -/* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87BC)($at) +/* 0A9E70 800A9270 C42087BC */ lwc1 $f0, %lo(D_800E87B8 + 4)($at) /* 0A9E74 800A9274 8FA300D0 */ lw $v1, 0xd0($sp) /* 0A9E78 800A9278 8FA60054 */ lw $a2, 0x54($sp) /* 0A9E7C 800A927C 15C00012 */ bnez $t6, .L800A92C8 @@ -1165,10 +1165,10 @@ glabel func_800A8474 /* 0AA160 800A9560 44053000 */ mfc1 $a1, $f6 /* 0AA164 800A9564 44D8F800 */ ctc1 $t8, $31 /* 0AA168 800A9568 1580003C */ bnez $t4, .L800A965C -# Used to access D_800E87C0 and D_800E87C4. +# Used to access D_800E87C0 and D_800E87C0 + 4. /* 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) +/* 0AA174 800A9574 C42087C4 */ lwc1 $f0, %lo(D_800E87C0 + 4)($at) /* 0AA178 800A9578 8E420000 */ lw $v0, ($s2) /* 0AA17C 800A957C 3C014080 */ li $at, 0x40800000 # 4.000000 /* 0AA180 800A9580 44813000 */ mtc1 $at, $f6 @@ -1570,11 +1570,11 @@ glabel func_800A8474 /* 0AA744 800A9B44 15C00013 */ bnez $t6, .L800A9B94 /* 0AA748 800A9B48 00000000 */ nop /* 0AA74C 800A9B4C 8E180000 */ lw $t8, ($s0) -/* 0AA750 800A9B50 3C01800F */ lui $at, %hi(D_800E87CC) # $at, 0x800f +/* 0AA750 800A9B50 3C01800F */ lui $at, %hi(D_800E87C8 + 4) # $at, 0x800f /* 0AA754 800A9B54 44982000 */ mtc1 $t8, $f4 /* 0AA758 800A9B58 C42B87C8 */ lwc1 $f11, %lo(D_800E87C8)($at) /* 0AA75C 800A9B5C 468021A1 */ cvt.d.w $f6, $f4 -/* 0AA760 800A9B60 C42A87CC */ lwc1 $f10, %lo(D_800E87CC)($at) +/* 0AA760 800A9B60 C42A87CC */ lwc1 $f10, %lo(D_800E87C8 + 4)($at) /* 0AA764 800A9B64 00000000 */ nop /* 0AA768 800A9B68 462A3482 */ mul.d $f18, $f6, $f10 /* 0AA76C 800A9B6C 4459F800 */ cfc1 $t9, $31 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA600.s b/asm/non_matchings/unknown_09F8F0/func_800AA600.s index 48d40b05..21a51605 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA600.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA600.s @@ -365,10 +365,10 @@ glabel func_800AA600 /* 0AB73C 800AAB3C 01CF0019 */ multu $t6, $t7 /* 0AB740 800AAB40 A7A00076 */ sh $zero, 0x76($sp) /* 0AB744 800AAB44 AFA00078 */ sw $zero, 0x78($sp) -# Used to access D_800E87E0 and D_800E87E4. +# Used to access D_800E87E0 and D_800E87E0 + 4. /* 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) +/* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E0 + 4)($at) /* 0AB754 800AAB54 3C18800E */ lui $t8, %hi(D_800E2834) # $t8, 0x800e /* 0AB758 800AAB58 8F182834 */ lw $t8, %lo(D_800E2834)($t8) /* 0AB75C 800AAB5C 240B0001 */ li $t3, 1 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B0010.s b/asm/non_matchings/unknown_0AEE70/func_800B0010.s index ba972710..d4eb9ed1 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B0010.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B0010.s @@ -51,10 +51,10 @@ glabel func_800B0010 /* 0B0CA0 800B00A0 0C01BE53 */ jal func_8006F94C /* 0B0CA4 800B00A4 00052023 */ negu $a0, $a1 /* 0B0CA8 800B00A8 44822000 */ mtc1 $v0, $f4 -/* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B9C) # $at, 0x800f +/* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B98 + 4) # $at, 0x800f /* 0B0CB0 800B00B0 468021A0 */ cvt.s.w $f6, $f4 /* 0B0CB4 800B00B4 C42B8B98 */ lwc1 $f11, %lo(D_800E8B98)($at) -/* 0B0CB8 800B00B8 C42A8B9C */ lwc1 $f10, %lo(D_800E8B9C)($at) +/* 0B0CB8 800B00B8 C42A8B9C */ lwc1 $f10, %lo(D_800E8B98 + 4)($at) /* 0B0CBC 800B00BC 46003221 */ cvt.d.s $f8, $f6 /* 0B0CC0 800B00C0 462A4402 */ mul.d $f16, $f8, $f10 /* 0B0CC4 800B00C4 C612001C */ lwc1 $f18, 0x1c($s0) @@ -72,10 +72,10 @@ glabel func_800B0010 /* 0B0CF0 800B00F0 0C01BE53 */ jal func_8006F94C /* 0B0CF4 800B00F4 00052023 */ negu $a0, $a1 /* 0B0CF8 800B00F8 44825000 */ mtc1 $v0, $f10 -/* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA4) # $at, 0x800f +/* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA0 + 4) # $at, 0x800f /* 0B0D00 800B0100 468054A0 */ cvt.s.w $f18, $f10 /* 0B0D04 800B0104 C4318BA0 */ lwc1 $f17, %lo(D_800E8BA0)($at) -/* 0B0D08 800B0108 C4308BA4 */ lwc1 $f16, %lo(D_800E8BA4)($at) +/* 0B0D08 800B0108 C4308BA4 */ lwc1 $f16, %lo(D_800E8BA0 + 4)($at) /* 0B0D0C 800B010C 46009121 */ cvt.d.s $f4, $f18 /* 0B0D10 800B0110 46302182 */ mul.d $f6, $f4, $f16 /* 0B0D14 800B0114 C6080020 */ lwc1 $f8, 0x20($s0) @@ -92,10 +92,10 @@ glabel func_800B0010 /* 0B0D3C 800B013C 0C01BE53 */ jal func_8006F94C /* 0B0D40 800B0140 00052023 */ negu $a0, $a1 /* 0B0D44 800B0144 44828000 */ mtc1 $v0, $f16 -/* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BAC) # $at, 0x800f +/* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BA8 + 4) # $at, 0x800f /* 0B0D4C 800B014C 46808220 */ cvt.s.w $f8, $f16 /* 0B0D50 800B0150 C4278BA8 */ lwc1 $f7, %lo(D_800E8BA8)($at) -/* 0B0D54 800B0154 C4268BAC */ lwc1 $f6, %lo(D_800E8BAC)($at) +/* 0B0D54 800B0154 C4268BAC */ lwc1 $f6, %lo(D_800E8BA8 + 4)($at) /* 0B0D58 800B0158 460042A1 */ cvt.d.s $f10, $f8 /* 0B0D5C 800B015C 46265482 */ mul.d $f18, $f10, $f6 /* 0B0D60 800B0160 C6040024 */ lwc1 $f4, 0x24($s0) @@ -181,10 +181,10 @@ glabel func_800B0010 /* 0B0E90 800B0290 0C01BE53 */ jal func_8006F94C /* 0B0E94 800B0294 00052023 */ negu $a0, $a1 /* 0B0E98 800B0298 44828000 */ mtc1 $v0, $f16 -/* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB4) # $at, 0x800f +/* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB0 + 4) # $at, 0x800f /* 0B0EA0 800B02A0 468084A0 */ cvt.s.w $f18, $f16 /* 0B0EA4 800B02A4 C42B8BB0 */ lwc1 $f11, %lo(D_800E8BB0)($at) -/* 0B0EA8 800B02A8 C42A8BB4 */ lwc1 $f10, %lo(D_800E8BB4)($at) +/* 0B0EA8 800B02A8 C42A8BB4 */ lwc1 $f10, %lo(D_800E8BB0 + 4)($at) /* 0B0EAC 800B02AC 46009221 */ cvt.d.s $f8, $f18 /* 0B0EB0 800B02B0 462A4182 */ mul.d $f6, $f8, $f10 /* 0B0EB4 800B02B4 C7A40038 */ lwc1 $f4, 0x38($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s index 60a68c6a..28eda078 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s @@ -42,10 +42,10 @@ glabel func_800B03C0 /* 0B1044 800B0444 0C01BE53 */ jal func_8006F94C /* 0B1048 800B0448 00052023 */ negu $a0, $a1 /* 0B104C 800B044C 44823000 */ mtc1 $v0, $f6 -/* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BBC) # $at, 0x800f +/* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BB8 + 4) # $at, 0x800f /* 0B1054 800B0454 46803220 */ cvt.s.w $f8, $f6 /* 0B1058 800B0458 C4318BB8 */ lwc1 $f17, %lo(D_800E8BB8)($at) -/* 0B105C 800B045C C4308BBC */ lwc1 $f16, %lo(D_800E8BBC)($at) +/* 0B105C 800B045C C4308BBC */ lwc1 $f16, %lo(D_800E8BB8 + 4)($at) /* 0B1060 800B0460 460042A1 */ cvt.d.s $f10, $f8 /* 0B1064 800B0464 46305482 */ mul.d $f18, $f10, $f16 /* 0B1068 800B0468 C6040058 */ lwc1 $f4, 0x58($s0) @@ -81,10 +81,10 @@ glabel func_800B03C0 /* 0B10DC 800B04DC 0C01BE53 */ jal func_8006F94C /* 0B10E0 800B04E0 00052023 */ negu $a0, $a1 /* 0B10E4 800B04E4 44823000 */ mtc1 $v0, $f6 -/* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC4) # $at, 0x800f +/* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC0 + 4) # $at, 0x800f /* 0B10EC 800B04EC 468034A0 */ cvt.s.w $f18, $f6 /* 0B10F0 800B04F0 C42B8BC0 */ lwc1 $f11, %lo(D_800E8BC0)($at) -/* 0B10F4 800B04F4 C42A8BC4 */ lwc1 $f10, %lo(D_800E8BC4)($at) +/* 0B10F4 800B04F4 C42A8BC4 */ lwc1 $f10, %lo(D_800E8BC0 + 4)($at) /* 0B10F8 800B04F8 46009221 */ cvt.d.s $f8, $f18 /* 0B10FC 800B04FC 462A4402 */ mul.d $f16, $f8, $f10 /* 0B1100 800B0500 C7A40038 */ lwc1 $f4, 0x38($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1130.s b/asm/non_matchings/unknown_0AEE70/func_800B1130.s index 59eb5756..8ec0b69c 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1130.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1130.s @@ -91,10 +91,10 @@ glabel func_800B1130 /* 0B1E5C 800B125C 0C01BE53 */ jal func_8006F94C /* 0B1E60 800B1260 00052023 */ negu $a0, $a1 /* 0B1E64 800B1264 44829000 */ mtc1 $v0, $f18 -/* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BCC) # $at, 0x800f +/* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BC8 + 4) # $at, 0x800f /* 0B1E6C 800B126C 46809120 */ cvt.s.w $f4, $f18 /* 0B1E70 800B1270 C4298BC8 */ lwc1 $f9, %lo(D_800E8BC8)($at) -/* 0B1E74 800B1274 C4288BCC */ lwc1 $f8, %lo(D_800E8BCC)($at) +/* 0B1E74 800B1274 C4288BCC */ lwc1 $f8, %lo(D_800E8BC8 + 4)($at) /* 0B1E78 800B1278 460021A1 */ cvt.d.s $f6, $f4 /* 0B1E7C 800B127C 46283282 */ mul.d $f10, $f6, $f8 /* 0B1E80 800B1280 C7B00024 */ lwc1 $f16, 0x24($sp) @@ -121,10 +121,10 @@ glabel func_800B1130 /* 0B1ED0 800B12D0 0C01BE53 */ jal func_8006F94C /* 0B1ED4 800B12D4 00052023 */ negu $a0, $a1 /* 0B1ED8 800B12D8 44829000 */ mtc1 $v0, $f18 -/* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD4) # $at, 0x800f +/* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD0 + 4) # $at, 0x800f /* 0B1EE0 800B12E0 468092A0 */ cvt.s.w $f10, $f18 /* 0B1EE4 800B12E4 C4278BD0 */ lwc1 $f7, %lo(D_800E8BD0)($at) -/* 0B1EE8 800B12E8 C4268BD4 */ lwc1 $f6, %lo(D_800E8BD4)($at) +/* 0B1EE8 800B12E8 C4268BD4 */ lwc1 $f6, %lo(D_800E8BD0 + 4)($at) /* 0B1EEC 800B12EC 46005121 */ cvt.d.s $f4, $f10 /* 0B1EF0 800B12F0 46262202 */ mul.d $f8, $f4, $f6 /* 0B1EF4 800B12F4 C7B00024 */ lwc1 $f16, 0x24($sp) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s index e054b24f..74dac3d5 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s @@ -82,10 +82,10 @@ glabel func_800CB2D4 /* 0CBFF4 800CB3F4 448B8000 */ mtc1 $t3, $f16 /* 0CBFF8 800CB3F8 C7AA0004 */ lwc1 $f10, 4($sp) /* 0CBFFC 800CB3FC 468084A0 */ cvt.s.w $f18, $f16 -/* 0CC000 800CB400 3C01800F */ lui $at, %hi(D_800E95FC) # $at, 0x800f +/* 0CC000 800CB400 3C01800F */ lui $at, %hi(D_800E95F8 + 4) # $at, 0x800f /* 0CC004 800CB404 C42595F8 */ lwc1 $f5, %lo(D_800E95F8)($at) /* 0CC008 800CB408 460091A1 */ cvt.d.s $f6, $f18 -/* 0CC00C 800CB40C C42495FC */ lwc1 $f4, %lo(D_800E95FC)($at) +/* 0CC00C 800CB40C C42495FC */ lwc1 $f4, %lo(D_800E95F8 + 4)($at) /* 0CC010 800CB410 46265201 */ sub.d $f8, $f10, $f6 /* 0CC014 800CB414 8FB80024 */ lw $t8, 0x24($sp) /* 0CC018 800CB418 46244402 */ mul.d $f16, $f8, $f4 diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 87fffbdb..fbc5a998 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -49,7 +49,7 @@ const char D_800E49BC[] = "Invalid midi sequence index\n"; /************ .bss ************/ -extern u8 D_800EBF60; +u8 D_800EBF60; extern ALHeap gALHeap; /* Unknown size */ diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 9f430bc2..3aab02a8 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -47,7 +47,8 @@ const char D_800E7700[] = "WARNING : No Eprom\n"; const char D_800E7714[] = "WARNING : No Eprom\n"; const char D_800E7728[] = "WARNING : No Eprom\n"; -const char D_800E773C[] = "DKRACING-GHOSTS\0"; +const char D_800E773C[] = "DKRACING-GHOSTS"; // Used in func_80074B34 +const u8 D_800E774C[4] = { 0, 0, 0, 0 }; // Used in func_80074B34, but I'm confused to what this is for. const char D_800E7750[] = "warning: corrupt ghost\n"; /*********************************/ diff --git a/src/unknown_0B7A50.c b/src/unknown_0B7A50.c index 4b0f9649..deab665b 100644 --- a/src/unknown_0B7A50.c +++ b/src/unknown_0B7A50.c @@ -9,9 +9,12 @@ const char D_800E8E70[] = "\nAssertion failed: '%s' in file %s, line %d\n"; const char D_800E8EA0[] = "\nAssertion failed: '%s' in file %s, line %d\n"; const char D_800E8ED0[] = ">fault< "; -const char D_800E8EDC[] = "CORE\0\0\0\0"; -const char D_800E8EE8[] = "CORE\0\0\0\0"; -const char D_800E8EF4[] = "CORE\0\0\0\0"; +const char D_800E8EDC[] = "CORE"; +const u8 D_800E8EE4[4] = { 0, 0, 0, 0 }; +const char D_800E8EE8[] = "CORE"; +const u8 D_800E8EF0[4] = { 0, 0, 0, 0 }; +const char D_800E8EF4[] = "CORE"; +const u8 D_800E8EFC[4] = { 0, 0, 0, 0 }; /*********************************/ diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py index 9e32a4c0..8f3a4c70 100644 --- a/tools/python/generate_ld.py +++ b/tools/python/generate_ld.py @@ -51,6 +51,7 @@ class GenerateLD: self.gen_data_section() self.gen_rodata_section() self.gen_ucode_data_section() + self.gen_bss_section() self.gen_assets_section() self.gen_discard() self.gen_close_block() @@ -115,6 +116,17 @@ class GenerateLD: self.gen_line('romPos += SIZEOF(.rodata);') self.gen_newline() + def gen_bss_section(self): + self.gen_line('.bss.noload (NOLOAD):') + self.gen_open_block() + for file in self.files: + if file[0] not in LATE_DATA_FILES: + self.gen_line(file[0] + '(.bss);') + for file in LATE_DATA_FILES: + self.gen_line(file + '(.bss);') + self.gen_close_block() + self.gen_newline() + def gen_ucode_data_section(self): self.gen_line('.ucodeData . : AT(romPos)') self.gen_open_block() diff --git a/tools/python/undefined_sym_fix.py b/tools/python/undefined_sym_fix.py index 7ca2234d..cae892c0 100644 --- a/tools/python/undefined_sym_fix.py +++ b/tools/python/undefined_sym_fix.py @@ -32,24 +32,27 @@ def check_is_double(symbol, address): outLines = command.stdout.decode("utf-8").split('\n') for outLine in outLines: if 'lwc1' in outLine: - newSym = hex(address - 4)[2:].upper() + '+4' + newSym = 'D_' + hex(address - 4)[2:].upper() + ' + 4' subprocess.run(['./rename_sym.sh', symbol, newSym]) return True return False def fixDoubleLoads(): syms = load_syms() - for i in range(0, len(syms)): + target = len(syms) + i = 0 + while i < target: sym = syms[i] - if not sym.startswith('D_'): - continue - symSplit = sym.split(' = ') - symbol = symSplit[0] - address = int(symSplit[1][2:-1], 16) - if address >= 0x800E4BFC and address < 0x800E9BA0 and (address & 4 == 4): - if check_is_double(symbol, address): - syms.pop(i) - i -= 1 + if sym.startswith('D_'): + symSplit = sym.split(' = ') + symbol = symSplit[0] + address = int(symSplit[1][2:-1], 16) + if address >= 0x800E4BFC and address < 0x800E9BA0 and ((address & 4) != 0): + if check_is_double(symbol, address): + syms.pop(i) + target -= 1 + continue + i += 1 save_syms(syms) #fixBadLabel() diff --git a/undefined_syms.txt b/undefined_syms.txt index 59ca3a06..6d5c0064 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -25,319 +25,6 @@ osAppNMIBuffer = 0x8000031C; D_800E0001 = 0x800E0001; eqpower = 0x800E37A0; -D_800E4BFC = 0x800E4BFC; -D_800E4C0C = 0x800E4C0C; -D_800E4C14 = 0x800E4C14; -D_800E4C1C = 0x800E4C1C; -D_800E4C24 = 0x800E4C24; -D_800E4C2C = 0x800E4C2C; -D_800E4C34 = 0x800E4C34; -D_800E4C44 = 0x800E4C44; -D_800E4C4C = 0x800E4C4C; -D_800E4C54 = 0x800E4C54; -D_800E4C5C = 0x800E4C5C; -D_800E4C64 = 0x800E4C64; -D_800E4C6C = 0x800E4C6C; -D_800E4C84 = 0x800E4C84; -D_800E4C8C = 0x800E4C8C; -D_800E4C94 = 0x800E4C94; -D_800E4CA4 = 0x800E4CA4; -D_800E4CAC = 0x800E4CAC; -D_800E4CBC = 0x800E4CBC; -D_800E4CCC = 0x800E4CCC; -D_800E4CDC = 0x800E4CDC; -D_800E4CEC = 0x800E4CEC; -D_800E4CFC = 0x800E4CFC; -D_800E4F1C = 0x800E4F1C; -D_800E4F24 = 0x800E4F24; -D_800E553C = 0x800E553C; -D_800E5544 = 0x800E5544; -D_800E554C = 0x800E554C; -D_800E557C = 0x800E557C; -D_800E55BC = 0x800E55BC; -D_800E55C4 = 0x800E55C4; -D_800E55CC = 0x800E55CC; -D_800E55D4 = 0x800E55D4; -D_800E55DC = 0x800E55DC; -D_800E55E4 = 0x800E55E4; -D_800E55EC = 0x800E55EC; -D_800E55F4 = 0x800E55F4; -D_800E55FC = 0x800E55FC; -D_800E5604 = 0x800E5604; -D_800E560C = 0x800E560C; -D_800E5614 = 0x800E5614; -D_800E561C = 0x800E561C; -D_800E5624 = 0x800E5624; -D_800E562C = 0x800E562C; -D_800E5634 = 0x800E5634; -D_800E564C = 0x800E564C; -D_800E565C = 0x800E565C; -D_800E566C = 0x800E566C; -D_800E5674 = 0x800E5674; -D_800E5684 = 0x800E5684; -D_800E5E64 = 0x800E5E64; -D_800E5E6C = 0x800E5E6C; -D_800E5E74 = 0x800E5E74; -D_800E5E7C = 0x800E5E7C; -D_800E5E84 = 0x800E5E84; -D_800E5E8C = 0x800E5E8C; -D_800E5E94 = 0x800E5E94; -D_800E5E9C = 0x800E5E9C; -D_800E5EA4 = 0x800E5EA4; -D_800E5EAC = 0x800E5EAC; -D_800E5EB4 = 0x800E5EB4; -D_800E5EBC = 0x800E5EBC; -D_800E5F44 = 0x800E5F44; -D_800E5FE4 = 0x800E5FE4; -D_800E5FEC = 0x800E5FEC; -D_800E5FF4 = 0x800E5FF4; -D_800E5FFC = 0x800E5FFC; -D_800E6014 = 0x800E6014; -D_800E601C = 0x800E601C; -D_800E6024 = 0x800E6024; -D_800E602C = 0x800E602C; -D_800E6034 = 0x800E6034; -D_800E603C = 0x800E603C; -D_800E6044 = 0x800E6044; -D_800E6054 = 0x800E6054; -D_800E605C = 0x800E605C; -D_800E6064 = 0x800E6064; -D_800E606C = 0x800E606C; -D_800E6144 = 0x800E6144; -D_800E6154 = 0x800E6154; -D_800E615C = 0x800E615C; -D_800E6164 = 0x800E6164; -D_800E616C = 0x800E616C; -D_800E6174 = 0x800E6174; -D_800E617C = 0x800E617C; -D_800E618C = 0x800E618C; -D_800E6194 = 0x800E6194; -D_800E619C = 0x800E619C; -D_800E61AC = 0x800E61AC; -D_800E61BC = 0x800E61BC; -D_800E61F4 = 0x800E61F4; -D_800E61FC = 0x800E61FC; -D_800E6204 = 0x800E6204; -D_800E6254 = 0x800E6254; -D_800E62AC = 0x800E62AC; -D_800E62B4 = 0x800E62B4; -D_800E62BC = 0x800E62BC; -D_800E62C4 = 0x800E62C4; -D_800E62CC = 0x800E62CC; -D_800E62D4 = 0x800E62D4; -D_800E62DC = 0x800E62DC; -D_800E62E4 = 0x800E62E4; -D_800E62EC = 0x800E62EC; -D_800E62F4 = 0x800E62F4; -D_800E62FC = 0x800E62FC; -D_800E6304 = 0x800E6304; -D_800E630C = 0x800E630C; -D_800E6314 = 0x800E6314; -D_800E6354 = 0x800E6354; -D_800E63A4 = 0x800E63A4; -D_800E63AC = 0x800E63AC; -D_800E63B4 = 0x800E63B4; -D_800E63BC = 0x800E63BC; -D_800E63C4 = 0x800E63C4; -D_800E63CC = 0x800E63CC; -D_800E63D4 = 0x800E63D4; -D_800E63E4 = 0x800E63E4; -D_800E63EC = 0x800E63EC; -D_800E63FC = 0x800E63FC; -D_800E6404 = 0x800E6404; -D_800E640C = 0x800E640C; -D_800E6414 = 0x800E6414; -D_800E641C = 0x800E641C; -D_800E6424 = 0x800E6424; -D_800E642C = 0x800E642C; -D_800E6434 = 0x800E6434; -D_800E643C = 0x800E643C; -D_800E6444 = 0x800E6444; -D_800E644C = 0x800E644C; -D_800E645C = 0x800E645C; -D_800E6464 = 0x800E6464; -D_800E648C = 0x800E648C; -D_800E6494 = 0x800E6494; -D_800E649C = 0x800E649C; -D_800E64A4 = 0x800E64A4; -D_800E64AC = 0x800E64AC; -D_800E64B4 = 0x800E64B4; -D_800E64BC = 0x800E64BC; -D_800E64C4 = 0x800E64C4; -D_800E64CC = 0x800E64CC; -D_800E64D4 = 0x800E64D4; -D_800E64E4 = 0x800E64E4; -D_800E64FC = 0x800E64FC; -D_800E6504 = 0x800E6504; -D_800E6514 = 0x800E6514; -D_800E651C = 0x800E651C; -D_800E6524 = 0x800E6524; -D_800E6534 = 0x800E6534; -D_800E653C = 0x800E653C; -D_800E6544 = 0x800E6544; -D_800E654C = 0x800E654C; -D_800E6554 = 0x800E6554; -D_800E655C = 0x800E655C; -D_800E6564 = 0x800E6564; -D_800E6574 = 0x800E6574; -D_800E657C = 0x800E657C; -D_800E6594 = 0x800E6594; -D_800E659C = 0x800E659C; -D_800E65FC = 0x800E65FC; -D_800E6604 = 0x800E6604; -D_800E660C = 0x800E660C; -D_800E6614 = 0x800E6614; -D_800E661C = 0x800E661C; -D_800E6624 = 0x800E6624; -D_800E662C = 0x800E662C; -D_800E6634 = 0x800E6634; -D_800E663C = 0x800E663C; -D_800E6644 = 0x800E6644; -D_800E664C = 0x800E664C; -D_800E6654 = 0x800E6654; -D_800E665C = 0x800E665C; -D_800E666C = 0x800E666C; -D_800E6674 = 0x800E6674; -D_800E667C = 0x800E667C; -D_800E6684 = 0x800E6684; -D_800E668C = 0x800E668C; -D_800E6694 = 0x800E6694; -D_800E669C = 0x800E669C; -D_800E66A4 = 0x800E66A4; -D_800E66AC = 0x800E66AC; -D_800E66B4 = 0x800E66B4; -D_800E66BC = 0x800E66BC; -D_800E66CC = 0x800E66CC; -D_800E66F4 = 0x800E66F4; -D_800E66FC = 0x800E66FC; -D_800E6704 = 0x800E6704; -D_800E670C = 0x800E670C; -D_800E6714 = 0x800E6714; -D_800E671C = 0x800E671C; -D_800E672C = 0x800E672C; -D_800E6734 = 0x800E6734; -D_800E673C = 0x800E673C; -D_800E6744 = 0x800E6744; -D_800E674C = 0x800E674C; -D_800E6754 = 0x800E6754; -D_800E6764 = 0x800E6764; -D_800E678C = 0x800E678C; -D_800E6794 = 0x800E6794; -D_800E679C = 0x800E679C; -D_800E67C4 = 0x800E67C4; -D_800E67CC = 0x800E67CC; -D_800E67D4 = 0x800E67D4; -D_800E67DC = 0x800E67DC; -D_800E67E4 = 0x800E67E4; -D_800E67EC = 0x800E67EC; -D_800E67F4 = 0x800E67F4; -D_800E67FC = 0x800E67FC; -D_800E680C = 0x800E680C; -D_800E6814 = 0x800E6814; -D_800E681C = 0x800E681C; -D_800E6824 = 0x800E6824; -D_800E682C = 0x800E682C; -D_800E6834 = 0x800E6834; -D_800E683C = 0x800E683C; -D_800E6844 = 0x800E6844; -D_800E684C = 0x800E684C; -D_800E68F4 = 0x800E68F4; -D_800E68FC = 0x800E68FC; -D_800E6904 = 0x800E6904; -D_800E690C = 0x800E690C; -D_800E6914 = 0x800E6914; -D_800E691C = 0x800E691C; -D_800E6924 = 0x800E6924; -D_800E692C = 0x800E692C; -D_800E6934 = 0x800E6934; -D_800E693C = 0x800E693C; -D_800E6944 = 0x800E6944; -D_800E6954 = 0x800E6954; -D_800E6964 = 0x800E6964; -D_800E69A4 = 0x800E69A4; -D_800E69BC = 0x800E69BC; -D_800E69C4 = 0x800E69C4; -D_800E69CC = 0x800E69CC; -D_800E69D4 = 0x800E69D4; -D_800E69DC = 0x800E69DC; -D_800E69E4 = 0x800E69E4; -D_800E69F4 = 0x800E69F4; -D_800E69FC = 0x800E69FC; -D_800E6A14 = 0x800E6A14; -D_800E6A1C = 0x800E6A1C; -D_800E6A24 = 0x800E6A24; -D_800E6A2C = 0x800E6A2C; -D_800E6A34 = 0x800E6A34; -D_800E6A3C = 0x800E6A3C; -D_800E6A44 = 0x800E6A44; -D_800E6A4C = 0x800E6A4C; -D_800E6A54 = 0x800E6A54; -D_800E6A5C = 0x800E6A5C; -D_800E6A64 = 0x800E6A64; -D_800E6A6C = 0x800E6A6C; -D_800E6A8C = 0x800E6A8C; -D_800E6A94 = 0x800E6A94; -D_800E6A9C = 0x800E6A9C; -D_800E6AA4 = 0x800E6AA4; -D_800E6AAC = 0x800E6AAC; -D_800E6AB4 = 0x800E6AB4; -D_800E6ABC = 0x800E6ABC; -D_800E6AC4 = 0x800E6AC4; -D_800E6ACC = 0x800E6ACC; -D_800E6AEC = 0x800E6AEC; -D_800E6AF4 = 0x800E6AF4; -D_800E6B04 = 0x800E6B04; -D_800E6B0C = 0x800E6B0C; -D_800E6B14 = 0x800E6B14; -D_800E6EC4 = 0x800E6EC4; -D_800E774C = 0x800E774C; -D_800E7778 = 0x800E7778; -D_800E778C = 0x800E778C; -D_800E77A0 = 0x800E77A0; -D_800E77B4 = 0x800E77B4; -D_800E77C8 = 0x800E77C8; -D_800E77DC = 0x800E77DC; -D_800E77E4 = 0x800E77E4; -D_800E77EC = 0x800E77EC; -D_800E77F4 = 0x800E77F4; -D_800E839C = 0x800E839C; -D_800E83A4 = 0x800E83A4; -D_800E83AC = 0x800E83AC; -D_800E84D4 = 0x800E84D4; -D_800E84E4 = 0x800E84E4; -D_800E84EC = 0x800E84EC; -D_800E86AC = 0x800E86AC; -D_800E86EC = 0x800E86EC; -D_800E86F4 = 0x800E86F4; -D_800E8724 = 0x800E8724; -D_800E872C = 0x800E872C; -D_800E8734 = 0x800E8734; -D_800E873C = 0x800E873C; -D_800E875C = 0x800E875C; -D_800E8764 = 0x800E8764; -D_800E8784 = 0x800E8784; -D_800E878C = 0x800E878C; -D_800E8794 = 0x800E8794; -D_800E879C = 0x800E879C; -D_800E87A4 = 0x800E87A4; -D_800E87BC = 0x800E87BC; -D_800E87C4 = 0x800E87C4; -D_800E87CC = 0x800E87CC; -D_800E87E4 = 0x800E87E4; -D_800E8B9C = 0x800E8B9C; -D_800E8BA4 = 0x800E8BA4; -D_800E8BAC = 0x800E8BAC; -D_800E8BB4 = 0x800E8BB4; -D_800E8BBC = 0x800E8BBC; -D_800E8BC4 = 0x800E8BC4; -D_800E8BCC = 0x800E8BCC; -D_800E8BD4 = 0x800E8BD4; -D_800E8EE4 = 0x800E8EE4; -D_800E8EF0 = 0x800E8EF0; -D_800E8EFC = 0x800E8EFC; -D_800E95FC = 0x800E95FC; - -D_800EBF60 = 0x800EBF60; gALHeap = 0x80115CE8; ALSeqFile_80115CF8 = 0x80115CF8; D_80115CFC = 0x80115CFC;