Merge pull request #36 from mparisi20/master

labeled __mod2u, __shl2i, __cvt_dbl_ull, etc by comparing with identical code from Brawl

8 files changed, 45 insertions, 42 deletions

diff --git a/INSTALL.md b/INSTALL.md
index da3af7b..39a1240 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,5 +1,5 @@
 ## Build Instructions
 
-1. Obtain a clean DOL of PBR PAL 1.0 and place it in the build folder and name it `baserom.dol`.
+1. Obtain a clean DOL of PBR PAL 1.0 and place it in the pokerevo/ folder and name it `baserom.dol`.
 2. Join the pret discord and download GC_COMPILERS.zip pinned to #pokerevo and extract it to tools/mwcc_compiler/.
 3. Build tools and `make`.
diff --git a/asm/text_11.s b/asm/text_11.s
index dc3edbe..7929d55 100644
--- a/asm/text_11.s
+++ b/asm/text_11.s
@@ -102514,7 +102514,7 @@ lbl_803DB0E0:
 /* 803DB180 003D6DE0  38 BA FF E7 */	addi r5, r26, -25
 /* 803DB184 003D6DE4  38 80 00 01 */	li r4, 1
 /* 803DB188 003D6DE8  38 60 00 00 */	li r3, 0
-/* 803DB18C 003D6DEC  4B DE C4 15 */	bl func_801C75A0
+/* 803DB18C 003D6DEC  4B DE C4 15 */	bl __shl2i
 /* 803DB190 003D6DF0  80 1C 00 1C */	lwz r0, 0x1c(r28)
 /* 803DB194 003D6DF4  7C 03 20 38 */	and r3, r0, r4
 /* 803DB198 003D6DF8  30 03 FF FF */	addic r0, r3, -1
@@ -102570,7 +102570,7 @@ lbl_803DB244:
 /* 803DB25C 003D6EBC  38 BA FF B2 */	addi r5, r26, -78
 /* 803DB260 003D6EC0  38 80 00 01 */	li r4, 1
 /* 803DB264 003D6EC4  38 60 00 00 */	li r3, 0
-/* 803DB268 003D6EC8  4B DE C3 39 */	bl func_801C75A0
+/* 803DB268 003D6EC8  4B DE C3 39 */	bl __shl2i
 /* 803DB26C 003D6ECC  80 1D 00 14 */	lwz r0, 0x14(r29)
 /* 803DB270 003D6ED0  7C 03 20 38 */	and r3, r0, r4
 /* 803DB274 003D6ED4  30 03 FF FF */	addic r0, r3, -1
@@ -102640,7 +102640,7 @@ lbl_803DB348:
 /* 803DB368 003D6FC8  38 BA FF 86 */	addi r5, r26, -122
 /* 803DB36C 003D6FCC  38 80 00 01 */	li r4, 1
 /* 803DB370 003D6FD0  38 60 00 00 */	li r3, 0
-/* 803DB374 003D6FD4  4B DE C2 2D */	bl func_801C75A0
+/* 803DB374 003D6FD4  4B DE C2 2D */	bl __shl2i
 /* 803DB378 003D6FD8  80 1B 00 18 */	lwz r0, 0x18(r27)
 /* 803DB37C 003D6FDC  80 BB 00 1C */	lwz r5, 0x1c(r27)
 /* 803DB380 003D6FE0  7C 00 18 38 */	and r0, r0, r3
@@ -105658,7 +105658,7 @@ func_803DDAF8:
 /* 803DDCF8 003D9958  38 BA FF E7 */	addi r5, r26, -25
 /* 803DDCFC 003D995C  38 60 00 00 */	li r3, 0
 /* 803DDD00 003D9960  7F A4 EB 78 */	mr r4, r29
-/* 803DDD04 003D9964  4B DE 98 9D */	bl func_801C75A0
+/* 803DDD04 003D9964  4B DE 98 9D */	bl __shl2i
 /* 803DDD08 003D9968  2C 1D 00 00 */	cmpwi r29, 0
 /* 803DDD0C 003D996C  41 82 00 14 */	beq lbl_803DDD20
 /* 803DDD10 003D9970  80 1E 00 1C */	lwz r0, 0x1c(r30)
@@ -105729,7 +105729,7 @@ lbl_803DDD20:
 /* 803DDE10 003D9A70  38 BA FF B2 */	addi r5, r26, -78
 /* 803DDE14 003D9A74  38 60 00 00 */	li r3, 0
 /* 803DDE18 003D9A78  7F A4 EB 78 */	mr r4, r29
