Merge branch 'master' of https://github.com/doldecomp/pokerevo into label_ctors

5 files changed, 9 insertions, 9 deletions

diff --git a/asm/SDK/OS/OS.s b/asm/SDK/OS/OS.s
index fc69331..e8a8187 100644
--- a/asm/SDK/OS/OS.s
+++ b/asm/SDK/OS/OS.s
@@ -1221,7 +1221,7 @@ lbl_802693F0:
 /* 8026948C 002650EC  4C C6 31 82 */	crclr 6
 /* 80269490 002650F0  48 00 DF B9 */	bl func_80277448
 /* 80269494 002650F4  39 61 00 40 */	addi r11, r1, 0x40
-/* 80269498 002650F8  4B F5 DC C1 */	bl func_801C7158
+/* 80269498 002650F8  4B F5 DC C1 */	bl _restgpr_20
 /* 8026949C 002650FC  80 01 00 44 */	lwz r0, 0x44(r1)
 /* 802694A0 00265100  7C 08 03 A6 */	mtlr r0
 /* 802694A4 00265104  38 21 00 40 */	addi r1, r1, 0x40
diff --git a/asm/SDK/OS/OSAlarm.s b/asm/SDK/OS/OSAlarm.s
index 29c305c..5359257 100644
--- a/asm/SDK/OS/OSAlarm.s
+++ b/asm/SDK/OS/OSAlarm.s
@@ -191,7 +191,7 @@ lbl_80269964:
 /* 80269968 002655C8  4B FF E8 F1 */	bl func_80268258
 lbl_8026996C:
 /* 8026996C 002655CC  39 61 00 30 */	addi r11, r1, 0x30
-/* 80269970 002655D0  4B F5 D7 FD */	bl func_801C716C
+/* 80269970 002655D0  4B F5 D7 FD */	bl _restgpr_25
 /* 80269974 002655D4  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 80269978 002655D8  7C 08 03 A6 */	mtlr r0
 /* 8026997C 002655DC  38 21 00 30 */	addi r1, r1, 0x30
@@ -258,7 +258,7 @@ OSSetPeriodicAlarm:
 /* 80269A58 002656B8  7F E3 FB 78 */	mr r3, r31
 /* 80269A5C 002656BC  48 00 4D 29 */	bl OSRestoreInterrupts
 /* 80269A60 002656C0  39 61 00 20 */	addi r11, r1, 0x20
-/* 80269A64 002656C4  4B F5 D7 0D */	bl func_801C7170
+/* 80269A64 002656C4  4B F5 D7 0D */	bl _restgpr_26
 /* 80269A68 002656C8  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 80269A6C 002656CC  7C 08 03 A6 */	mtlr r0
 /* 80269A70 002656D0  38 21 00 20 */	addi r1, r1, 0x20
diff --git a/asm/SDK/OS/OSContext.s b/asm/SDK/OS/OSContext.s
index d38163c..718a60b 100644
--- a/asm/SDK/OS/OSContext.s
+++ b/asm/SDK/OS/OSContext.s
@@ -547,7 +547,7 @@ lbl_8026B398:
 /* 8026B3B4 00267014  41 80 FF C8 */	blt lbl_8026B37C
 lbl_8026B3B8:
 /* 8026B3B8 00267018  39 61 02 F0 */	addi r11, r1, 0x2f0
-/* 8026B3BC 0026701C  4B F5 BD B1 */	bl func_801C716C
+/* 8026B3BC 0026701C  4B F5 BD B1 */	bl _restgpr_25
 /* 8026B3C0 00267020  80 01 02 F4 */	lwz r0, 0x2f4(r1)
 /* 8026B3C4 00267024  7C 08 03 A6 */	mtlr r0
 /* 8026B3C8 00267028  38 21 02 F0 */	addi r1, r1, 0x2f0
