Fixed _savegpr etc. (#54)

* renamed func_XXX to _savegpr_XX

* renamed func_XXX to _restgpr_XX

* renamed func_XXX to _savefpr_XX

* renamed func_XXX to _restfpr_XX

* cleanup functions.h and moved intrisics to mwcc.h

* formatting

* cleanup functions.h

* fix bad-formatting from master

Co-authored-by: Julgodis <>

5 files changed, 10 insertions, 10 deletions

diff --git a/asm/J2DGraph/J2DMaterialFactory.s b/asm/J2DGraph/J2DMaterialFactory.s
index 6ab626b29a..b96307c0dc 100644
--- a/asm/J2DGraph/J2DMaterialFactory.s
+++ b/asm/J2DGraph/J2DMaterialFactory.s
@@ -168,7 +168,7 @@ J2DMaterialFactory_NS_create:
 /* 802F2D20 002EFC60  7C 08 02 A6 */	mflr r0
 /* 802F2D24 002EFC64  90 01 03 D4 */	stw r0, 0x3d4(r1)
 /* 802F2D28 002EFC68  39 61 03 D0 */	addi r11, r1, 0x3d0
-/* 802F2D2C 002EFC6C  48 06 F4 89 */	bl func_803621B4
+/* 802F2D2C 002EFC6C  48 06 F4 89 */	bl _savegpr_19
 /* 802F2D30 002EFC70  7C 7E 1B 78 */	mr r30, r3
 /* 802F2D34 002EFC74  7C 9F 23 78 */	mr r31, r4
 /* 802F2D38 002EFC78  7C BD 2B 78 */	mr r29, r5
@@ -780,7 +780,7 @@ lbl_802F3604:
 lbl_802F3610:
 /* 802F3610 002F0550  7F E3 FB 78 */	mr r3, r31
 /* 802F3614 002F0554  39 61 03 D0 */	addi r11, r1, 0x3d0
-/* 802F3618 002F0558  48 06 EB E9 */	bl func_80362200
+/* 802F3618 002F0558  48 06 EB E9 */	bl _restgpr_19
 /* 802F361C 002F055C  80 01 03 D4 */	lwz r0, 0x3d4(r1)
 /* 802F3620 002F0560  7C 08 03 A6 */	mtlr r0
 /* 802F3624 002F0564  38 21 03 D0 */	addi r1, r1, 0x3d0
diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s
index 3f43504af2..8e8fb419d6 100644
--- a/asm/J2DGraph/J2DPicture.s
+++ b/asm/J2DGraph/J2DPicture.s
@@ -868,7 +868,7 @@ lbl_802FCC90:
 /* 802FCCBC 002F9BFC  7D 89 03 A6 */	mtctr r12
 /* 802FCCC0 002F9C00  4E 80 04 21 */	bctrl 
 /* 802FCCC4 002F9C04  39 61 00 80 */	addi r11, r1, 0x80
-/* 802FCCC8 002F9C08  48 06 55 45 */	bl func_8036220C
+/* 802FCCC8 002F9C08  48 06 55 45 */	bl _restgpr_22
 /* 802FCCCC 002F9C0C  80 01 00 84 */	lwz r0, 0x84(r1)
 /* 802FCCD0 002F9C10  7C 08 03 A6 */	mtlr r0
 /* 802FCCD4 002F9C14  38 21 00 80 */	addi r1, r1, 0x80
@@ -2416,7 +2416,7 @@ lbl_802FE348:
 /* 802FE3A4 002FB2E4  DB 81 00 80 */	stfd f28, 0x80(r1)
 /* 802FE3A8 002FB2E8  F3 81 00 88 */	psq_st f28, 136(r1), 0, qr0
 /* 802FE3AC 002FB2EC  39 61 00 80 */	addi r11, r1, 0x80
-/* 802FE3B0 002FB2F0  48 06 3E 0D */	bl func_803621BC
+/* 802FE3B0 002FB2F0  48 06 3E 0D */	bl _savegpr_21
 /* 802FE3B4 002FB2F4  7C 75 1B 78 */	mr r21, r3
 /* 802FE3B8 002FB2F8  FF 80 08 90 */	fmr f28, f1
 /* 802FE3BC 002FB2FC  FF A0 10 90 */	fmr f29, f2
@@ -2550,7 +2550,7 @@ lbl_802FE598:
 /* 802FE5B0 002FB4F0  E3 81 00 88 */	psq_l f28, 136(r1), 0, qr0
 /* 802FE5B4 002FB4F4  CB 81 00 80 */	lfd f28, 0x80(r1)
 /* 802FE5B8 002FB4F8  39 61 00 80 */	addi r11, r1, 0x80
-/* 802FE5BC 002FB4FC  48 06 3C 4D */	bl func_80362208
+/* 802FE5BC 002FB4FC  48 06 3C 4D */	bl _restgpr_21
 /* 802FE5C0 002FB500  80 01 00 C4 */	lwz r0, 0xc4(r1)
 /* 802FE5C4 002FB504  7C 08 03 A6 */	mtlr r0
 /* 802FE5C8 002FB508  38 21 00 C0 */	addi r1, r1, 0xc0
diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s
index 28c993950c..cb24e2773d 100644
--- a/asm/J2DGraph/J2DPictureEx.s
+++ b/asm/J2DGraph/J2DPictureEx.s
@@ -538,7 +538,7 @@ lbl_80303E24:
 /* 80303E3C 00300D7C  E3 81 00 88 */	psq_l f28, 136(r1), 0, qr0
 /* 80303E40 00300D80  CB 81 00 80 */	lfd f28, 0x80(r1)
 /* 80303E44 00300D84  39 61 00 80 */	addi r11, r1, 0x80
-/* 80303E48 00300D88  48 05 E3 C9 */	bl func_80362210
+/* 80303E48 00300D88  48 05 E3 C9 */	bl _restgpr_23
 /* 80303E4C 00300D8C  80 01 00 C4 */	lwz r0, 0xc4(r1)
 /* 80303E50 00300D90  7C 08 03 A6 */	mtlr r0
 /* 80303E54 00300D94  38 21 00 C0 */	addi r1, r1, 0xc0
diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s
index 5f6d79d615..df7f07a8b7 100644
--- a/asm/J2DGraph/J2DPrint.s
+++ b/asm/J2DGraph/J2DPrint.s
@@ -616,7 +616,7 @@ J2DPrint_NS_parse:
 /* 802F4BA0 002F1AE0  DA C1 00 80 */	stfd f22, 0x80(r1)
 /* 802F4BA4 002F1AE4  F2 C1 00 88 */	psq_st f22, 136(r1), 0, qr0
 /* 802F4BA8 002F1AE8  39 61 00 80 */	addi r11, r1, 0x80
-/* 802F4BAC 002F1AEC  48 06 D6 0D */	bl func_803621B8
+/* 802F4BAC 002F1AEC  48 06 D6 0D */	bl _savegpr_20
 /* 802F4BB0 002F1AF0  7C 74 1B 78 */	mr r20, r3
 /* 802F4BB4 002F1AF4  90 81 00 08 */	stw r4, 8(r1)
 /* 802F4BB8 002F1AF8  7C B5 2B 78 */	mr r21, r5
@@ -1106,7 +1106,7 @@ lbl_802F5280:
 /* 802F52C8 002F2208  E2 C1 00 88 */	psq_l f22, 136(r1), 0, qr0
 /* 802F52CC 002F220C  CA C1 00 80 */	lfd f22, 0x80(r1)
 /* 802F52D0 002F2210  39 61 00 80 */	addi r11, r1, 0x80
-/* 802F52D4 002F2214  48 06 CF 31 */	bl func_80362204
+/* 802F52D4 002F2214  48 06 CF 31 */	bl _restgpr_20
 /* 802F52D8 002F2218  80 01 01 24 */	lwz r0, 0x124(r1)
 /* 802F52DC 002F221C  7C 08 03 A6 */	mtlr r0
 /* 802F52E0 002F2220  38 21 01 20 */	addi r1, r1, 0x120
diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s
index 99eef795c1..87504a9959 100644
--- a/asm/J2DGraph/J2DWindowEx.s
+++ b/asm/J2DGraph/J2DWindowEx.s
@@ -1870,7 +1870,7 @@ lbl_8030285C:
 /* 80302878 002FF7B8  7C 08 02 A6 */	mflr r0
 /* 8030287C 002FF7BC  90 01 00 54 */	stw r0, 0x54(r1)
 /* 80302880 002FF7C0  39 61 00 50 */	addi r11, r1, 0x50
-/* 80302884 002FF7C4  48 05 F9 35 */	bl func_803621B8
+/* 80302884 002FF7C4  48 05 F9 35 */	bl _savegpr_20
 /* 80302888 002FF7C8  7C 7D 1B 78 */	mr r29, r3
 /* 8030288C 002FF7CC  7C 9E 23 78 */	mr r30, r4
 /* 80302890 002FF7D0  7C BF 2B 78 */	mr r31, r5
@@ -1989,7 +1989,7 @@ lbl_80302A30:
 /* 80302A30 002FF970  38 60 00 01 */	li r3, 1
 lbl_80302A34:
 /* 80302A34 002FF974  39 61 00 50 */	addi r11, r1, 0x50
-/* 80302A38 002FF978  48 05 F7 CD */	bl func_80362204
+/* 80302A38 002FF978  48 05 F7 CD */	bl _restgpr_20
 /* 80302A3C 002FF97C  80 01 00 54 */	lwz r0, 0x54(r1)
 /* 80302A40 002FF980  7C 08 03 A6 */	mtlr r0
 /* 80302A44 002FF984  38 21 00 50 */	addi r1, r1, 0x50