-/* 803DDE1C 003D9A7C  4B DE 97 85 */	bl func_801C75A0
+/* 803DDE1C 003D9A7C  4B DE 97 85 */	bl __shl2i
 /* 803DDE20 003D9A80  2C 1D 00 00 */	cmpwi r29, 0
 /* 803DDE24 003D9A84  41 82 00 14 */	beq lbl_803DDE38
 /* 803DDE28 003D9A88  80 1F 00 14 */	lwz r0, 0x14(r31)
@@ -105812,7 +105812,7 @@ lbl_803DDED8:
 /* 803DDF54 003D9BB4  38 BA FF 86 */	addi r5, r26, -122
 /* 803DDF58 003D9BB8  38 60 00 00 */	li r3, 0
 /* 803DDF5C 003D9BBC  7F C4 F3 78 */	mr r4, r30
-/* 803DDF60 003D9BC0  4B DE 96 41 */	bl func_801C75A0
+/* 803DDF60 003D9BC0  4B DE 96 41 */	bl __shl2i
 /* 803DDF64 003D9BC4  2C 1E 00 00 */	cmpwi r30, 0
 /* 803DDF68 003D9BC8  41 82 00 20 */	beq lbl_803DDF88
 /* 803DDF6C 003D9BCC  80 1D 00 1C */	lwz r0, 0x1c(r29)
diff --git a/asm/text_4.s b/asm/text_4.s
index fd1b2f3..79d8e09 100644
--- a/asm/text_4.s
+++ b/asm/text_4.s
@@ -55574,7 +55574,7 @@ lbl_8014B20C:
 /* 8014B224 00146E84  80 DB 00 04 */	lwz r6, 4(r27)
 /* 8014B228 00146E88  7F 84 E3 78 */	mr r4, r28
 /* 8014B22C 00146E8C  7F 5A 02 14 */	add r26, r26, r0
-/* 8014B230 00146E90  48 07 C1 81 */	bl func_801C73B0
+/* 8014B230 00146E90  48 07 C1 81 */	bl __mod2u
 /* 8014B234 00146E94  56 80 1B 78 */	rlwinm r0, r20, 3, 0xd, 0x1c
 /* 8014B238 00146E98  7C DE 02 14 */	add r6, r30, r0
 /* 8014B23C 00146E9C  80 A6 00 08 */	lwz r5, 8(r6)
@@ -55586,7 +55586,7 @@ lbl_8014B20C:
 /* 8014B254 00146EB4  7F A3 EB 78 */	mr r3, r29
 /* 8014B258 00146EB8  80 DB 00 0C */	lwz r6, 0xc(r27)
 /* 8014B25C 00146EBC  7F 84 E3 78 */	mr r4, r28
-/* 8014B260 00146EC0  48 07 C1 51 */	bl func_801C73B0
+/* 8014B260 00146EC0  48 07 C1 51 */	bl __mod2u
 /* 8014B264 00146EC4  38 14 00 01 */	addi r0, r20, 1
 /* 8014B268 00146EC8  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014B26C 00146ECC  7C DE 02 14 */	add r6, r30, r0
@@ -55599,7 +55599,7 @@ lbl_8014B20C:
 /* 8014B288 00146EE8  7F A3 EB 78 */	mr r3, r29
 /* 8014B28C 00146EEC  80 DB 00 14 */	lwz r6, 0x14(r27)
 /* 8014B290 00146EF0  7F 84 E3 78 */	mr r4, r28
-/* 8014B294 00146EF4  48 07 C1 1D */	bl func_801C73B0
+/* 8014B294 00146EF4  48 07 C1 1D */	bl __mod2u
 /* 8014B298 00146EF8  38 14 00 02 */	addi r0, r20, 2
 /* 8014B29C 00146EFC  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014B2A0 00146F00  7C DE 02 14 */	add r6, r30, r0
@@ -55612,7 +55612,7 @@ lbl_8014B20C:
 /* 8014B2BC 00146F1C  7F A3 EB 78 */	mr r3, r29
 /* 8014B2C0 00146F20  80 DB 00 1C */	lwz r6, 0x1c(r27)
 /* 8014B2C4 00146F24  7F 84 E3 78 */	mr r4, r28