diff --git a/asm/SDK/OS/OSError.s b/asm/SDK/OS/OSError.s
index 77045d2..f6d1b5e 100644
--- a/asm/SDK/OS/OSError.s
+++ b/asm/SDK/OS/OSError.s
@@ -43,7 +43,7 @@ lbl_8026B4E8:
 /* 8026B528 00267188  90 61 00 68 */	stw r3, 0x68(r1)
 /* 8026B52C 0026718C  7F A3 EB 78 */	mr r3, r29
 /* 8026B530 00267190  90 01 00 70 */	stw r0, 0x70(r1)
-/* 8026B534 00267194  4B F6 13 F9 */	bl func_801CC92C
+/* 8026B534 00267194  4B F6 13 F9 */	bl vprintf
 /* 8026B538 00267198  7F 84 E3 78 */	mr r4, r28
 /* 8026B53C 0026719C  7F C5 F3 78 */	mr r5, r30
 /* 8026B540 002671A0  38 7F 00 00 */	addi r3, r31, 0
diff --git a/asm/SDK/OS/OSExec.s b/asm/SDK/OS/OSExec.s
index 49b5eb2..35e59dd 100644
--- a/asm/SDK/OS/OSExec.s
+++ b/asm/SDK/OS/OSExec.s
@@ -34,7 +34,7 @@ lbl_8026BB94:
 /* 8026BBA4 00267804  7F 64 DB 78 */	mr r4, r27
 /* 8026BBA8 00267808  7F 40 D0 50 */	subf r26, r0, r26
 /* 8026BBAC 0026780C  7F 43 D3 78 */	mr r3, r26
-/* 8026BBB0 00267810  4B F6 27 21 */	bl func_801CE2D0
+/* 8026BBB0 00267810  4B F6 27 21 */	bl strcpy
 /* 8026BBB4 00267814  7C 1E D0 50 */	subf r0, r30, r26
 /* 8026BBB8 00267818  90 1C 00 00 */	stw r0, 0(r28)
 lbl_8026BBBC:
@@ -103,7 +103,7 @@ lbl_8026BC94:
 lbl_8026BCA4:
 /* 8026BCA4 00267904  39 61 00 30 */	addi r11, r1, 0x30
 /* 8026BCA8 00267908  38 60 00 01 */	li r3, 1
-/* 8026BCAC 0026790C  4B F5 B4 C1 */	bl func_801C716C
+/* 8026BCAC 0026790C  4B F5 B4 C1 */	bl _restgpr_25
 /* 8026BCB0 00267910  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 8026BCB4 00267914  7C 08 03 A6 */	mtlr r0
 /* 8026BCB8 00267918  38 21 00 30 */	addi r1, r1, 0x30
@@ -880,7 +880,7 @@ lbl_8026C740:
 /* 8026C768 002683C8  7F E3 FB 78 */	mr r3, r31
 /* 8026C76C 002683CC  38 84 71 BC */	addi r4, r4, lbl_804271BC@l
 /* 8026C770 002683D0  38 A0 00 0A */	li r5, 0xa
-/* 8026C774 002683D4  4B F6 1D F5 */	bl func_801CE568
+/* 8026C774 002683D4  4B F6 1D F5 */	bl strncmp
 /* 8026C778 002683D8  7C 03 00 D0 */	neg r0, r3
 /* 8026C77C 002683DC  7C 00 18 78 */	andc r0, r0, r3
 /* 8026C780 002683E0  54 00 0F FF */	rlwinm. r0, r0, 1, 0x1f, 0x1f
@@ -1141,7 +1141,7 @@ __OSBootDol:
 /* 8026CB14 00268774  38 61 00 10 */	addi r3, r1, 0x10
 /* 8026CB18 00268778  38 8D 87 C8 */	addi r4, r13, lbl_8063DA88-_SDA_BASE_
 /* 8026CB1C 0026877C  4C C6 31 82 */	crclr 6
-/* 8026CB20 00268780  4B F5 FF DD */	bl func_801CCAFC
+/* 8026CB20 00268780  4B F5 FF DD */	bl sprintf
 /* 8026CB24 00268784  2C 1E 00 00 */	cmpwi r30, 0
 /* 8026CB28 00268788  3B E0 00 00 */	li r31, 0
 /* 8026CB2C 0026878C  41 82 00 20 */	beq lbl_8026CB4C