From d2d752fdfe77ffb3db5a1c69a622c64f48c73dbf Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 19 Sep 2020 13:51:53 -0400 Subject: changed some lbl_'s to func_'s and added the .global directive to them (doldisasm misidentified them as branches --- asm/gt2Connection.s | 4 +++- asm/gt2Main.s | 12 ++++++------ asm/text_10_2.s | 12 +++++++++--- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/asm/gt2Connection.s b/asm/gt2Connection.s index 919181d..c1f7e8b 100644 --- a/asm/gt2Connection.s +++ b/asm/gt2Connection.s @@ -389,7 +389,9 @@ lbl_80349828: /* 8034983C 0034549C 7C 08 03 A6 */ mtlr r0 /* 80349840 003454A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80349844 003454A4 4E 80 00 20 */ blr -lbl_80349848: + +.global func_80349848 +func_80349848: /* 80349848 003454A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8034984C 003454AC 7C 08 02 A6 */ mflr r0 /* 80349850 003454B0 2C 04 00 00 */ cmpwi r4, 0 diff --git a/asm/gt2Main.s b/asm/gt2Main.s index fb9ec9c..0e6031b 100644 --- a/asm/gt2Main.s +++ b/asm/gt2Main.s @@ -5,7 +5,7 @@ .global gt2CreateSocket gt2CreateSocket: /* 803499F0 00345650 39 00 00 00 */ li r8, 0 -/* 803499F4 00345654 48 00 36 6C */ b lbl_8034D060 +/* 803499F4 00345654 48 00 36 6C */ b func_8034D060 .global gt2CloseSocket gt2CloseSocket: @@ -52,7 +52,7 @@ lbl_80349A74: .global gt2Listen gt2Listen: -/* 80349A88 003456E8 48 00 38 78 */ b lbl_8034D300 +/* 80349A88 003456E8 48 00 38 78 */ b func_8034D300 .global gt2Accept gt2Accept: @@ -255,16 +255,16 @@ lbl_80349D20: .global func_80349D38 func_80349D38: -/* 80349D38 00345998 48 00 2F 34 */ b lbl_8034CC6C +/* 80349D38 00345998 48 00 2F 34 */ b func_8034CC6C .global gt2CloseConnectionHard gt2CloseConnectionHard: /* 80349D3C 0034599C 38 80 00 01 */ li r4, 1 -/* 80349D40 003459A0 4B FF FB 08 */ b lbl_80349848 +/* 80349D40 003459A0 4B FF FB 08 */ b func_80349848 lbl_80349D44: /* 80349D44 003459A4 80 63 00 00 */ lwz r3, 0(r3) /* 80349D48 003459A8 38 80 00 00 */ li r4, 0 -/* 80349D4C 003459AC 4B FF FA FC */ b lbl_80349848 +/* 80349D4C 003459AC 4B FF FA FC */ b func_80349848 .global func_80349D50 func_80349D50: @@ -278,7 +278,7 @@ func_80349D50: gti2CloseAllConnectionsHardMap: /* 80349D64 003459C4 80 63 00 00 */ lwz r3, 0(r3) /* 80349D68 003459C8 38 80 00 01 */ li r4, 1 -/* 80349D6C 003459CC 4B FF FA DC */ b lbl_80349848 +/* 80349D6C 003459CC 4B FF FA DC */ b func_80349848 .global gt2CloseAllConnectionsHard gt2CloseAllConnectionsHard: diff --git a/asm/text_10_2.s b/asm/text_10_2.s index 42a150f..385f97e 100644 --- a/asm/text_10_2.s +++ b/asm/text_10_2.s @@ -3369,7 +3369,9 @@ lbl_8034CC4C: /* 8034CC60 003488C0 7C 08 03 A6 */ mtlr r0 /* 8034CC64 003488C4 38 21 00 30 */ addi r1, r1, 0x30 /* 8034CC68 003488C8 4E 80 00 20 */ blr -lbl_8034CC6C: + +.global func_8034CC6C +func_8034CC6C: /* 8034CC6C 003488CC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8034CC70 003488D0 7C 08 02 A6 */ mflr r0 /* 8034CC74 003488D4 90 01 00 34 */ stw r0, 0x34(r1) @@ -3654,7 +3656,9 @@ lbl_8034D050: /* 8034D054 00348CB4 7C 08 03 A6 */ mtlr r0 /* 8034D058 00348CB8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8034D05C 00348CBC 4E 80 00 20 */ blr -lbl_8034D060: + +.global func_8034D060 +func_8034D060: /* 8034D060 00348CC0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8034D064 00348CC4 7C 08 02 A6 */ mflr r0 /* 8034D068 00348CC8 90 01 00 44 */ stw r0, 0x44(r1) @@ -3840,7 +3844,9 @@ lbl_8034D2EC: /* 8034D2F4 00348F54 7C 08 03 A6 */ mtlr r0 /* 8034D2F8 00348F58 38 21 00 10 */ addi r1, r1, 0x10 /* 8034D2FC 00348F5C 4E 80 00 20 */ blr -lbl_8034D300: + +.global func_8034D300 +func_8034D300: /* 8034D300 00348F60 90 83 00 20 */ stw r4, 0x20(r3) /* 8034D304 00348F64 4E 80 00 20 */ blr -- cgit v1.2.3