-/* 8014B2C8 00146F28  48 07 C0 E9 */	bl func_801C73B0
+/* 8014B2C8 00146F28  48 07 C0 E9 */	bl __mod2u
 /* 8014B2CC 00146F2C  38 14 00 03 */	addi r0, r20, 3
 /* 8014B2D0 00146F30  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014B2D4 00146F34  7C DE 02 14 */	add r6, r30, r0
@@ -55625,7 +55625,7 @@ lbl_8014B20C:
 /* 8014B2F0 00146F50  7F A3 EB 78 */	mr r3, r29
 /* 8014B2F4 00146F54  80 DB 00 24 */	lwz r6, 0x24(r27)
 /* 8014B2F8 00146F58  7F 84 E3 78 */	mr r4, r28
-/* 8014B2FC 00146F5C  48 07 C0 B5 */	bl func_801C73B0
+/* 8014B2FC 00146F5C  48 07 C0 B5 */	bl __mod2u
 /* 8014B300 00146F60  38 14 00 04 */	addi r0, r20, 4
 /* 8014B304 00146F64  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014B308 00146F68  7C DE 02 14 */	add r6, r30, r0
@@ -55638,7 +55638,7 @@ lbl_8014B20C:
 /* 8014B324 00146F84  7F A3 EB 78 */	mr r3, r29
 /* 8014B328 00146F88  80 DB 00 2C */	lwz r6, 0x2c(r27)
 /* 8014B32C 00146F8C  7F 84 E3 78 */	mr r4, r28
-/* 8014B330 00146F90  48 07 C0 81 */	bl func_801C73B0
+/* 8014B330 00146F90  48 07 C0 81 */	bl __mod2u
 /* 8014B334 00146F94  38 14 00 05 */	addi r0, r20, 5
 /* 8014B338 00146F98  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014B33C 00146F9C  7C DE 02 14 */	add r6, r30, r0
@@ -59772,7 +59772,7 @@ lbl_8014EFB8:
 /* 8014EFC8 0014AC28  80 DD 00 04 */	lwz r6, 4(r29)
 /* 8014EFCC 0014AC2C  7F 44 D3 78 */	mr r4, r26
 /* 8014EFD0 0014AC30  57 3C 0B FC */	rlwinm r28, r25, 1, 0xf, 0x1e
-/* 8014EFD4 0014AC34  48 07 83 DD */	bl func_801C73B0
+/* 8014EFD4 0014AC34  48 07 83 DD */	bl __mod2u
 /* 8014EFD8 0014AC38  57 20 1B 78 */	rlwinm r0, r25, 3, 0xd, 0x1c
 /* 8014EFDC 0014AC3C  7C DE 02 14 */	add r6, r30, r0
 /* 8014EFE0 0014AC40  80 A6 00 08 */	lwz r5, 8(r6)
@@ -59786,7 +59786,7 @@ lbl_8014EFB8:
 /* 8014F000 0014AC60  B0 C5 00 D8 */	sth r6, 0xd8(r5)
 /* 8014F004 0014AC64  80 BD 00 08 */	lwz r5, 8(r29)
 /* 8014F008 0014AC68  80 DD 00 0C */	lwz r6, 0xc(r29)
-/* 8014F00C 0014AC6C  48 07 83 A5 */	bl func_801C73B0
+/* 8014F00C 0014AC6C  48 07 83 A5 */	bl __mod2u
 /* 8014F010 0014AC70  38 19 00 01 */	addi r0, r25, 1
 /* 8014F014 0014AC74  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014F018 0014AC78  7C DE 02 14 */	add r6, r30, r0
@@ -59801,7 +59801,7 @@ lbl_8014EFB8:
 /* 8014F03C 0014AC9C  B0 C5 00 DA */	sth r6, 0xda(r5)
 /* 8014F040 0014ACA0  80 BD 00 10 */	lwz r5, 0x10(r29)
 /* 8014F044 0014ACA4  80 DD 00 14 */	lwz r6, 0x14(r29)
-/* 8014F048 0014ACA8  48 07 83 69 */	bl func_801C73B0
+/* 8014F048 0014ACA8  48 07 83 69 */	bl __mod2u
 /* 8014F04C 0014ACAC  38 19 00 02 */	addi r0, r25, 2
 /* 8014F050 0014ACB0  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014F054 0014ACB4  7C DE 02 14 */	add r6, r30, r0
