From 79c84ea0ccd768a321292329c287cdce91fda8f4 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Fri, 11 Jun 2021 10:18:04 -0500 Subject: [PATCH 1/2] Fixed crashing issue when shifting. --- asm/non_matchings/unknown_080500/MenuCreditsLoop.s | 2 +- asm/non_matchings/unknown_0B8920/func_800BB2F4.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C1130.s | 2 +- lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index aff15d94..b0369978 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -447,7 +447,7 @@ glabel MenuCreditsLoop /* 09C584 8009B984 3C01800E */ lui $at, 0x800e /* 09C588 8009B988 448A8000 */ mtc1 $t2, $f16 /* 09C58C 8009B98C 00290821 */ addu $at, $at, $t1 -/* 09C590 8009B990 AC201B84 */ sw $zero, 0x1b84($at) +/* 09C590 8009B990 AC201B84 */ sw $zero, %lo(D_800E1B50+0x34)($at) /* 09C594 8009B994 468084A0 */ cvt.s.w $f18, $f16 /* 09C598 8009B998 3C014270 */ li $at, 0x42700000 # 60.000000 /* 09C59C 8009B99C 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s b/asm/non_matchings/unknown_0B8920/func_800BB2F4.s index 4fceaaef..c0ff6a73 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s +++ b/asm/non_matchings/unknown_0B8920/func_800BB2F4.s @@ -450,12 +450,12 @@ glabel func_800BB2F4 /* 0BC590 800BB990 010E2021 */ addu $a0, $t0, $t6 /* 0BC594 800BB994 24840001 */ addiu $a0, $a0, 1 .L800BB998: -/* 0BC598 800BB998 8D4A3044 */ lw $t2, 0x3044($t2) +/* 0BC598 800BB998 8D4A3044 */ lw $t2, %lo(D_800E3044)($t2) /* 0BC59C 800BB99C 00047880 */ sll $t7, $a0, 2 /* 0BC5A0 800BB9A0 014F1021 */ addu $v0, $t2, $t7 /* 0BC5A4 800BB9A4 84580002 */ lh $t8, 2($v0) /* 0BC5A8 800BB9A8 844F0000 */ lh $t7, ($v0) -/* 0BC5AC 800BB9AC 8CA53040 */ lw $a1, 0x3040($a1) +/* 0BC5AC 800BB9AC 8CA53040 */ lw $a1, %lo(D_800E3040)($a1) /* 0BC5B0 800BB9B0 0018C880 */ sll $t9, $t8, 2 /* 0BC5B4 800BB9B4 000FC080 */ sll $t8, $t7, 2 /* 0BC5B8 800BB9B8 00B97021 */ addu $t6, $a1, $t9 diff --git a/asm/non_matchings/unknown_0B8920/func_800C1130.s b/asm/non_matchings/unknown_0B8920/func_800C1130.s index c2bc4259..53fbdc39 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C1130.s +++ b/asm/non_matchings/unknown_0B8920/func_800C1130.s @@ -169,7 +169,7 @@ glabel func_800C1130 /* 0C1FB0 800C13B0 00000000 */ nop .L800C13B4: -/* 0C1FB4 800C13B4 246331B4 */ addiu $v1, $v1, 0x31b4 +/* 0C1FB4 800C13B4 246331B4 */ addiu $v1, $v1, %lo(D_800E31B4)# 0x31b4 /* 0C1FB8 800C13B8 94620000 */ lhu $v0, ($v1) /* 0C1FBC 800C13BC 3401FFFF */ li $at, 65535 /* 0C1FC0 800C13C0 10410006 */ beq $v0, $at, .L800C13DC diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s index c6586ff6..3031182a 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s @@ -55,8 +55,8 @@ glabel alResamplePull /* 0CCE2C 800CC22C 4626203C */ c.lt.d $f4, $f6 /* 0CCE30 800CC230 00000000 */ nop /* 0CCE34 800CC234 45020005 */ bc1fl .L800CC24C -/* 0CCE38 800CC238 3C014700 */ lui $at, %hi(0x46FF9630) # $at, 0x4700 -/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(0x46FF9630)($at) +/* 0CCE38 800CC238 3C014700 */ lui $at, 0x4700 +/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(D_800E9630)($at) /* 0CCE40 800CC240 E5080018 */ swc1 $f8, 0x18($t0) /* 0CCE44 800CC244 C5020018 */ lwc1 $f2, 0x18($t0) /* 0CCE48 800CC248 3C014700 */ li $at, 0x47000000 # 32768.000000 From 5b988f57821db6d7181b1f2089b6b4e17bc65384 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Fri, 11 Jun 2021 10:18:04 -0500 Subject: [PATCH 2/2] Fixed crashing issue when shifting. --- asm/non_matchings/unknown_080500/MenuCreditsLoop.s | 2 +- asm/non_matchings/unknown_0B8920/func_800BB2F4.s | 4 ++-- asm/non_matchings/unknown_0B8920/func_800C1130.s | 2 +- lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s index aff15d94..b0369978 100644 --- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s +++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s @@ -447,7 +447,7 @@ glabel MenuCreditsLoop /* 09C584 8009B984 3C01800E */ lui $at, 0x800e /* 09C588 8009B988 448A8000 */ mtc1 $t2, $f16 /* 09C58C 8009B98C 00290821 */ addu $at, $at, $t1 -/* 09C590 8009B990 AC201B84 */ sw $zero, 0x1b84($at) +/* 09C590 8009B990 AC201B84 */ sw $zero, %lo(D_800E1B50+0x34)($at) /* 09C594 8009B994 468084A0 */ cvt.s.w $f18, $f16 /* 09C598 8009B998 3C014270 */ li $at, 0x42700000 # 60.000000 /* 09C59C 8009B99C 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s b/asm/non_matchings/unknown_0B8920/func_800BB2F4.s index 4fceaaef..c0ff6a73 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BB2F4.s +++ b/asm/non_matchings/unknown_0B8920/func_800BB2F4.s @@ -450,12 +450,12 @@ glabel func_800BB2F4 /* 0BC590 800BB990 010E2021 */ addu $a0, $t0, $t6 /* 0BC594 800BB994 24840001 */ addiu $a0, $a0, 1 .L800BB998: -/* 0BC598 800BB998 8D4A3044 */ lw $t2, 0x3044($t2) +/* 0BC598 800BB998 8D4A3044 */ lw $t2, %lo(D_800E3044)($t2) /* 0BC59C 800BB99C 00047880 */ sll $t7, $a0, 2 /* 0BC5A0 800BB9A0 014F1021 */ addu $v0, $t2, $t7 /* 0BC5A4 800BB9A4 84580002 */ lh $t8, 2($v0) /* 0BC5A8 800BB9A8 844F0000 */ lh $t7, ($v0) -/* 0BC5AC 800BB9AC 8CA53040 */ lw $a1, 0x3040($a1) +/* 0BC5AC 800BB9AC 8CA53040 */ lw $a1, %lo(D_800E3040)($a1) /* 0BC5B0 800BB9B0 0018C880 */ sll $t9, $t8, 2 /* 0BC5B4 800BB9B4 000FC080 */ sll $t8, $t7, 2 /* 0BC5B8 800BB9B8 00B97021 */ addu $t6, $a1, $t9 diff --git a/asm/non_matchings/unknown_0B8920/func_800C1130.s b/asm/non_matchings/unknown_0B8920/func_800C1130.s index c2bc4259..53fbdc39 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C1130.s +++ b/asm/non_matchings/unknown_0B8920/func_800C1130.s @@ -169,7 +169,7 @@ glabel func_800C1130 /* 0C1FB0 800C13B0 00000000 */ nop .L800C13B4: -/* 0C1FB4 800C13B4 246331B4 */ addiu $v1, $v1, 0x31b4 +/* 0C1FB4 800C13B4 246331B4 */ addiu $v1, $v1, %lo(D_800E31B4)# 0x31b4 /* 0C1FB8 800C13B8 94620000 */ lhu $v0, ($v1) /* 0C1FBC 800C13BC 3401FFFF */ li $at, 65535 /* 0C1FC0 800C13C0 10410006 */ beq $v0, $at, .L800C13DC diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s index c6586ff6..3031182a 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s @@ -55,8 +55,8 @@ glabel alResamplePull /* 0CCE2C 800CC22C 4626203C */ c.lt.d $f4, $f6 /* 0CCE30 800CC230 00000000 */ nop /* 0CCE34 800CC234 45020005 */ bc1fl .L800CC24C -/* 0CCE38 800CC238 3C014700 */ lui $at, %hi(0x46FF9630) # $at, 0x4700 -/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(0x46FF9630)($at) +/* 0CCE38 800CC238 3C014700 */ lui $at, 0x4700 +/* 0CCE3C 800CC23C C4289630 */ lwc1 $f8, %lo(D_800E9630)($at) /* 0CCE40 800CC240 E5080018 */ swc1 $f8, 0x18($t0) /* 0CCE44 800CC244 C5020018 */ lwc1 $f2, 0x18($t0) /* 0CCE48 800CC248 3C014700 */ li $at, 0x47000000 # 32768.000000