@@ -59816,7 +59816,7 @@ lbl_8014EFB8:
 /* 8014F078 0014ACD8  B0 C5 00 DC */	sth r6, 0xdc(r5)
 /* 8014F07C 0014ACDC  80 BD 00 18 */	lwz r5, 0x18(r29)
 /* 8014F080 0014ACE0  80 DD 00 1C */	lwz r6, 0x1c(r29)
-/* 8014F084 0014ACE4  48 07 83 2D */	bl func_801C73B0
+/* 8014F084 0014ACE4  48 07 83 2D */	bl __mod2u
 /* 8014F088 0014ACE8  38 19 00 03 */	addi r0, r25, 3
 /* 8014F08C 0014ACEC  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014F090 0014ACF0  7C DE 02 14 */	add r6, r30, r0
@@ -59831,7 +59831,7 @@ lbl_8014EFB8:
 /* 8014F0B4 0014AD14  B0 C5 00 DE */	sth r6, 0xde(r5)
 /* 8014F0B8 0014AD18  80 BD 00 20 */	lwz r5, 0x20(r29)
 /* 8014F0BC 0014AD1C  80 DD 00 24 */	lwz r6, 0x24(r29)
-/* 8014F0C0 0014AD20  48 07 82 F1 */	bl func_801C73B0
+/* 8014F0C0 0014AD20  48 07 82 F1 */	bl __mod2u
 /* 8014F0C4 0014AD24  38 19 00 04 */	addi r0, r25, 4
 /* 8014F0C8 0014AD28  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014F0CC 0014AD2C  7C DE 02 14 */	add r6, r30, r0
@@ -59846,7 +59846,7 @@ lbl_8014EFB8:
 /* 8014F0F0 0014AD50  B0 C5 00 E0 */	sth r6, 0xe0(r5)
 /* 8014F0F4 0014AD54  80 BD 00 28 */	lwz r5, 0x28(r29)
 /* 8014F0F8 0014AD58  80 DD 00 2C */	lwz r6, 0x2c(r29)
-/* 8014F0FC 0014AD5C  48 07 82 B5 */	bl func_801C73B0
+/* 8014F0FC 0014AD5C  48 07 82 B5 */	bl __mod2u
 /* 8014F100 0014AD60  38 19 00 05 */	addi r0, r25, 5
 /* 8014F104 0014AD64  54 00 1B 78 */	rlwinm r0, r0, 3, 0xd, 0x1c
 /* 8014F108 0014AD68  7C DE 02 14 */	add r6, r30, r0
diff --git a/asm/text_5.s b/asm/text_5.s
index 912901c..aa2e95a 100644
--- a/asm/text_5.s
+++ b/asm/text_5.s
@@ -97517,8 +97517,8 @@ lbl_801C73A8:
 /* 801C73A8 001C3008  38 21 00 10 */	addi r1, r1, 0x10
 /* 801C73AC 001C300C  4E 80 00 20 */	blr
 
-.global func_801C73B0
-func_801C73B0:
+.global __mod2u
+__mod2u:
 /* 801C73B0 001C3010  2C 03 00 00 */	cmpwi r3, 0
 /* 801C73B4 001C3014  7C 60 00 34 */	cntlzw r0, r3
 /* 801C73B8 001C3018  7C 89 00 34 */	cntlzw r9, r4
@@ -97586,8 +97586,8 @@ lbl_801C7480:
 lbl_801C7490:
 /* 801C7490 001C30F0  4E 80 00 20 */	blr
 
-.global func_801C7494
-func_801C7494:
+.global __mod2i
+__mod2i:
 /* 801C7494 001C30F4  2F 83 00 00 */	cmpwi cr7, r3, 0
 /* 801C7498 001C30F8  40 9C 00 0C */	bge cr7, lbl_801C74A4
 /* 801C749C 001C30FC  20 84 00 00 */	subfic r4, r4, 0
@@ -97668,8 +97668,8 @@ lbl_801C7590:
 lbl_801C759C:
 /* 801C759C 001C31FC  4E 80 00 20 */	blr
 
-.global func_801C75A0
-func_801C75A0:
+.global __shl2i
+__shl2i:
 /* 801C75A0 001C3200  21 05 00 20 */	subfic r8, r5, 0x20
 /* 801C75A4 001C3204  31 25 FF E0 */	addic r9, r5, -32
 /* 801C75A8 001C3208  7C 63 28 30 */	slw r3, r3, r5
@@ -97778,8 +97778,8 @@ lbl_801C7700:
 /* 801C7710 001C3370  38 21 00 10 */	addi r1, r1, 0x10
 /* 801C7714 001C3374  4E 80 00 20 */	blr
 
-.global func_801C7718
-func_801C7718:
+.global __cvt_dbl_ull
+__cvt_dbl_ull:
 /* 801C7718 001C3378  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 801C771C 001C337C  D8 21 00 08 */	stfd f1, 8(r1)
 /* 801C7720 001C3380  80 61 00 08 */	lwz r3, 8(r1)
@@ -97829,7 +97829,10 @@ lbl_801C77B8:
 /* 801C77BC 001C341C  4E 80 00 20 */	blr
 
 .global func_801C77C0
-func_801C77C0:
+func_801C77C0: #__init_cpp_exceptions
+#causes "runtime sources 'global_destructor_chain.c' and '__init_cpp_exceptions.cpp' both need to be updated to latest
+#version.  Please contact Metrowerks support." error
+#needs to be split correctly before renaming
 /* 801C77C0 001C3420  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 801C77C4 001C3424  7C 08 02 A6 */	mflr r0
 /* 801C77C8 001C3428  90 01 00 14 */	stw r0, 0x14(r1)
@@ -98039,7 +98042,7 @@ lbl_801C7A5C:
 /* 801C7A60 001C36C0  7F C4 F3 78 */	mr r4, r30
 /* 801C7A64 001C36C4  38 C0 00 0A */	li r6, 0xa
 /* 801C7A68 001C36C8  38 A0 00 00 */	li r5, 0
-/* 801C7A6C 001C36CC  4B FF F9 45 */	bl func_801C73B0
+/* 801C7A6C 001C36CC  4B FF F9 45 */	bl __mod2u
 /* 801C7A70 001C36D0  89 1D 00 04 */	lbz r8, 4(r29)
 /* 801C7A74 001C36D4  7F E3 FB 78 */	mr r3, r31
 /* 801C7A78 001C36D8  38 C0 00 0A */	li r6, 0xa
@@ -99154,7 +99157,7 @@ lbl_801C89E0:
 /* 801C89F4 001C4654  FC 20 F8 90 */	fmr f1, f31
 /* 801C89F8 001C4658  7F A3 EB 78 */	mr r3, r29
 /* 801C89FC 001C465C  48 00 B9 1D */	bl func_801D4318
-/* 801C8A00 001C4660  4B FF ED 19 */	bl func_801C7718
+/* 801C8A00 001C4660  4B FF ED 19 */	bl __cvt_dbl_ull
 /* 801C8A04 001C4664  7C 65 1B 78 */	mr r5, r3
 /* 801C8A08 001C4668  7C 86 23 78 */	mr r6, r4
 /* 801C8A0C 001C466C  38 61 00 44 */	addi r3, r1, 0x44
diff --git a/asm/text_6.s b/asm/text_6.s
index 51acbe5..40f0c76 100644
--- a/asm/text_6.s
+++ b/asm/text_6.s
@@ -678,7 +678,7 @@ lbl_801CB0E0:
 /* 801CB0E4 001C6D44  7F C4 F3 78 */	mr r4, r30
 /* 801CB0E8 001C6D48  7F A5 EB 78 */	mr r5, r29
 /* 801CB0EC 001C6D4C  7F 86 E3 78 */	mr r6, r28
-/* 801CB0F0 001C6D50  4B FF C2 C1 */	bl func_801C73B0
+/* 801CB0F0 001C6D50  4B FF C2 C1 */	bl __mod2u
 /* 801CB0F4 001C6D54  7C 96 23 78 */	mr r22, r4
 /* 801CB0F8 001C6D58  7F E3 FB 78 */	mr r3, r31
 /* 801CB0FC 001C6D5C  7F C4 F3 78 */	mr r4, r30
diff --git a/asm/text_7.s b/asm/text_7.s
index 78d4920..c8158a0 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -61831,13 +61831,13 @@ lbl_80258680:
 /* 80258680 002542E0  7C A3 2B 78 */	mr r3, r5
 /* 80258684 002542E4  7F 66 DB 78 */	mr r6, r27
 /* 80258688 002542E8  38 A0 00 00 */	li r5, 0
-/* 8025868C 002542EC  4B F6 ED 25 */	bl func_801C73B0
+/* 8025868C 002542EC  4B F6 ED 25 */	bl __mod2u
 /* 80258690 002542F0  7C 9D 23 78 */	mr r29, r4
 /* 80258694 002542F4  80 79 01 F0 */	lwz r3, 0x1f0(r25)
 /* 80258698 002542F8  80 99 01 F4 */	lwz r4, 0x1f4(r25)
 /* 8025869C 002542FC  7F 66 DB 78 */	mr r6, r27
 /* 802586A0 00254300  38 A0 00 00 */	li r5, 0
-/* 802586A4 00254304  4B F6 ED 0D */	bl func_801C73B0
+/* 802586A4 00254304  4B F6 ED 0D */	bl __mod2u
 /* 802586A8 00254308  2C 04 00 00 */	cmpwi r4, 0
 /* 802586AC 0025430C  7C 9C 23 78 */	mr r28, r4
 /* 802586B0 00254310  40 82 00 08 */	bne lbl_802586B8
@@ -61871,7 +61871,7 @@ lbl_80258708:
 /* 80258714 00254374  38 A0 00 00 */	li r5, 0
 /* 80258718 00254378  80 64 01 B0 */	lwz r3, 0x1b0(r4)
 /* 8025871C 0025437C  80 84 01 B4 */	lwz r4, 0x1b4(r4)
-/* 80258720 00254380  4B F6 EC 91 */	bl func_801C73B0
+/* 80258720 00254380  4B F6 EC 91 */	bl __mod2u
 /* 80258724 00254384  57 40 18 38 */	slwi r0, r26, 3
 /* 80258728 00254388  7C BD 20 10 */	subfc r5, r29, r4
 /* 8025872C 0025438C  7C 99 02 14 */	add r4, r25, r0
@@ -61957,7 +61957,7 @@ lbl_8025884C:
 /* 80258858 002544B8  38 A0 00 00 */	li r5, 0
 /* 8025885C 002544BC  80 64 01 B0 */	lwz r3, 0x1b0(r4)
 /* 80258860 002544C0  80 84 01 B4 */	lwz r4, 0x1b4(r4)
-/* 80258864 002544C4  4B F6 EB 4D */	bl func_801C73B0
+/* 80258864 002544C4  4B F6 EB 4D */	bl __mod2u
 /* 80258868 002544C8  7C 04 F0 10 */	subfc r0, r4, r30
 /* 8025886C 002544CC  7C 03 F9 10 */	subfe r0, r3, r31
 /* 80258870 002544D0  7C 1E F1 10 */	subfe r0, r30, r30
diff --git a/asm/text_7_2.s b/asm/text_7_2.s
index 429b05a..0335fce 100644
--- a/asm/text_7_2.s
+++ b/asm/text_7_2.s
@@ -10184,7 +10184,7 @@ func_80272A04:
 /* 80272A2C 0026E68C  38 A0 00 00 */	li r5, 0
 /* 80272A30 0026E690  54 1A F0 BE */	srwi r26, r0, 2
 /* 80272A34 0026E694  7F 46 D3 78 */	mr r6, r26
-/* 80272A38 0026E698  4B F5 4A 5D */	bl func_801C7494
+/* 80272A38 0026E698  4B F5 4A 5D */	bl __mod2i
 /* 80272A3C 0026E69C  38 E0 00 00 */	li r7, 0
 /* 80272A40 0026E6A0  6C 60 80 00 */	xoris r0, r3, 0x8000
 /* 80272A44 0026E6A4  6C E6 80 00 */	xoris r6, r7, 0x8000
@@ -10209,7 +10209,7 @@ lbl_80272A6C:
 /* 80272A8C 0026E6EC  4B F5 47 ED */	bl __div2i
 /* 80272A90 0026E6F0  38 C0 03 E8 */	li r6, 0x3e8
 /* 80272A94 0026E6F4  38 A0 00 00 */	li r5, 0
-/* 80272A98 0026E6F8  4B F5 49 FD */	bl func_801C7494
+/* 80272A98 0026E6F8  4B F5 49 FD */	bl __mod2i
 /* 80272A9C 0026E6FC  90 9D 00 24 */	stw r4, 0x24(r29)
 /* 80272AA0 0026E700  3F 40 80 00 */	lis r26, 0x800000F8@ha
 /* 80272AA4 0026E704  3C 80 10 62 */	lis r4, 0x10624DD3@ha
@@ -10224,7 +10224,7 @@ lbl_80272A6C:
 /* 80272AC8 0026E728  4B F5 47 B1 */	bl __div2i
 /* 80272ACC 0026E72C  38 C0 03 E8 */	li r6, 0x3e8
 /* 80272AD0 0026E730  38 A0 00 00 */	li r5, 0
-/* 80272AD4 0026E734  4B F5 49 C1 */	bl func_801C7494
+/* 80272AD4 0026E734  4B F5 49 C1 */	bl __mod2i
 /* 80272AD8 0026E738  90 9D 00 20 */	stw r4, 0x20(r29)
 /* 80272ADC 0026E73C  7C 9E D8 10 */	subfc r4, r30, r27
 /* 80272AE0 0026E740  7C 7F E1 10 */	subfe r3, r31, r28
@@ -10245,7 +10245,7 @@ lbl_80272A6C:
 /* 80272B1C 0026E77C  7F 43 D3 78 */	mr r3, r26
 /* 80272B20 0026E780  7F 44 00 14 */	addc r26, r4, r0
 /* 80272B24 0026E784  7F 84 E3 78 */	mr r4, r28
-/* 80272B28 0026E788  4B F5 49 6D */	bl func_801C7494
+/* 80272B28 0026E788  4B F5 49 6D */	bl __mod2i
 /* 80272B2C 0026E78C  2C 04 00 00 */	cmpwi r4, 0
 /* 80272B30 0026E790  7C 9F 23 78 */	mr r31, r4
 /* 80272B34 0026E794  40 80 00 10 */	bge lbl_80272B44
@@ -15545,7 +15545,7 @@ lbl_80277564:
 /* 80277570 002731D0  38 80 00 01 */	li r4, 1
 /* 80277574 002731D4  38 60 00 00 */	li r3, 0
 /* 80277578 002731D8  7C 1D 33 2E */	sthx r0, r29, r6
-/* 8027757C 002731DC  4B F5 00 25 */	bl func_801C75A0
+/* 8027757C 002731DC  4B F5 00 25 */	bl __shl2i
 /* 80277580 002731E0  80 0D A8 F8 */	lwz r0, lbl_8063FBB8-_SDA_BASE_(r13)
 /* 80277584 002731E4  7C 65 18 F8 */	nor r5, r3, r3
 /* 80277588 002731E8  80 6D A8 FC */	lwz r3, lbl_8063FBBC-_SDA_BASE_(r13)
@@ -15770,7 +15770,7 @@ lbl_80277888:
 /* 80277898 002734F8  38 80 00 01 */	li r4, 1
 /* 8027789C 002734FC  38 60 00 00 */	li r3, 0
 /* 802778A0 00273500  B0 06 20 00 */	sth r0, 0x2000(r6)
-/* 802778A4 00273504  4B F4 FC FD */	bl func_801C75A0
+/* 802778A4 00273504  4B F4 FC FD */	bl __shl2i
 /* 802778A8 00273508  80 0D A9 08 */	lwz r0, lbl_8063FBC8-_SDA_BASE_(r13)
 /* 802778AC 0027350C  7C 65 18 F8 */	nor r5, r3, r3
 /* 802778B0 00273510  80 6D A9 0C */	lwz r3, lbl_8063FBCC-_SDA_BASE_(r13)
diff --git a/asm/text_8.s b/asm/text_8.s
index 9526746..88a9e80 100644
--- a/asm/text_8.s
+++ b/asm/text_8.s
@@ -49,7 +49,7 @@ lbl_80279738:
 /* 80279744 002753A4  38 80 00 01 */	li r4, 1
 /* 80279748 002753A8  38 60 00 00 */	li r3, 0
 /* 8027974C 002753AC  7C 1D 33 2E */	sthx r0, r29, r6
-/* 80279750 002753B0  4B F4 DE 51 */	bl func_801C75A0
+/* 80279750 002753B0  4B F4 DE 51 */	bl __shl2i
 /* 80279754 002753B4  80 0D A8 F8 */	lwz r0, lbl_8063FBB8-_SDA_BASE_(r13)
 /* 80279758 002753B8  7C 65 18 F8 */	nor r5, r3, r3
 /* 8027975C 002753BC  80 6D A8 FC */	lwz r3, lbl_8063FBBC-_SDA_BASE_(r13)