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 <>
author: Jonathan Wase <jonathan@familjenwase.se> 2021-01-03 05:15:12 +0100
committer: GitHub <noreply@github.com> 2021-01-02 23:15:12 -0500
commit: d2e9db37484e64f05830aad7b7e59f48139639f2 (patch)
tree: 9c0b5d84e6305a71901b3cca22f320228d4cf02b /include
parent: 609891bc25ed4341312a056b869f0a9b5619d875 (diff)
105 files changed, 254 insertions, 276 deletions
diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
index 35d90e7b20..1355ccc768 100644
--- a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
@@ -3,6 +3,6 @@
 
 #include "global.h"
 
-class J2DPicture{};
+class J2DPicture {};
 
 #endif
 \ No newline at end of file
diff --git a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
index 15d6edf34c..d5055148f3 100644
--- a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
@@ -3,6 +3,6 @@
 
 #include "global.h"
 
-class J2DTextBox{};
+class J2DTextBox {};
 
 #endif
 \ No newline at end of file
diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s b/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s
index 5501214b51..9addc12d7a 100644
--- a/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s
+++ b/include/JSystem/JKernel/JKRAram/asm/func_802D233C.s
@@ -177,7 +177,7 @@ lbl_802D2590:
 /* 802D2598 002CF4D8  93 FC 00 00 */	stw r31, 0(r28)
 lbl_802D259C:
 /* 802D259C 002CF4DC  39 61 00 30 */	addi r11, r1, 0x30
-/* 802D25A0 002CF4E0  48 08 FC 71 */	bl func_80362210
+/* 802D25A0 002CF4E0  48 08 FC 71 */	bl _restgpr_23
 /* 802D25A4 002CF4E4  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802D25A8 002CF4E8  7C 08 03 A6 */	mtlr r0
 /* 802D25AC 002CF4EC  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s b/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s
index ec0652f155..ca7128a24b 100644
--- a/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s
+++ b/include/JSystem/JKernel/JKRAram/asm/func_802D25B4.s
@@ -172,7 +172,7 @@ lbl_802D2814:
 /* 802D2814 002CF754  7F 43 D3 78 */	mr r3, r26
 lbl_802D2818:
 /* 802D2818 002CF758  39 61 00 70 */	addi r11, r1, 0x70
-/* 802D281C 002CF75C  48 08 F9 F1 */	bl func_8036220C
+/* 802D281C 002CF75C  48 08 F9 F1 */	bl _restgpr_22
 /* 802D2820 002CF760  80 01 00 74 */	lwz r0, 0x74(r1)
 /* 802D2824 002CF764  7C 08 03 A6 */	mtlr r0
 /* 802D2828 002CF768  38 21 00 70 */	addi r1, r1, 0x70
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s
index fa5b19aa5a..118b59f377 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s
+++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s
@@ -177,7 +177,7 @@ lbl_802DB3BC:
 /* 802DB3CC 002D830C  38 60 00 00 */	li r3, 0
 lbl_802DB3D0:
 /* 802DB3D0 002D8310  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DB3D4 002D8314  48 08 6E 3D */	bl func_80362210
+/* 802DB3D4 002D8314  48 08 6E 3D */	bl _restgpr_23
 /* 802DB3D8 002D8318  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802DB3DC 002D831C  7C 08 03 A6 */	mtlr r0
 /* 802DB3E0 002D8320  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s
index aa5c22e22b..804b88def1 100644
--- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s
+++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s
@@ -44,7 +44,7 @@ lbl_802D9C00:
 /* 802D9C38 002D6B78  7F E3 FB 78 */	mr r3, r31
 lbl_802D9C3C:
 /* 802D9C3C 002D6B7C  39 61 01 30 */	addi r11, r1, 0x130
-/* 802D9C40 002D6B80  48 08 85 D1 */	bl func_80362210
+/* 802D9C40 002D6B80  48 08 85 D1 */	bl _restgpr_23
 /* 802D9C44 002D6B84  80 01 01 34 */	lwz r0, 0x134(r1)
 /* 802D9C48 002D6B88  7C 08 03 A6 */	mtlr r0
 /* 802D9C4C 002D6B8C  38 21 01 30 */	addi r1, r1, 0x130
diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s
index 9d7eeebecb..b61001b794 100644
--- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s
+++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s
@@ -44,7 +44,7 @@ lbl_802D9CBC:
 /* 802D9CF4 002D6C34  7F E3 FB 78 */	mr r3, r31
 lbl_802D9CF8:
 /* 802D9CF8 002D6C38  39 61 01 30 */	addi r11, r1, 0x130
-/* 802D9CFC 002D6C3C  48 08 85 15 */	bl func_80362210
+/* 802D9CFC 002D6C3C  48 08 85 15 */	bl _restgpr_23
 /* 802D9D00 002D6C40  80 01 01 34 */	lwz r0, 0x134(r1)
 /* 802D9D04 002D6C44  7C 08 03 A6 */	mtlr r0
 /* 802D9D08 002D6C48  38 21 01 30 */	addi r1, r1, 0x130
diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s
index 8df2e794c7..903a0154d5 100644
--- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s
+++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s
@@ -4,7 +4,7 @@
 /* 802D9D14 002D6C54  7C 08 02 A6 */	mflr r0
 /* 802D9D18 002D6C58  90 01 00 C4 */	stw r0, 0xc4(r1)
 /* 802D9D1C 002D6C5C  39 61 00 C0 */	addi r11, r1, 0xc0
-/* 802D9D20 002D6C60  48 08 84 91 */	bl func_803621B0
+/* 802D9D20 002D6C60  48 08 84 91 */	bl _savegpr_18
 /* 802D9D24 002D6C64  7C 76 1B 78 */	mr r22, r3
 /* 802D9D28 002D6C68  7C 9C 23 78 */	mr r28, r4
 /* 802D9D2C 002D6C6C  7C B5 2B 78 */	mr r21, r5
@@ -350,7 +350,7 @@ lbl_802DA1C8:
 /* 802DA1C8 002D7108  38 60 00 00 */	li r3, 0
 lbl_802DA1CC:
 /* 802DA1CC 002D710C  39 61 00 C0 */	addi r11, r1, 0xc0
-/* 802DA1D0 002D7110  48 08 80 2D */	bl func_803621FC
+/* 802DA1D0 002D7110  48 08 80 2D */	bl _restgpr_18
 /* 802DA1D4 002D7114  80 01 00 C4 */	lwz r0, 0xc4(r1)
 /* 802DA1D8 002D7118  7C 08 03 A6 */	mtlr r0
 /* 802DA1DC 002D711C  38 21 00 C0 */	addi r1, r1, 0xc0
diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
index 155f8fe411..088b749f98 100644
--- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
+++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
@@ -189,7 +189,7 @@ lbl_802E0B9C:
 /* 802E0B9C 002DDADC  48 00 04 09 */	bl checkResetSwitch__10JUTGamePadFv
 /* 802E0BA0 002DDAE0  80 6D 8F 60 */	lwz r3, _sRumbleSupported-_SDA_BASE_(r13)
 /* 802E0BA4 002DDAE4  39 61 00 40 */	addi r11, r1, 0x40
-/* 802E0BA8 002DDAE8  48 08 16 65 */	bl func_8036220C
+/* 802E0BA8 002DDAE8  48 08 16 65 */	bl _restgpr_22
 /* 802E0BAC 002DDAEC  80 01 00 44 */	lwz r0, 0x44(r1)
 /* 802E0BB0 002DDAF0  7C 08 03 A6 */	mtlr r0
 /* 802E0BB4 002DDAF4  38 21 00 40 */	addi r1, r1, 0x40
diff --git a/include/SComponent/c_cc_s/c_cc_s.h b/include/SComponent/c_cc_s/c_cc_s.h
index 06ce04692a..eee254b996 100644
--- a/include/SComponent/c_cc_s/c_cc_s.h
+++ b/include/SComponent/c_cc_s/c_cc_s.h
@@ -1,8 +1,8 @@
 #ifndef __C_CC_S_H_
 #define __C_CC_S_H_
 
-#include "global.h"
 #include "SComponent/c_cc_d/c_cc_d.h"
+#include "global.h"
 
 class cCcS {
 public:
diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s
index 0c94afac0e..0b916e6722 100644
--- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s
+++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s
@@ -4,7 +4,7 @@
 /* 802B6B04 002B3A44  DB E1 02 80 */	stfd f31, 0x280(r1)
 /* 802B6B08 002B3A48  F3 E1 02 88 */	psq_st f31, 648(r1), 0, 0
 /* 802B6B0C 002B3A4C  39 61 02 80 */	addi r11, r1, 0x280
-/* 802B6B10 002B3A50  48 0A B6 99 */	bl func_803621A8
+/* 802B6B10 002B3A50  48 0A B6 99 */	bl _savegpr_16
 /* 802B6B14 002B3A54  7C 7B 1B 78 */	mr r27, r3
 /* 802B6B18 002B3A58  7C 92 23 78 */	mr r18, r4
 /* 802B6B1C 002B3A5C  7C BA 2B 78 */	mr r26, r5
@@ -3191,7 +3191,7 @@ lbl_802B9938:
 /* 802B993C 002B687C  E3 E1 02 88 */	psq_l f31, 648(r1), 0, 0
 /* 802B9940 002B6880  CB E1 02 80 */	lfd f31, 0x280(r1)
 /* 802B9944 002B6884  39 61 02 80 */	addi r11, r1, 0x280
-/* 802B9948 002B6888  48 0A 88 AD */	bl func_803621F4
+/* 802B9948 002B6888  48 0A 88 AD */	bl _restgpr_16
 /* 802B994C 002B688C  80 01 02 94 */	lwz r0, 0x294(r1)
 /* 802B9950 002B6890  7C 08 03 A6 */	mtlr r0
 /* 802B9954 002B6894  38 21 02 90 */	addi r1, r1, 0x290
diff --git a/include/d/d_a/d_a_alink/asm/func_8009F034.s b/include/d/d_a/d_a_alink/asm/func_8009F034.s
index d9b92c6af4..00b39a207d 100644
--- a/include/d/d_a/d_a_alink/asm/func_8009F034.s
+++ b/include/d/d_a/d_a_alink/asm/func_8009F034.s
@@ -12,7 +12,7 @@
 /* 8009F060 0009BFA0  DB 61 01 30 */	stfd f27, 0x130(r1)
 /* 8009F064 0009BFA4  F3 61 01 38 */	psq_st f27, 312(r1), 0, 0
 /* 8009F068 0009BFA8  39 61 01 30 */	addi r11, r1, 0x130
-/* 8009F06C 0009BFAC  48 2C 31 4D */	bl func_803621B8
+/* 8009F06C 0009BFAC  48 2C 31 4D */	bl _savegpr_20
 /* 8009F070 0009BFB0  7C 7F 1B 78 */	mr r31, r3
 /* 8009F074 0009BFB4  80 63 20 60 */	lwz r3, 0x2060(r3)
 /* 8009F078 0009BFB8  88 03 00 00 */	lbz r0, 0(r3)
@@ -1099,7 +1099,7 @@ lbl_8009FFB8:
 /* 8009FFD8 0009CF18  E3 61 01 38 */	psq_l f27, 312(r1), 0, 0
 /* 8009FFDC 0009CF1C  CB 61 01 30 */	lfd f27, 0x130(r1)
 /* 8009FFE0 0009CF20  39 61 01 30 */	addi r11, r1, 0x130
-/* 8009FFE4 0009CF24  48 2C 22 21 */	bl func_80362204
+/* 8009FFE4 0009CF24  48 2C 22 21 */	bl _restgpr_20
 /* 8009FFE8 0009CF28  80 01 01 84 */	lwz r0, 0x184(r1)
 /* 8009FFEC 0009CF2C  7C 08 03 A6 */	mtlr r0
 /* 8009FFF0 0009CF30  38 21 01 80 */	addi r1, r1, 0x180
diff --git a/include/d/d_a/d_a_alink/asm/func_800A142C.s b/include/d/d_a/d_a_alink/asm/func_800A142C.s
index e82e4ce1b6..4604a1b9f5 100644
--- a/include/d/d_a/d_a_alink/asm/func_800A142C.s
+++ b/include/d/d_a/d_a_alink/asm/func_800A142C.s
@@ -2,7 +2,7 @@
 /* 800A1430 0009E370  7C 08 02 A6 */ mflr r0
 /* 800A1434 0009E374  90 01 00 A4 */ stw r0, 0xa4(r1)
 /* 800A1438 0009E378  39 61 00 A0 */ addi r11, r1, 0xa0
-/* 800A143C 0009E37C  48 2C 0D 7D */ bl func_803621B8
+/* 800A143C 0009E37C  48 2C 0D 7D */ bl _savegpr_20
 /* 800A1440 0009E380  7C 7F 1B 78 */ mr r31, r3
 /* 800A1444 0009E384  7C 99 23 78 */ mr r25, r4
 /* 800A1448 0009E388  7C BB 2B 78 */ mr r27, r5
@@ -474,7 +474,7 @@ lbl_800A1AC8:
 lbl_800A1AD0:
 /* 800A1AD0 0009EA10  7F 03 C3 78 */ mr r3, r24
 /* 800A1AD4 0009EA14  39 61 00 A0 */ addi r11, r1, 0xa0
-/* 800A1AD8 0009EA18  48 2C 07 2D */ bl func_80362204
+/* 800A1AD8 0009EA18  48 2C 07 2D */ bl _restgpr_20
 /* 800A1ADC 0009EA1C  80 01 00 A4 */ lwz r0, 0xa4(r1)
 /* 800A1AE0 0009EA20  7C 08 03 A6 */ mtlr r0
 /* 800A1AE4 0009EA24  38 21 00 A0 */ addi r1, r1, 0xa0
diff --git a/include/d/d_a/d_a_alink/asm/func_800A2710.s b/include/d/d_a/d_a_alink/asm/func_800A2710.s
index 09a0aa96a6..0dc47d62f1 100644
--- a/include/d/d_a/d_a_alink/asm/func_800A2710.s
+++ b/include/d/d_a/d_a_alink/asm/func_800A2710.s
@@ -2,7 +2,7 @@
 /* 800A2714 0009F654  7C 08 02 A6 */ mflr r0
 /* 800A2718 0009F658  90 01 00 64 */ stw r0, 0x64(r1)
 /* 800A271C 0009F65C  39 61 00 60 */ addi r11, r1, 0x60
-/* 800A2720 0009F660  48 2B FA 89 */ bl func_803621A8
+/* 800A2720 0009F660  48 2B FA 89 */ bl _savegpr_16
 /* 800A2724 0009F664  7C 79 1B 78 */ mr r25, r3
 /* 800A2728 0009F668  3A 79 2A 4C */ addi r19, r25, 0x2a4c
 /* 800A272C 0009F66C  3A 80 00 00 */ li r20, 0
@@ -180,7 +180,7 @@ lbl_800A282C:
 /* 800A29C0 0009F900  38 60 00 01 */ li r3, 1
 lbl_800A29C4:
 /* 800A29C4 0009F904  39 61 00 60 */ addi r11, r1, 0x60
-/* 800A29C8 0009F908  48 2B F8 2D */ bl func_803621F4
+/* 800A29C8 0009F908  48 2B F8 2D */ bl _restgpr_16
 /* 800A29CC 0009F90C  80 01 00 64 */ lwz r0, 0x64(r1)
 /* 800A29D0 0009F910  7C 08 03 A6 */ mtlr r0
 /* 800A29D4 0009F914  38 21 00 60 */ addi r1, r1, 0x60
diff --git a/include/d/d_a/d_a_alink/asm/func_800A3430.s b/include/d/d_a/d_a_alink/asm/func_800A3430.s
index 4616833188..2ad1060757 100644
--- a/include/d/d_a/d_a_alink/asm/func_800A3430.s
+++ b/include/d/d_a/d_a_alink/asm/func_800A3430.s
@@ -376,7 +376,7 @@ lbl_800A3988:
 /* 800A3998 000A08D8  E3 A1 00 E8 */ psq_l f29, 232(r1), 0, 0
 /* 800A399C 000A08DC  CB A1 00 E0 */ lfd f29, 0xe0(r1)
 /* 800A39A0 000A08E0  39 61 00 E0 */ addi r11, r1, 0xe0
-/* 800A39A4 000A08E4  48 2B E8 6D */ bl func_80362210
+/* 800A39A4 000A08E4  48 2B E8 6D */ bl _restgpr_23
 /* 800A39A8 000A08E8  80 01 01 14 */ lwz r0, 0x114(r1)
 /* 800A39AC 000A08EC  7C 08 03 A6 */ mtlr r0
 /* 800A39B0 000A08F0  38 21 01 10 */ addi r1, r1, 0x110
diff --git a/include/d/d_a/d_a_alink/asm/func_800A39B8.s b/include/d/d_a/d_a_alink/asm/func_800A39B8.s
index b8fa807147..c9c72faf7e 100644
--- a/include/d/d_a/d_a_alink/asm/func_800A39B8.s
+++ b/include/d/d_a/d_a_alink/asm/func_800A39B8.s
@@ -187,7 +187,7 @@ lbl_800A3C6C:
 /* 800A3C6C 000A0BAC  E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0
 /* 800A3C70 000A0BB0  CB E1 00 70 */ lfd f31, 0x70(r1)
 /* 800A3C74 000A0BB4  39 61 00 70 */ addi r11, r1, 0x70
-/* 800A3C78 000A0BB8  48 2B E5 99 */ bl func_80362210
+/* 800A3C78 000A0BB8  48 2B E5 99 */ bl _restgpr_23
 /* 800A3C7C 000A0BBC  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 800A3C80 000A0BC0  7C 08 03 A6 */ mtlr r0
 /* 800A3C84 000A0BC4  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s
index 04e9c8715f..be8461a65f 100644
--- a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s
+++ b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s
@@ -557,7 +557,7 @@ lbl_800A54D0:
 /* 800A54D8 000A2418  90 17 05 7C */ stw r0, 0x57c(r23)
 lbl_800A54DC:
 /* 800A54DC 000A241C  39 61 00 30 */ addi r11, r1, 0x30
-/* 800A54E0 000A2420  48 2B CD 2D */ bl func_8036220C
+/* 800A54E0 000A2420  48 2B CD 2D */ bl _restgpr_22
 /* 800A54E4 000A2424  80 01 00 34 */ lwz r0, 0x34(r1)
 /* 800A54E8 000A2428  7C 08 03 A6 */ mtlr r0
 /* 800A54EC 000A242C  38 21 00 30 */ addi r1, r1, 0x30
diff --git a/include/d/d_a/d_a_alink/asm/func_800ADE14.s b/include/d/d_a/d_a_alink/asm/func_800ADE14.s
index 3c1989fb11..3bb67bc2b1 100644
--- a/include/d/d_a/d_a_alink/asm/func_800ADE14.s
+++ b/include/d/d_a/d_a_alink/asm/func_800ADE14.s
@@ -18,7 +18,7 @@
 /* 800ADE58 000AAD98  DB 01 00 80 */ stfd f24, 0x80(r1)
 /* 800ADE5C 000AAD9C  F3 01 00 88 */ psq_st f24, 136(r1), 0, 0
 /* 800ADE60 000AADA0  39 61 00 80 */ addi r11, r1, 0x80
-/* 800ADE64 000AADA4  48 2B 43 59 */ bl func_803621BC
+/* 800ADE64 000AADA4  48 2B 43 59 */ bl _savegpr_21
 /* 800ADE68 000AADA8  7C 7F 1B 78 */ mr r31, r3
 /* 800ADE6C 000AADAC  FF 20 08 90 */ fmr f25, f1
 /* 800ADE70 000AADB0  3C 80 80 39 */ lis r4, lbl_8038D658@ha
@@ -866,7 +866,7 @@ lbl_800AEA18:
 /* 800AEA50 000AB990  E3 01 00 88 */ psq_l f24, 136(r1), 0, 0
 /* 800AEA54 000AB994  CB 01 00 80 */ lfd f24, 0x80(r1)
 /* 800AEA58 000AB998  39 61 00 80 */ addi r11, r1, 0x80
-/* 800AEA5C 000AB99C  48 2B 37 AD */ bl func_80362208
+/* 800AEA5C 000AB99C  48 2B 37 AD */ bl _restgpr_21
 /* 800AEA60 000AB9A0  80 01 01 04 */ lwz r0, 0x104(r1)
 /* 800AEA64 000AB9A4  7C 08 03 A6 */ mtlr r0
 /* 800AEA68 000AB9A8  38 21 01 00 */ addi r1, r1, 0x100
diff --git a/include/d/d_a/d_a_alink/asm/func_800B02BC.s b/include/d/d_a/d_a_alink/asm/func_800B02BC.s
index db7d5fa9dc..69deeefe35 100644
--- a/include/d/d_a/d_a_alink/asm/func_800B02BC.s
+++ b/include/d/d_a/d_a_alink/asm/func_800B02BC.s
@@ -1218,7 +1218,7 @@ lbl_800B140C:
 /* 800B144C 000AE38C  E2 E1 00 E8 */ psq_l f23, 232(r1), 0, 0
 /* 800B1450 000AE390  CA E1 00 E0 */ lfd f23, 0xe0(r1)
 /* 800B1454 000AE394  39 61 00 E0 */ addi r11, r1, 0xe0
-/* 800B1458 000AE398  48 2B 0D B9 */ bl func_80362210
+/* 800B1458 000AE398  48 2B 0D B9 */ bl _restgpr_23
 /* 800B145C 000AE39C  80 01 01 74 */ lwz r0, 0x174(r1)
 /* 800B1460 000AE3A0  7C 08 03 A6 */ mtlr r0
 /* 800B1464 000AE3A4  38 21 01 70 */ addi r1, r1, 0x170
diff --git a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s
index c38648a601..31166d3fcb 100644
--- a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s
+++ b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s
@@ -1080,7 +1080,7 @@ lbl_800CD770:
 /* 800CD770 000CA6B0  38 60 00 01 */ li r3, 1
 lbl_800CD774:
 /* 800CD774 000CA6B4  39 61 00 A0 */ addi r11, r1, 0xa0
-/* 800CD778 000CA6B8  48 29 4A 99 */ bl func_80362210
+/* 800CD778 000CA6B8  48 29 4A 99 */ bl _restgpr_23
 /* 800CD77C 000CA6BC  80 01 00 A4 */ lwz r0, 0xa4(r1)
 /* 800CD780 000CA6C0  7C 08 03 A6 */ mtlr r0
 /* 800CD784 000CA6C4  38 21 00 A0 */ addi r1, r1, 0xa0
diff --git a/include/d/d_a/d_a_alink/asm/func_800CE294.s b/include/d/d_a/d_a_alink/asm/func_800CE294.s
index b96edf01e5..5ebba76a34 100644
--- a/include/d/d_a/d_a_alink/asm/func_800CE294.s
+++ b/include/d/d_a/d_a_alink/asm/func_800CE294.s
@@ -118,7 +118,7 @@ lbl_800CE41C:
 lbl_800CE44C:
 /* 800CE44C 000CB38C  7F E3 FB 78 */ mr r3, r31
 /* 800CE450 000CB390  39 61 00 30 */ addi r11, r1, 0x30
-/* 800CE454 000CB394  48 29 3D B9 */ bl func_8036220C
+/* 800CE454 000CB394  48 29 3D B9 */ bl _restgpr_22
 /* 800CE458 000CB398  80 01 00 34 */ lwz r0, 0x34(r1)
 /* 800CE45C 000CB39C  7C 08 03 A6 */ mtlr r0
 /* 800CE460 000CB3A0  38 21 00 30 */ addi r1, r1, 0x30
diff --git a/include/d/d_a/d_a_alink/asm/func_800CE468.s b/include/d/d_a/d_a_alink/asm/func_800CE468.s
index bff409dc49..5710d05c52 100644
--- a/include/d/d_a/d_a_alink/asm/func_800CE468.s
+++ b/include/d/d_a/d_a_alink/asm/func_800CE468.s
@@ -118,7 +118,7 @@ lbl_800CE600:
 lbl_800CE60C:
 /* 800CE60C 000CB54C  7F E3 FB 78 */ mr r3, r31
 /* 800CE610 000CB550  39 61 00 30 */ addi r11, r1, 0x30
-/* 800CE614 000CB554  48 29 3B FD */ bl func_80362210
+/* 800CE614 000CB554  48 29 3B FD */ bl _restgpr_23
 /* 800CE618 000CB558  80 01 00 34 */ lwz r0, 0x34(r1)
 /* 800CE61C 000CB55C  7C 08 03 A6 */ mtlr r0
 /* 800CE620 000CB560  38 21 00 30 */ addi r1, r1, 0x30
diff --git a/include/d/d_a/d_a_alink/asm/func_800D7C40.s b/include/d/d_a/d_a_alink/asm/func_800D7C40.s
index f60172650b..cfb7ee333a 100644
--- a/include/d/d_a/d_a_alink/asm/func_800D7C40.s
+++ b/include/d/d_a/d_a_alink/asm/func_800D7C40.s
@@ -1316,7 +1316,7 @@ lbl_800D8EF4:
 /* 800D8F20 000D5E60  48 05 14 11 */ bl daAlink_c_NS_checkWolfBarrierHitReverse
 lbl_800D8F24:
 /* 800D8F24 000D5E64  39 61 00 E0 */ addi r11, r1, 0xe0
-/* 800D8F28 000D5E68  48 28 92 E9 */ bl func_80362210
+/* 800D8F28 000D5E68  48 28 92 E9 */ bl _restgpr_23
 /* 800D8F2C 000D5E6C  80 01 00 E4 */ lwz r0, 0xe4(r1)
 /* 800D8F30 000D5E70  7C 08 03 A6 */ mtlr r0
 /* 800D8F34 000D5E74  38 21 00 E0 */ addi r1, r1, 0xe0
diff --git a/include/d/d_a/d_a_alink/asm/func_800D96DC.s b/include/d/d_a/d_a_alink/asm/func_800D96DC.s
index 68bc28e341..e4716d87e7 100644
--- a/include/d/d_a/d_a_alink/asm/func_800D96DC.s
+++ b/include/d/d_a/d_a_alink/asm/func_800D96DC.s
@@ -2,7 +2,7 @@
 /* 800D96E0 000D6620  7C 08 02 A6 */ mflr r0
 /* 800D96E4 000D6624  90 01 00 54 */ stw r0, 0x54(r1)
 /* 800D96E8 000D6628  39 61 00 50 */ addi r11, r1, 0x50
-/* 800D96EC 000D662C  48 28 8A D1 */ bl func_803621BC
+/* 800D96EC 000D662C  48 28 8A D1 */ bl _savegpr_21
 /* 800D96F0 000D6630  7C 75 1B 78 */ mr r21, r3
 /* 800D96F4 000D6634  7C 96 23 78 */ mr r22, r4
 /* 800D96F8 000D6638  7C B7 2B 78 */ mr r23, r5
@@ -541,7 +541,7 @@ lbl_800D9E6C:
 /* 800D9E6C 000D6DAC  38 60 00 01 */ li r3, 1
 lbl_800D9E70:
 /* 800D9E70 000D6DB0  39 61 00 50 */ addi r11, r1, 0x50
-/* 800D9E74 000D6DB4  48 28 83 95 */ bl func_80362208
+/* 800D9E74 000D6DB4  48 28 83 95 */ bl _restgpr_21
 /* 800D9E78 000D6DB8  80 01 00 54 */ lwz r0, 0x54(r1)
 /* 800D9E7C 000D6DBC  7C 08 03 A6 */ mtlr r0
 /* 800D9E80 000D6DC0  38 21 00 50 */ addi r1, r1, 0x50
diff --git a/include/d/d_a/d_a_alink/asm/func_80107900.s b/include/d/d_a/d_a_alink/asm/func_80107900.s
index 372ae0d20c..247ac3cf5a 100644
--- a/include/d/d_a/d_a_alink/asm/func_80107900.s
+++ b/include/d/d_a/d_a_alink/asm/func_80107900.s
@@ -16,7 +16,7 @@
 /* 8010793C 0010487C  DB 21 00 F0 */ stfd f25, 0xf0(r1)
 /* 80107940 00104880  F3 21 00 F8 */ psq_st f25, 248(r1), 0, 0
 /* 80107944 00104884  39 61 00 F0 */ addi r11, r1, 0xf0
-/* 80107948 00104888  48 25 A8 75 */ bl func_803621BC
+/* 80107948 00104888  48 25 A8 75 */ bl _savegpr_21
 /* 8010794C 0010488C  83 A3 00 0C */ lwz r29, 0xc(r3)
 /* 80107950 00104890  80 9D 07 68 */ lwz r4, 0x768(r29)
 /* 80107954 00104894  80 64 00 60 */ lwz r3, 0x60(r4)
@@ -738,7 +738,7 @@ lbl_80108378:
 /* 801083A8 001052E8  E3 21 00 F8 */ psq_l f25, 248(r1), 0, 0
 /* 801083AC 001052EC  CB 21 00 F0 */ lfd f25, 0xf0(r1)
 /* 801083B0 001052F0  39 61 00 F0 */ addi r11, r1, 0xf0
-/* 801083B4 001052F4  48 25 9E 55 */ bl func_80362208
+/* 801083B4 001052F4  48 25 9E 55 */ bl _restgpr_21
 /* 801083B8 001052F8  80 01 01 64 */ lwz r0, 0x164(r1)
 /* 801083BC 001052FC  7C 08 03 A6 */ mtlr r0
 /* 801083C0 00105300  38 21 01 60 */ addi r1, r1, 0x160
diff --git a/include/d/d_a/d_a_alink/asm/func_801171F4.s b/include/d/d_a/d_a_alink/asm/func_801171F4.s
index 7bf45c25cc..50382a49ca 100644
--- a/include/d/d_a/d_a_alink/asm/func_801171F4.s
+++ b/include/d/d_a/d_a_alink/asm/func_801171F4.s
@@ -671,7 +671,7 @@ lbl_80117B58:
 /* 80117B74 00114AB4  4B F9 81 49 */ bl daAlink_c_NS_resetFacePriAnime
 lbl_80117B78:
 /* 80117B78 00114AB8  39 61 00 90 */ addi r11, r1, 0x90
-/* 80117B7C 00114ABC  48 24 A6 95 */ bl func_80362210
+/* 80117B7C 00114ABC  48 24 A6 95 */ bl _restgpr_23
 /* 80117B80 00114AC0  80 01 00 94 */ lwz r0, 0x94(r1)
 /* 80117B84 00114AC4  7C 08 03 A6 */ mtlr r0
 /* 80117B88 00114AC8  38 21 00 90 */ addi r1, r1, 0x90
diff --git a/include/d/d_a/d_a_alink/asm/func_80120880.s b/include/d/d_a/d_a_alink/asm/func_80120880.s
index 021ca7a2f9..9709a8d456 100644
--- a/include/d/d_a/d_a_alink/asm/func_80120880.s
+++ b/include/d/d_a/d_a_alink/asm/func_80120880.s
@@ -166,7 +166,7 @@ lbl_80120AC4:
 /* 80120AE0 0011DA20  E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0
 /* 80120AE4 0011DA24  CB E1 00 50 */ lfd f31, 0x50(r1)
 /* 80120AE8 0011DA28  39 61 00 50 */ addi r11, r1, 0x50
-/* 80120AEC 0011DA2C  48 24 17 25 */ bl func_80362210
+/* 80120AEC 0011DA2C  48 24 17 25 */ bl _restgpr_23
 /* 80120AF0 0011DA30  80 01 00 64 */ lwz r0, 0x64(r1)
 /* 80120AF4 0011DA34  7C 08 03 A6 */ mtlr r0
 /* 80120AF8 0011DA38  38 21 00 60 */ addi r1, r1, 0x60
diff --git a/include/d/d_a/d_a_alink/asm/func_80120B00.s b/include/d/d_a/d_a_alink/asm/func_80120B00.s
index 9f8711a2aa..cea250f421 100644
--- a/include/d/d_a/d_a_alink/asm/func_80120B00.s
+++ b/include/d/d_a/d_a_alink/asm/func_80120B00.s
@@ -176,7 +176,7 @@ lbl_80120D6C:
 /* 80120D90 0011DCD0  E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0
 /* 80120D94 0011DCD4  CB C1 00 60 */ lfd f30, 0x60(r1)
 /* 80120D98 0011DCD8  39 61 00 60 */ addi r11, r1, 0x60
-/* 80120D9C 0011DCDC  48 24 14 71 */ bl func_8036220C
+/* 80120D9C 0011DCDC  48 24 14 71 */ bl _restgpr_22
 /* 80120DA0 0011DCE0  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 80120DA4 0011DCE4  7C 08 03 A6 */ mtlr r0
 /* 80120DA8 0011DCE8  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_a/d_a_alink/asm/func_80120DB0.s b/include/d/d_a/d_a_alink/asm/func_80120DB0.s
index 56d9a43afb..d6647aa2d3 100644
--- a/include/d/d_a/d_a_alink/asm/func_80120DB0.s
+++ b/include/d/d_a/d_a_alink/asm/func_80120DB0.s
@@ -149,7 +149,7 @@ lbl_80120FBC:
 /* 80120FE0 0011DF20  E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0
 /* 80120FE4 0011DF24  CB C1 00 60 */ lfd f30, 0x60(r1)
 /* 80120FE8 0011DF28  39 61 00 60 */ addi r11, r1, 0x60
-/* 80120FEC 0011DF2C  48 24 12 21 */ bl func_8036220C
+/* 80120FEC 0011DF2C  48 24 12 21 */ bl _restgpr_22
 /* 80120FF0 0011DF30  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 80120FF4 0011DF34  7C 08 03 A6 */ mtlr r0
 /* 80120FF8 0011DF38  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_a/d_a_alink/asm/func_80121004.s b/include/d/d_a/d_a_alink/asm/func_80121004.s
index 2a1c53ffe0..9317a67cec 100644
--- a/include/d/d_a/d_a_alink/asm/func_80121004.s
+++ b/include/d/d_a/d_a_alink/asm/func_80121004.s
@@ -112,7 +112,7 @@ lbl_8012118C:
 /* 801211A0 0011E0E0  3B 9C 00 0C */ addi r28, r28, 0xc
 /* 801211A4 0011E0E4  41 80 FE 98 */ blt lbl_8012103C
 /* 801211A8 0011E0E8  39 61 00 70 */ addi r11, r1, 0x70
-/* 801211AC 0011E0EC  48 24 10 61 */ bl func_8036220C
+/* 801211AC 0011E0EC  48 24 10 61 */ bl _restgpr_22
 /* 801211B0 0011E0F0  80 01 00 74 */ lwz r0, 0x74(r1)
 /* 801211B4 0011E0F4  7C 08 03 A6 */ mtlr r0
 /* 801211B8 0011E0F8  38 21 00 70 */ addi r1, r1, 0x70
diff --git a/include/d/d_a/d_a_alink/asm/func_80122F78.s b/include/d/d_a/d_a_alink/asm/func_80122F78.s
index 01e6b43d4a..813afc1d21 100644
--- a/include/d/d_a/d_a_alink/asm/func_80122F78.s
+++ b/include/d/d_a/d_a_alink/asm/func_80122F78.s
@@ -278,7 +278,7 @@ lbl_80123384:
 /* 80123388 001202C8  41 80 FE 9C */ blt lbl_80123224
 lbl_8012338C:
 /* 8012338C 001202CC  39 61 00 80 */ addi r11, r1, 0x80
-/* 80123390 001202D0  48 23 EE 7D */ bl func_8036220C
+/* 80123390 001202D0  48 23 EE 7D */ bl _restgpr_22
 /* 80123394 001202D4  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 80123398 001202D8  7C 08 03 A6 */ mtlr r0
 /* 8012339C 001202DC  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_a/d_a_alink/asm/func_8012589C.s b/include/d/d_a/d_a_alink/asm/func_8012589C.s
index 8d251a1617..a6cb604174 100644
--- a/include/d/d_a/d_a_alink/asm/func_8012589C.s
+++ b/include/d/d_a/d_a_alink/asm/func_8012589C.s
@@ -152,7 +152,7 @@ lbl_80125AE4:
 /* 80125AEC 00122A2C  E3 C1 00 E8 */ psq_l f30, 232(r1), 0, 0
 /* 80125AF0 00122A30  CB C1 00 E0 */ lfd f30, 0xe0(r1)
 /* 80125AF4 00122A34  39 61 00 E0 */ addi r11, r1, 0xe0
-/* 80125AF8 00122A38  48 23 C7 15 */ bl func_8036220C
+/* 80125AF8 00122A38  48 23 C7 15 */ bl _restgpr_22
 /* 80125AFC 00122A3C  80 01 01 04 */ lwz r0, 0x104(r1)
 /* 80125B00 00122A40  7C 08 03 A6 */ mtlr r0
 /* 80125B04 00122A44  38 21 01 00 */ addi r1, r1, 0x100
diff --git a/include/d/d_a/d_a_alink/asm/func_8012AD1C.s b/include/d/d_a/d_a_alink/asm/func_8012AD1C.s
index 18e215cbcf..4698f24b06 100644
--- a/include/d/d_a/d_a_alink/asm/func_8012AD1C.s
+++ b/include/d/d_a/d_a_alink/asm/func_8012AD1C.s
@@ -700,7 +700,7 @@ lbl_8012B704:
 /* 8012B704 00128644  E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0
 /* 8012B708 00128648  CB E1 00 90 */ lfd f31, 0x90(r1)
 /* 8012B70C 0012864C  39 61 00 90 */ addi r11, r1, 0x90
-/* 8012B710 00128650  48 23 6A FD */ bl func_8036220C
+/* 8012B710 00128650  48 23 6A FD */ bl _restgpr_22
 /* 8012B714 00128654  80 01 00 A4 */ lwz r0, 0xa4(r1)
 /* 8012B718 00128658  7C 08 03 A6 */ mtlr r0
 /* 8012B71C 0012865C  38 21 00 A0 */ addi r1, r1, 0xa0
diff --git a/include/d/d_a/d_a_alink/asm/func_8012B724.s b/include/d/d_a/d_a_alink/asm/func_8012B724.s
index 060f6c770a..e73b2df4e6 100644
--- a/include/d/d_a/d_a_alink/asm/func_8012B724.s
+++ b/include/d/d_a/d_a_alink/asm/func_8012B724.s
@@ -14,7 +14,7 @@
 /* 8012B758 00128698  DB 41 01 10 */ stfd f26, 0x110(r1)
 /* 8012B75C 0012869C  F3 41 01 18 */ psq_st f26, 280(r1), 0, 0
 /* 8012B760 001286A0  39 61 01 10 */ addi r11, r1, 0x110
-/* 8012B764 001286A4  48 23 6A 3D */ bl func_803621A0
+/* 8012B764 001286A4  48 23 6A 3D */ bl _savegpr_14
 /* 8012B768 001286A8  7C 6F 1B 78 */ mr r15, r3
 /* 8012B76C 001286AC  80 63 20 60 */ lwz r3, 0x2060(r3)
 /* 8012B770 001286B0  88 03 00 00 */ lbz r0, 0(r3)
@@ -587,7 +587,7 @@ lbl_8012BF60:
 /* 8012BF88 00128EC8  E3 41 01 18 */ psq_l f26, 280(r1), 0, 0
 /* 8012BF8C 00128ECC  CB 41 01 10 */ lfd f26, 0x110(r1)
 /* 8012BF90 00128ED0  39 61 01 10 */ addi r11, r1, 0x110
-/* 8012BF94 00128ED4  48 23 62 59 */ bl func_803621EC
+/* 8012BF94 00128ED4  48 23 62 59 */ bl _restgpr_14
 /* 8012BF98 00128ED8  80 01 01 74 */ lwz r0, 0x174(r1)
 /* 8012BF9C 00128EDC  7C 08 03 A6 */ mtlr r0
 /* 8012BFA0 00128EE0  38 21 01 70 */ addi r1, r1, 0x170
diff --git a/include/d/d_a/d_a_alink/asm/func_8012C30C.s b/include/d/d_a/d_a_alink/asm/func_8012C30C.s
index 0408a33901..3eb59158bc 100644
--- a/include/d/d_a/d_a_alink/asm/func_8012C30C.s
+++ b/include/d/d_a/d_a_alink/asm/func_8012C30C.s
@@ -14,7 +14,7 @@
 /* 8012C340 00129280  DB 41 00 F0 */ stfd f26, 0xf0(r1)
 /* 8012C344 00129284  F3 41 00 F8 */ psq_st f26, 248(r1), 0, 0
 /* 8012C348 00129288  39 61 00 F0 */ addi r11, r1, 0xf0
-/* 8012C34C 0012928C  48 23 5E 59 */ bl func_803621A4
+/* 8012C34C 0012928C  48 23 5E 59 */ bl _savegpr_15
 /* 8012C350 00129290  7C 7C 1B 78 */ mr r28, r3
 /* 8012C354 00129294  88 03 2F BF */ lbz r0, 0x2fbf(r3)
 /* 8012C358 00129298  28 00 00 00 */ cmplwi r0, 0
@@ -546,7 +546,7 @@ lbl_8012CAC4:
 /* 8012CAEC 00129A2C  E3 41 00 F8 */ psq_l f26, 248(r1), 0, 0
 /* 8012CAF0 00129A30  CB 41 00 F0 */ lfd f26, 0xf0(r1)
 /* 8012CAF4 00129A34  39 61 00 F0 */ addi r11, r1, 0xf0
-/* 8012CAF8 00129A38  48 23 56 F9 */ bl func_803621F0
+/* 8012CAF8 00129A38  48 23 56 F9 */ bl _restgpr_15
 /* 8012CAFC 00129A3C  80 01 01 54 */ lwz r0, 0x154(r1)
 /* 8012CB00 00129A40  7C 08 03 A6 */ mtlr r0
 /* 8012CB04 00129A44  38 21 01 50 */ addi r1, r1, 0x150
diff --git a/include/d/d_attention/asm/func_80070E90.s b/include/d/d_attention/asm/func_80070E90.s
index 168acdf576..64e2af91a3 100644
--- a/include/d/d_attention/asm/func_80070E90.s
+++ b/include/d/d_attention/asm/func_80070E90.s
@@ -8,7 +8,7 @@
 /* 80070EAC 0006DDEC  DB A1 00 40 */ stfd f29, 0x40(r1)
 /* 80070EB0 0006DDF0  F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0
 /* 80070EB4 0006DDF4  39 61 00 40 */ addi r11, r1, 0x40
-/* 80070EB8 0006DDF8  48 2F 13 05 */ bl func_803621BC
+/* 80070EB8 0006DDF8  48 2F 13 05 */ bl _savegpr_21
 /* 80070EBC 0006DDFC  7C 77 1B 78 */ mr r23, r3
 /* 80070EC0 0006DE00  7C B8 2B 78 */ mr r24, r5
 /* 80070EC4 0006DE04  FF A0 08 90 */ fmr f29, f1
@@ -151,7 +151,7 @@ lbl_80071090:
 /* 800710A0 0006DFE0  E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0
 /* 800710A4 0006DFE4  CB A1 00 40 */ lfd f29, 0x40(r1)
 /* 800710A8 0006DFE8  39 61 00 40 */ addi r11, r1, 0x40
-/* 800710AC 0006DFEC  48 2F 11 5D */ bl func_80362208
+/* 800710AC 0006DFEC  48 2F 11 5D */ bl _restgpr_21
 /* 800710B0 0006DFF0  80 01 00 74 */ lwz r0, 0x74(r1)
 /* 800710B4 0006DFF4  7C 08 03 A6 */ mtlr r0
 /* 800710B8 0006DFF8  38 21 00 70 */ addi r1, r1, 0x70
diff --git a/include/d/d_attention/asm/func_800716B8.s b/include/d/d_attention/asm/func_800716B8.s
index 0917161487..faaa882703 100644
--- a/include/d/d_attention/asm/func_800716B8.s
+++ b/include/d/d_attention/asm/func_800716B8.s
@@ -132,7 +132,7 @@ lbl_80071884:
 /* 80071884 0006E7C4  7C 19 E8 00 */ cmpw r25, r29
 /* 80071888 0006E7C8  41 80 FF 90 */ blt lbl_80071818
 /* 8007188C 0006E7CC  39 61 00 50 */ addi r11, r1, 0x50
-/* 80071890 0006E7D0  48 2F 09 7D */ bl func_8036220C
+/* 80071890 0006E7D0  48 2F 09 7D */ bl _restgpr_22
 /* 80071894 0006E7D4  80 01 00 54 */ lwz r0, 0x54(r1)
 /* 80071898 0006E7D8  7C 08 03 A6 */ mtlr r0
 /* 8007189C 0006E7DC  38 21 00 50 */ addi r1, r1, 0x50
diff --git a/include/d/d_camera/asm/func_80163D5C.s b/include/d/d_camera/asm/func_80163D5C.s
index 503d159360..70e117cb0a 100644
--- a/include/d/d_camera/asm/func_80163D5C.s
+++ b/include/d/d_camera/asm/func_80163D5C.s
@@ -2,7 +2,7 @@
 /* 80163D60 00160CA0  7C 08 02 A6 */ mflr r0
 /* 80163D64 00160CA4  90 01 00 44 */ stw r0, 0x44(r1)
 /* 80163D68 00160CA8  39 61 00 40 */ addi r11, r1, 0x40
-/* 80163D6C 00160CAC  48 1F E4 51 */ bl func_803621BC
+/* 80163D6C 00160CAC  48 1F E4 51 */ bl _savegpr_21
 /* 80163D70 00160CB0  7C 77 1B 78 */ mr r23, r3
 /* 80163D74 00160CB4  7C 98 23 78 */ mr r24, r4
 /* 80163D78 00160CB8  7F 1D C3 78 */ mr r29, r24
@@ -482,7 +482,7 @@ lbl_80164404:
 lbl_80164430:
 /* 80164430 00161370  7F A3 EB 78 */ mr r3, r29
 /* 80164434 00161374  39 61 00 40 */ addi r11, r1, 0x40
-/* 80164438 00161378  48 1F DD D1 */ bl func_80362208
+/* 80164438 00161378  48 1F DD D1 */ bl _restgpr_21
 /* 8016443C 0016137C  80 01 00 44 */ lwz r0, 0x44(r1)
 /* 80164440 00161380  7C 08 03 A6 */ mtlr r0
 /* 80164444 00161384  38 21 00 40 */ addi r1, r1, 0x40
diff --git a/include/d/d_camera/asm/func_80166764.s b/include/d/d_camera/asm/func_80166764.s
index 6c0c5f94b1..0fa8cd4849 100644
--- a/include/d/d_camera/asm/func_80166764.s
+++ b/include/d/d_camera/asm/func_80166764.s
@@ -1376,7 +1376,7 @@ lbl_80167B30:
 /* 80167B9C 00164ADC  E3 21 06 08 */ psq_l f25, 1544(r1), 0, 0
 /* 80167BA0 00164AE0  CB 21 06 00 */ lfd f25, 0x600(r1)
 /* 80167BA4 00164AE4  39 61 06 00 */ addi r11, r1, 0x600
-/* 80167BA8 00164AE8  48 1F A6 65 */ bl func_8036220C
+/* 80167BA8 00164AE8  48 1F A6 65 */ bl _restgpr_22
 /* 80167BAC 00164AEC  80 01 06 74 */ lwz r0, 0x674(r1)
 /* 80167BB0 00164AF0  7C 08 03 A6 */ mtlr r0
 /* 80167BB4 00164AF4  38 21 06 70 */ addi r1, r1, 0x670
diff --git a/include/d/d_camera/asm/func_80168744.s b/include/d/d_camera/asm/func_80168744.s
index b0db037b30..fed6db50a9 100644
--- a/include/d/d_camera/asm/func_80168744.s
+++ b/include/d/d_camera/asm/func_80168744.s
@@ -38,7 +38,7 @@
 /* 801687D8 00165718  D9 C1 06 20 */ stfd f14, 0x620(r1)
 /* 801687DC 0016571C  F1 C1 06 28 */ psq_st f14, 1576(r1), 0, 0
 /* 801687E0 00165720  39 61 06 20 */ addi r11, r1, 0x620
-/* 801687E4 00165724  48 1F 99 C5 */ bl func_803621A8
+/* 801687E4 00165724  48 1F 99 C5 */ bl _savegpr_16
 /* 801687E8 00165728  7C 7F 1B 78 */ mr r31, r3
 /* 801687EC 0016572C  7C 9E 23 78 */ mr r30, r4
 /* 801687F0 00165730  88 0D 8A B8 */ lbz r0, lbl_80451038-_SDA_BASE_(r13)
@@ -4011,7 +4011,7 @@ lbl_8016C1B4:
 /* 8016C23C 0016917C  E1 C1 06 28 */ psq_l f14, 1576(r1), 0, 0
 /* 8016C240 00169180  C9 C1 06 20 */ lfd f14, 0x620(r1)
 /* 8016C244 00169184  39 61 06 20 */ addi r11, r1, 0x620
-/* 8016C248 00169188  48 1F 5F AD */ bl func_803621F4
+/* 8016C248 00169188  48 1F 5F AD */ bl _restgpr_16
 /* 8016C24C 0016918C  80 01 07 44 */ lwz r0, 0x744(r1)
 /* 8016C250 00169190  7C 08 03 A6 */ mtlr r0
 /* 8016C254 00169194  38 21 07 40 */ addi r1, r1, 0x740
diff --git a/include/d/d_camera/asm/func_8016C384.s b/include/d/d_camera/asm/func_8016C384.s
index 3e3d4ac72b..d676c87d95 100644
--- a/include/d/d_camera/asm/func_8016C384.s
+++ b/include/d/d_camera/asm/func_8016C384.s
@@ -38,7 +38,7 @@
 /* 8016C418 00169358  D9 C1 04 30 */ stfd f14, 0x430(r1)
 /* 8016C41C 0016935C  F1 C1 04 38 */ psq_st f14, 1080(r1), 0, 0
 /* 8016C420 00169360  39 61 04 30 */ addi r11, r1, 0x430
-/* 8016C424 00169364  48 1F 5D 8D */ bl func_803621B0
+/* 8016C424 00169364  48 1F 5D 8D */ bl _savegpr_18
 /* 8016C428 00169368  7C 7E 1B 78 */ mr r30, r3
 /* 8016C42C 0016936C  7C 9F 23 78 */ mr r31, r4
 /* 8016C430 00169370  C3 C3 0A 40 */ lfs f30, 0xa40(r3)
@@ -2188,7 +2188,7 @@ lbl_8016E2B0:
 /* 8016E3F0 0016B330  E1 C1 04 38 */ psq_l f14, 1080(r1), 0, 0
 /* 8016E3F4 0016B334  C9 C1 04 30 */ lfd f14, 0x430(r1)
 /* 8016E3F8 0016B338  39 61 04 30 */ addi r11, r1, 0x430
-/* 8016E3FC 0016B33C  48 1F 3E 01 */ bl func_803621FC
+/* 8016E3FC 0016B33C  48 1F 3E 01 */ bl _restgpr_18
 /* 8016E400 0016B340  80 01 05 54 */ lwz r0, 0x554(r1)
 /* 8016E404 0016B344  7C 08 03 A6 */ mtlr r0
 /* 8016E408 0016B348  38 21 05 50 */ addi r1, r1, 0x550
diff --git a/include/d/d_camera/asm/func_8016E4F4.s b/include/d/d_camera/asm/func_8016E4F4.s
index b80934c2ab..8d61e26162 100644
--- a/include/d/d_camera/asm/func_8016E4F4.s
+++ b/include/d/d_camera/asm/func_8016E4F4.s
@@ -6942,7 +6942,7 @@ lbl_80174D4C:
 /* 80174DF8 00171D38  12 21 00 0C */ psq_lx f17, r1, r0, 0, 0
 /* 80174DFC 00171D3C  CA 21 14 A0 */ lfd f17, 0x14a0(r1)
 /* 80174E00 00171D40  39 61 14 A0 */ addi r11, r1, 0x14a0
-/* 80174E04 00171D44  48 1E D4 09 */ bl func_8036220C
+/* 80174E04 00171D44  48 1E D4 09 */ bl _restgpr_22
 /* 80174E08 00171D48  80 01 15 94 */ lwz r0, 0x1594(r1)
 /* 80174E0C 00171D4C  7C 08 03 A6 */ mtlr r0
 /* 80174E10 00171D50  38 21 15 90 */ addi r1, r1, 0x1590
diff --git a/include/d/d_camera/asm/func_80174ED4.s b/include/d/d_camera/asm/func_80174ED4.s
index 3cc32f1db7..0884c709dd 100644
--- a/include/d/d_camera/asm/func_80174ED4.s
+++ b/include/d/d_camera/asm/func_80174ED4.s
@@ -32,7 +32,7 @@
 /* 80174F50 00171E90  DA 21 03 B0 */ stfd f17, 0x3b0(r1)
 /* 80174F54 00171E94  F2 21 03 B8 */ psq_st f17, 952(r1), 0, 0
 /* 80174F58 00171E98  39 61 03 B0 */ addi r11, r1, 0x3b0
-/* 80174F5C 00171E9C  48 1E D2 61 */ bl func_803621BC
+/* 80174F5C 00171E9C  48 1E D2 61 */ bl _savegpr_21
 /* 80174F60 00171EA0  7C 7F 1B 78 */ mr r31, r3
 /* 80174F64 00171EA4  7C 96 23 78 */ mr r22, r4
 /* 80174F68 00171EA8  80 03 0A F4 */ lwz r0, 0xaf4(r3)
@@ -1184,7 +1184,7 @@ lbl_80175FE4:
 /* 80176054 00172F94  E2 21 03 B8 */ psq_l f17, 952(r1), 0, 0
 /* 80176058 00172F98  CA 21 03 B0 */ lfd f17, 0x3b0(r1)
 /* 8017605C 00172F9C  39 61 03 B0 */ addi r11, r1, 0x3b0
-/* 80176060 00172FA0  48 1E C1 A9 */ bl func_80362208
+/* 80176060 00172FA0  48 1E C1 A9 */ bl _restgpr_21
 /* 80176064 00172FA4  80 01 04 A4 */ lwz r0, 0x4a4(r1)
 /* 80176068 00172FA8  7C 08 03 A6 */ mtlr r0
 /* 8017606C 00172FAC  38 21 04 A0 */ addi r1, r1, 0x4a0
diff --git a/include/d/d_camera/asm/func_80176E00.s b/include/d/d_camera/asm/func_80176E00.s
index add7c60b2b..a979a70d16 100644
--- a/include/d/d_camera/asm/func_80176E00.s
+++ b/include/d/d_camera/asm/func_80176E00.s
@@ -2143,7 +2143,7 @@ lbl_80178DA8:
 /* 80178E30 00175D70  E1 C1 04 78 */ psq_l f14, 1144(r1), 0, 0
 /* 80178E34 00175D74  C9 C1 04 70 */ lfd f14, 0x470(r1)
 /* 80178E38 00175D78  39 61 04 70 */ addi r11, r1, 0x470
-/* 80178E3C 00175D7C  48 1E 93 D1 */ bl func_8036220C
+/* 80178E3C 00175D7C  48 1E 93 D1 */ bl _restgpr_22
 /* 80178E40 00175D80  80 01 05 94 */ lwz r0, 0x594(r1)
 /* 80178E44 00175D84  7C 08 03 A6 */ mtlr r0
 /* 80178E48 00175D88  38 21 05 90 */ addi r1, r1, 0x590
diff --git a/include/d/d_camera/asm/func_8017A2A0.s b/include/d/d_camera/asm/func_8017A2A0.s
index 22af78ace8..1043556749 100644
--- a/include/d/d_camera/asm/func_8017A2A0.s
+++ b/include/d/d_camera/asm/func_8017A2A0.s
@@ -743,7 +743,7 @@ lbl_8017AD48:
 /* 8017ADA0 00177CE0  E2 81 02 98 */ psq_l f20, 664(r1), 0, 0
 /* 8017ADA4 00177CE4  CA 81 02 90 */ lfd f20, 0x290(r1)
 /* 8017ADA8 00177CE8  39 61 02 90 */ addi r11, r1, 0x290
-/* 8017ADAC 00177CEC  48 1E 74 65 */ bl func_80362210
+/* 8017ADAC 00177CEC  48 1E 74 65 */ bl _restgpr_23
 /* 8017ADB0 00177CF0  80 01 03 54 */ lwz r0, 0x354(r1)
 /* 8017ADB4 00177CF4  7C 08 03 A6 */ mtlr r0
 /* 8017ADB8 00177CF8  38 21 03 50 */ addi r1, r1, 0x350
diff --git a/include/d/d_camera/asm/func_80181220.s b/include/d/d_camera/asm/func_80181220.s
index 5663cfa0f8..198245f489 100644
--- a/include/d/d_camera/asm/func_80181220.s
+++ b/include/d/d_camera/asm/func_80181220.s
@@ -2,7 +2,7 @@
 /* 80181224 0017E164  7C 08 02 A6 */ mflr r0
 /* 80181228 0017E168  90 01 00 34 */ stw r0, 0x34(r1)
 /* 8018122C 0017E16C  39 61 00 30 */ addi r11, r1, 0x30
-/* 80181230 0017E170  48 1E 0F 15 */ bl func_80362144
+/* 80181230 0017E170  48 1E 0F 15 */ bl _savefpr_29
 /* 80181234 0017E174  93 E1 00 14 */ stw r31, 0x14(r1)
 /* 80181238 0017E178  7C 7F 1B 78 */ mr r31, r3
 /* 8018123C 0017E17C  FF A0 08 90 */ fmr f29, f1
@@ -14,7 +14,7 @@
 /* 80181254 0017E194  D3 DF 07 1C */ stfs f30, 0x71c(r31)
 /* 80181258 0017E198  D3 FF 07 20 */ stfs f31, 0x720(r31)
 /* 8018125C 0017E19C  39 61 00 30 */ addi r11, r1, 0x30
-/* 80181260 0017E1A0  48 1E 0F 31 */ bl func_80362190
+/* 80181260 0017E1A0  48 1E 0F 31 */ bl _restfpr_29
 /* 80181264 0017E1A4  83 E1 00 14 */ lwz r31, 0x14(r1)
 /* 80181268 0017E1A8  80 01 00 34 */ lwz r0, 0x34(r1)
 /* 8018126C 0017E1AC  7C 08 03 A6 */ mtlr r0
diff --git a/include/d/d_cc/d_cc_s/d_cc_s.h b/include/d/d_cc/d_cc_s/d_cc_s.h
index f64125be22..3ba173d647 100644
--- a/include/d/d_cc/d_cc_s/d_cc_s.h
+++ b/include/d/d_cc/d_cc_s/d_cc_s.h
@@ -1,9 +1,9 @@
 #ifndef __D_CC_S_H_
 #define __D_CC_S_H_
 
-#include "global.h"
 #include "SComponent/c_cc_s/c_cc_s.h"
 #include "d/d_cc/d_cc_mass_s/d_cc_mass_s.h"
+#include "global.h"
 
 class dCcS {
 public:
diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h
index 366f9764dc..ca36e86907 100644
--- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h
+++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h
@@ -66,6 +66,7 @@ public:
     dStage_roomControl_c& getRoomControl() { return room_control; }
     item_func& getGiveItem() { return give_item; }
     u8& getUnkHeart() { return unk_heart; }
+
 private:
     /* 0x00000 */ dBgS dbgs;
     /* 0x0143C */ dCcS dccs;
@@ -165,7 +166,8 @@ extern dComIfG_inf_c g_dComIfG_gameInfo;
 // }
 
 // void dComIfGs_setItem(int item_slot, u8 item_id) {
-//     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(item_slot, item_id);
+//     g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerItem().setItem(item_slot,
+//     item_id);
 // }
 
 // u16 dComIfGs_getOil(void) {
diff --git a/include/d/d_event/d_event_manager/d_event_manager.h b/include/d/d_event/d_event_manager/d_event_manager.h
index d1c91ae401..376785e4d2 100644
--- a/include/d/d_event/d_event_manager/d_event_manager.h
+++ b/include/d/d_event/d_event_manager/d_event_manager.h
@@ -1,8 +1,8 @@
 #ifndef __D_EVENT_MANAGER_H_
 #define __D_EVENT_MANAGER_H_
 
-#include "dolphin/types.h"
 #include "d/d_event/d_event_data/d_event_data.h"
+#include "dolphin/types.h"
 
 class dEvent_exception_c {
 public:
diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s b/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s
index e64e5beb88..ca22b74d8b 100644
--- a/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s
+++ b/include/d/d_file/d_file_sel_info/asm/func_80192AA0.s
@@ -89,7 +89,7 @@ lbl_80192BDC:
 /* 80192BE8 0018FB28  3A D6 00 08 */	addi r22, r22, 8
 /* 80192BEC 0018FB2C  41 80 FF 20 */	blt lbl_80192B0C
 /* 80192BF0 0018FB30  39 61 00 80 */	addi r11, r1, 0x80
-/* 80192BF4 0018FB34  48 1C F6 19 */	bl func_8036220C
+/* 80192BF4 0018FB34  48 1C F6 19 */	bl _restgpr_22
 /* 80192BF8 0018FB38  80 01 00 84 */	lwz r0, 0x84(r1)
 /* 80192BFC 0018FB3C  7C 08 03 A6 */	mtlr r0
 /* 80192C00 0018FB40  38 21 00 80 */	addi r1, r1, 0x80
diff --git a/include/d/d_item/d_item/asm/func_8009B940.s b/include/d/d_item/d_item/asm/func_8009B940.s
index b6dd3d166d..e54977ad70 100644
--- a/include/d/d_item/d_item/asm/func_8009B940.s
+++ b/include/d/d_item/d_item/asm/func_8009B940.s
@@ -2,7 +2,7 @@
 /* 8009B944 00098884  7C 08 02 A6 */	mflr r0
 /* 8009B948 00098888  90 01 00 54 */	stw r0, 0x54(r1)
 /* 8009B94C 0009888C  39 61 00 50 */	addi r11, r1, 0x50
-/* 8009B950 00098890  48 2C 68 69 */	bl func_803621B8
+/* 8009B950 00098890  48 2C 68 69 */	bl _savegpr_20
 /* 8009B954 00098894  7C 7E 1B 78 */	mr r30, r3
 /* 8009B958 00098898  7C 9F 23 78 */	mr r31, r4
 /* 8009B95C 0009889C  3B 20 00 00 */	li r25, 0
@@ -178,7 +178,7 @@ lbl_8009BBB0:
 /* 8009BBBC 00098AFC  57 E3 06 3E */	clrlwi r3, r31, 0x18
 lbl_8009BBC0:
 /* 8009BBC0 00098B00  39 61 00 50 */	addi r11, r1, 0x50
-/* 8009BBC4 00098B04  48 2C 66 41 */	bl func_80362204
+/* 8009BBC4 00098B04  48 2C 66 41 */	bl _restgpr_20
 /* 8009BBC8 00098B08  80 01 00 54 */	lwz r0, 0x54(r1)
 /* 8009BBCC 00098B0C  7C 08 03 A6 */	mtlr r0
 /* 8009BBD0 00098B10  38 21 00 50 */	addi r1, r1, 0x50
diff --git a/include/d/d_kankyo/asm/func_8019DD6C.s b/include/d/d_kankyo/asm/func_8019DD6C.s
index 9987f2c904..1e5203b23b 100644
--- a/include/d/d_kankyo/asm/func_8019DD6C.s
+++ b/include/d/d_kankyo/asm/func_8019DD6C.s
@@ -6,7 +6,7 @@
 /* 8019DD80 0019ACC0  DB C1 00 40 */ stfd f30, 0x40(r1)
 /* 8019DD84 0019ACC4  F3 C1 00 48 */ psq_st f30, 72(r1), 0, 0
 /* 8019DD88 0019ACC8  39 61 00 40 */ addi r11, r1, 0x40
-/* 8019DD8C 0019ACCC  48 1C 44 31 */ bl func_803621BC
+/* 8019DD8C 0019ACCC  48 1C 44 31 */ bl _savegpr_21
 /* 8019DD90 0019ACD0  7C 76 1B 78 */ mr r22, r3
 /* 8019DD94 0019ACD4  7C 97 23 78 */ mr r23, r4
 /* 8019DD98 0019ACD8  C3 E2 A2 70 */ lfs f31, lbl_80453C70-_SDA2_BASE_(r2)
@@ -271,7 +271,7 @@ lbl_8019E114:
 /* 8019E11C 0019B05C  E3 C1 00 48 */ psq_l f30, 72(r1), 0, 0
 /* 8019E120 0019B060  CB C1 00 40 */ lfd f30, 0x40(r1)
 /* 8019E124 0019B064  39 61 00 40 */ addi r11, r1, 0x40
-/* 8019E128 0019B068  48 1C 40 E1 */ bl func_80362208
+/* 8019E128 0019B068  48 1C 40 E1 */ bl _restgpr_21
 /* 8019E12C 0019B06C  80 01 00 64 */ lwz r0, 0x64(r1)
 /* 8019E130 0019B070  7C 08 03 A6 */ mtlr r0
 /* 8019E134 0019B074  38 21 00 60 */ addi r1, r1, 0x60
diff --git a/include/d/d_kankyo/asm/func_8019E13C.s b/include/d/d_kankyo/asm/func_8019E13C.s
index 1d6b6b9406..260afd5f84 100644
--- a/include/d/d_kankyo/asm/func_8019E13C.s
+++ b/include/d/d_kankyo/asm/func_8019E13C.s
@@ -196,7 +196,7 @@ lbl_8019E3E4:
 /* 8019E3E4 0019B324  E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0
 /* 8019E3E8 0019B328  CB E1 00 40 */ lfd f31, 0x40(r1)
 /* 8019E3EC 0019B32C  39 61 00 40 */ addi r11, r1, 0x40
-/* 8019E3F0 0019B330  48 1C 3E 21 */ bl func_80362210
+/* 8019E3F0 0019B330  48 1C 3E 21 */ bl _restgpr_23
 /* 8019E3F4 0019B334  80 01 00 54 */ lwz r0, 0x54(r1)
 /* 8019E3F8 0019B338  7C 08 03 A6 */ mtlr r0
 /* 8019E3FC 0019B33C  38 21 00 50 */ addi r1, r1, 0x50
diff --git a/include/d/d_kankyo/asm/func_8019E874.s b/include/d/d_kankyo/asm/func_8019E874.s
index 10df002084..dfc8f82845 100644
--- a/include/d/d_kankyo/asm/func_8019E874.s
+++ b/include/d/d_kankyo/asm/func_8019E874.s
@@ -2,7 +2,7 @@
 /* 8019E878 0019B7B8  7C 08 02 A6 */ mflr r0
 /* 8019E87C 0019B7BC  90 01 00 54 */ stw r0, 0x54(r1)
 /* 8019E880 0019B7C0  39 61 00 50 */ addi r11, r1, 0x50
-/* 8019E884 0019B7C4  48 1C 39 39 */ bl func_803621BC
+/* 8019E884 0019B7C4  48 1C 39 39 */ bl _savegpr_21
 /* 8019E888 0019B7C8  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 8019E88C 0019B7CC  3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l
 /* 8019E890 0019B7D0  38 60 00 00 */ li r3, 0
@@ -134,7 +134,7 @@ lbl_8019EA70:
 /* 8019EA80 0019B9C0  38 E7 00 0C */ addi r7, r7, 0xc
 /* 8019EA84 0019B9C4  42 00 FE 54 */ bdnz lbl_8019E8D8
 /* 8019EA88 0019B9C8  39 61 00 50 */ addi r11, r1, 0x50
-/* 8019EA8C 0019B9CC  48 1C 37 7D */ bl func_80362208
+/* 8019EA8C 0019B9CC  48 1C 37 7D */ bl _restgpr_21
 /* 8019EA90 0019B9D0  80 01 00 54 */ lwz r0, 0x54(r1)
 /* 8019EA94 0019B9D4  7C 08 03 A6 */ mtlr r0
 /* 8019EA98 0019B9D8  38 21 00 50 */ addi r1, r1, 0x50
diff --git a/include/d/d_kankyo/asm/func_8019FBD4.s b/include/d/d_kankyo/asm/func_8019FBD4.s
index 7ab4888b53..9779db413b 100644
--- a/include/d/d_kankyo/asm/func_8019FBD4.s
+++ b/include/d/d_kankyo/asm/func_8019FBD4.s
@@ -2,7 +2,7 @@
 /* 8019FBD8 0019CB18  7C 08 02 A6 */ mflr r0
 /* 8019FBDC 0019CB1C  90 01 00 54 */ stw r0, 0x54(r1)
 /* 8019FBE0 0019CB20  39 61 00 50 */ addi r11, r1, 0x50
-/* 8019FBE4 0019CB24  48 1C 25 C5 */ bl func_803621A8
+/* 8019FBE4 0019CB24  48 1C 25 C5 */ bl _savegpr_16
 /* 8019FBE8 0019CB28  7C 95 23 78 */ mr r21, r4
 /* 8019FBEC 0019CB2C  7C B6 2B 78 */ mr r22, r5
 /* 8019FBF0 0019CB30  7C D7 33 78 */ mr r23, r6
@@ -525,7 +525,7 @@ lbl_801A0314:
 /* 801A0324 0019D264  98 1C 00 00 */ stb r0, 0(r28)
 lbl_801A0328:
 /* 801A0328 0019D268  39 61 00 50 */ addi r11, r1, 0x50
-/* 801A032C 0019D26C  48 1C 1E C9 */ bl func_803621F4
+/* 801A032C 0019D26C  48 1C 1E C9 */ bl _restgpr_16
 /* 801A0330 0019D270  80 01 00 54 */ lwz r0, 0x54(r1)
 /* 801A0334 0019D274  7C 08 03 A6 */ mtlr r0
 /* 801A0338 0019D278  38 21 00 50 */ addi r1, r1, 0x50
diff --git a/include/d/d_kankyo/asm/func_801A0340.s b/include/d/d_kankyo/asm/func_801A0340.s
index 2907b4b353..3bb8af9baf 100644
--- a/include/d/d_kankyo/asm/func_801A0340.s
+++ b/include/d/d_kankyo/asm/func_801A0340.s
@@ -2,7 +2,7 @@
 /* 801A0344 0019D284  7C 08 02 A6 */ mflr r0
 /* 801A0348 0019D288  90 01 00 44 */ stw r0, 0x44(r1)
 /* 801A034C 0019D28C  39 61 00 40 */ addi r11, r1, 0x40
-/* 801A0350 0019D290  48 1C 1D F5 */ bl func_80362144
+/* 801A0350 0019D290  48 1C 1D F5 */ bl _savefpr_29
 /* 801A0354 0019D294  39 61 00 28 */ addi r11, r1, 0x28
 /* 801A0358 0019D298  48 1C 1E 79 */ bl _savegpr_26
 /* 801A035C 0019D29C  7C 7A 1B 78 */ mr r26, r3
@@ -42,7 +42,7 @@
 /* 801A03E4 0019D324  4B FF D2 A9 */ bl kankyo_color_ratio_set
 /* 801A03E8 0019D328  B0 7A 00 04 */ sth r3, 4(r26)
 /* 801A03EC 0019D32C  39 61 00 40 */ addi r11, r1, 0x40
-/* 801A03F0 0019D330  48 1C 1D A1 */ bl func_80362190
+/* 801A03F0 0019D330  48 1C 1D A1 */ bl _restfpr_29
 /* 801A03F4 0019D334  39 61 00 28 */ addi r11, r1, 0x28
 /* 801A03F8 0019D338  48 1C 1E 25 */ bl _restgpr_26
 /* 801A03FC 0019D33C  80 01 00 44 */ lwz r0, 0x44(r1)
diff --git a/include/d/d_kankyo/asm/func_801A040C.s b/include/d/d_kankyo/asm/func_801A040C.s
index 836329aa48..9f22a6ec92 100644
--- a/include/d/d_kankyo/asm/func_801A040C.s
+++ b/include/d/d_kankyo/asm/func_801A040C.s
@@ -6,7 +6,7 @@
 /* 801A0420 0019D360  DB C1 01 30 */ stfd f30, 0x130(r1)
 /* 801A0424 0019D364  F3 C1 01 38 */ psq_st f30, 312(r1), 0, 0
 /* 801A0428 0019D368  39 61 01 30 */ addi r11, r1, 0x130
-/* 801A042C 0019D36C  48 1C 1D 75 */ bl func_803621A0
+/* 801A042C 0019D36C  48 1C 1D 75 */ bl _savegpr_14
 /* 801A0430 0019D370  7C 6F 1B 78 */ mr r15, r3
 /* 801A0434 0019D374  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 801A0438 0019D378  38 83 CA 54 */ addi r4, r3, lbl_8042CA54@l
@@ -1000,7 +1000,7 @@ lbl_801A1314:
 /* 801A131C 0019E25C  E3 C1 01 38 */ psq_l f30, 312(r1), 0, 0
 /* 801A1320 0019E260  CB C1 01 30 */ lfd f30, 0x130(r1)
 /* 801A1324 0019E264  39 61 01 30 */ addi r11, r1, 0x130
-/* 801A1328 0019E268  48 1C 0E C5 */ bl func_803621EC
+/* 801A1328 0019E268  48 1C 0E C5 */ bl _restgpr_14
 /* 801A132C 0019E26C  80 01 01 54 */ lwz r0, 0x154(r1)
 /* 801A1330 0019E270  7C 08 03 A6 */ mtlr r0
 /* 801A1334 0019E274  38 21 01 50 */ addi r1, r1, 0x150
diff --git a/include/d/d_kankyo/asm/func_801A133C.s b/include/d/d_kankyo/asm/func_801A133C.s
index 930bd9357e..975fde1f30 100644
--- a/include/d/d_kankyo/asm/func_801A133C.s
+++ b/include/d/d_kankyo/asm/func_801A133C.s
@@ -2,7 +2,7 @@
 /* 801A1340 0019E280  7C 08 02 A6 */ mflr r0
 /* 801A1344 0019E284  90 01 00 C4 */ stw r0, 0xc4(r1)
 /* 801A1348 0019E288  39 61 00 C0 */ addi r11, r1, 0xc0
-/* 801A134C 0019E28C  48 1C 0E 5D */ bl func_803621A8
+/* 801A134C 0019E28C  48 1C 0E 5D */ bl _savegpr_16
 /* 801A1350 0019E290  7C 73 1B 78 */ mr r19, r3
 /* 801A1354 0019E294  7C 94 23 78 */ mr r20, r4
 /* 801A1358 0019E298  7C BC 2B 78 */ mr r28, r5
@@ -226,7 +226,7 @@ lbl_801A1570:
 /* 801A16A4 0019E5E4  4B FF B6 39 */ bl dKy_WolfPowerup_FogNearFar
 lbl_801A16A8:
 /* 801A16A8 0019E5E8  39 61 00 C0 */ addi r11, r1, 0xc0
-/* 801A16AC 0019E5EC  48 1C 0B 49 */ bl func_803621F4
+/* 801A16AC 0019E5EC  48 1C 0B 49 */ bl _restgpr_16
 /* 801A16B0 0019E5F0  80 01 00 C4 */ lwz r0, 0xc4(r1)
 /* 801A16B4 0019E5F4  7C 08 03 A6 */ mtlr r0
 /* 801A16B8 0019E5F8  38 21 00 C0 */ addi r1, r1, 0xc0
diff --git a/include/d/d_kankyo/asm/func_801A16C0.s b/include/d/d_kankyo/asm/func_801A16C0.s
index 8e3b1205b8..0542ef6409 100644
--- a/include/d/d_kankyo/asm/func_801A16C0.s
+++ b/include/d/d_kankyo/asm/func_801A16C0.s
@@ -2,7 +2,7 @@
 /* 801A16C4 0019E604  7C 08 02 A6 */ mflr r0
 /* 801A16C8 0019E608  90 01 01 04 */ stw r0, 0x104(r1)
 /* 801A16CC 0019E60C  39 61 01 00 */ addi r11, r1, 0x100
-/* 801A16D0 0019E610  48 1C 0A D9 */ bl func_803621A8
+/* 801A16D0 0019E610  48 1C 0A D9 */ bl _savegpr_16
 /* 801A16D4 0019E614  7C 76 1B 78 */ mr r22, r3
 /* 801A16D8 0019E618  7C 97 23 78 */ mr r23, r4
 /* 801A16DC 0019E61C  7C B8 2B 78 */ mr r24, r5
@@ -442,7 +442,7 @@ lbl_801A1D24:
 /* 801A1D48 0019EC88  4B FF AF 95 */ bl dKy_WolfPowerup_FogNearFar
 lbl_801A1D4C:
 /* 801A1D4C 0019EC8C  39 61 01 00 */ addi r11, r1, 0x100
-/* 801A1D50 0019EC90  48 1C 04 A5 */ bl func_803621F4
+/* 801A1D50 0019EC90  48 1C 04 A5 */ bl _restgpr_16
 /* 801A1D54 0019EC94  80 01 01 04 */ lwz r0, 0x104(r1)
 /* 801A1D58 0019EC98  7C 08 03 A6 */ mtlr r0
 /* 801A1D5C 0019EC9C  38 21 01 00 */ addi r1, r1, 0x100
diff --git a/include/d/d_kankyo/asm/func_801A2128.s b/include/d/d_kankyo/asm/func_801A2128.s
index cc1182106a..fae9c4bc35 100644
--- a/include/d/d_kankyo/asm/func_801A2128.s
+++ b/include/d/d_kankyo/asm/func_801A2128.s
@@ -8,7 +8,7 @@
 /* 801A2144 0019F084  DB A1 01 30 */ stfd f29, 0x130(r1)
 /* 801A2148 0019F088  F3 A1 01 38 */ psq_st f29, 312(r1), 0, 0
 /* 801A214C 0019F08C  39 61 01 30 */ addi r11, r1, 0x130
-/* 801A2150 0019F090  48 1C 00 65 */ bl func_803621B4
+/* 801A2150 0019F090  48 1C 00 65 */ bl _savegpr_19
 /* 801A2154 0019F094  7C 74 1B 78 */ mr r20, r3
 /* 801A2158 0019F098  7C 95 23 79 */ or. r21, r4, r4
 /* 801A215C 0019F09C  7C B6 2B 78 */ mr r22, r5
@@ -1567,7 +1567,7 @@ lbl_801A3794:
 /* 801A37A4 001A06E4  E3 A1 01 38 */ psq_l f29, 312(r1), 0, 0
 /* 801A37A8 001A06E8  CB A1 01 30 */ lfd f29, 0x130(r1)
 /* 801A37AC 001A06EC  39 61 01 30 */ addi r11, r1, 0x130
-/* 801A37B0 001A06F0  48 1B EA 51 */ bl func_80362200
+/* 801A37B0 001A06F0  48 1B EA 51 */ bl _restgpr_19
 /* 801A37B4 001A06F4  80 01 01 64 */ lwz r0, 0x164(r1)
 /* 801A37B8 001A06F8  7C 08 03 A6 */ mtlr r0
 /* 801A37BC 001A06FC  38 21 01 60 */ addi r1, r1, 0x160
diff --git a/include/d/d_kankyo/asm/func_801A4420.s b/include/d/d_kankyo/asm/func_801A4420.s
index c10bfaafee..535361b7b2 100644
--- a/include/d/d_kankyo/asm/func_801A4420.s
+++ b/include/d/d_kankyo/asm/func_801A4420.s
@@ -531,7 +531,7 @@ lbl_801A4BBC:
 /* 801A4BEC 001A1B2C  4B E5 E9 55 */ bl func_80003540
 lbl_801A4BF0:
 /* 801A4BF0 001A1B30  39 61 00 90 */ addi r11, r1, 0x90
-/* 801A4BF4 001A1B34  48 1B D6 19 */ bl func_8036220C
+/* 801A4BF4 001A1B34  48 1B D6 19 */ bl _restgpr_22
 /* 801A4BF8 001A1B38  80 01 00 94 */ lwz r0, 0x94(r1)
 /* 801A4BFC 001A1B3C  7C 08 03 A6 */ mtlr r0
 /* 801A4C00 001A1B40  38 21 00 90 */ addi r1, r1, 0x90
diff --git a/include/d/d_kankyo/asm/func_801A5E54.s b/include/d/d_kankyo/asm/func_801A5E54.s
index 2bd55d3b20..22b7f1e33b 100644
--- a/include/d/d_kankyo/asm/func_801A5E54.s
+++ b/include/d/d_kankyo/asm/func_801A5E54.s
@@ -152,7 +152,7 @@ lbl_801A6058:
 /* 801A609C 001A2FDC  E3 A1 00 D8 */ psq_l f29, 216(r1), 0, 0
 /* 801A60A0 001A2FE0  CB A1 00 D0 */ lfd f29, 0xd0(r1)
 /* 801A60A4 001A2FE4  39 61 00 D0 */ addi r11, r1, 0xd0
-/* 801A60A8 001A2FE8  48 1B C1 65 */ bl func_8036220C
+/* 801A60A8 001A2FE8  48 1B C1 65 */ bl _restgpr_22
 /* 801A60AC 001A2FEC  80 01 01 04 */ lwz r0, 0x104(r1)
 /* 801A60B0 001A2FF0  7C 08 03 A6 */ mtlr r0
 /* 801A60B4 001A2FF4  38 21 01 00 */ addi r1, r1, 0x100
diff --git a/include/d/d_kankyo/asm/func_801A6278.s b/include/d/d_kankyo/asm/func_801A6278.s
index 02cfc79e12..567ad5e896 100644
--- a/include/d/d_kankyo/asm/func_801A6278.s
+++ b/include/d/d_kankyo/asm/func_801A6278.s
@@ -4,7 +4,7 @@
 /* 801A6284 001A31C4  DB E1 00 70 */ stfd f31, 0x70(r1)
 /* 801A6288 001A31C8  F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0
 /* 801A628C 001A31CC  39 61 00 70 */ addi r11, r1, 0x70
-/* 801A6290 001A31D0  48 1B BF 1D */ bl func_803621AC
+/* 801A6290 001A31D0  48 1B BF 1D */ bl _savegpr_17
 /* 801A6294 001A31D4  7C 76 1B 78 */ mr r22, r3
 /* 801A6298 001A31D8  FF E0 08 90 */ fmr f31, f1
 /* 801A629C 001A31DC  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
@@ -650,7 +650,7 @@ lbl_801A6C00:
 /* 801A6C00 001A3B40  E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0
 /* 801A6C04 001A3B44  CB E1 00 70 */ lfd f31, 0x70(r1)
 /* 801A6C08 001A3B48  39 61 00 70 */ addi r11, r1, 0x70
-/* 801A6C0C 001A3B4C  48 1B B5 ED */ bl func_803621F8
+/* 801A6C0C 001A3B4C  48 1B B5 ED */ bl _restgpr_17
 /* 801A6C10 001A3B50  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 801A6C14 001A3B54  7C 08 03 A6 */ mtlr r0
 /* 801A6C18 001A3B58  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_kankyo/asm/func_801A6E9C.s b/include/d/d_kankyo/asm/func_801A6E9C.s
index 0419f2451b..1063101446 100644
--- a/include/d/d_kankyo/asm/func_801A6E9C.s
+++ b/include/d/d_kankyo/asm/func_801A6E9C.s
@@ -6,7 +6,7 @@
 /* 801A6EB0 001A3DF0  DB C1 00 90 */ stfd f30, 0x90(r1)
 /* 801A6EB4 001A3DF4  F3 C1 00 98 */ psq_st f30, 152(r1), 0, 0
 /* 801A6EB8 001A3DF8  39 61 00 90 */ addi r11, r1, 0x90
-/* 801A6EBC 001A3DFC  48 1B B2 F9 */ bl func_803621B4
+/* 801A6EBC 001A3DFC  48 1B B2 F9 */ bl _savegpr_19
 /* 801A6EC0 001A3E00  7C 77 1B 78 */ mr r23, r3
 /* 801A6EC4 001A3E04  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 801A6EC8 001A3E08  3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l
@@ -480,7 +480,7 @@ lbl_801A7598:
 /* 801A75A0 001A44E0  E3 C1 00 98 */ psq_l f30, 152(r1), 0, 0
 /* 801A75A4 001A44E4  CB C1 00 90 */ lfd f30, 0x90(r1)
 /* 801A75A8 001A44E8  39 61 00 90 */ addi r11, r1, 0x90
-/* 801A75AC 001A44EC  48 1B AC 55 */ bl func_80362200
+/* 801A75AC 001A44EC  48 1B AC 55 */ bl _restgpr_19
 /* 801A75B0 001A44F0  80 01 00 B4 */ lwz r0, 0xb4(r1)
 /* 801A75B4 001A44F4  7C 08 03 A6 */ mtlr r0
 /* 801A75B8 001A44F8  38 21 00 B0 */ addi r1, r1, 0xb0
diff --git a/include/d/d_kankyo/asm/func_801A8E20.s b/include/d/d_kankyo/asm/func_801A8E20.s
index f3001e1148..3429da4a52 100644
--- a/include/d/d_kankyo/asm/func_801A8E20.s
+++ b/include/d/d_kankyo/asm/func_801A8E20.s
@@ -8,7 +8,7 @@
 /* 801A8E3C 001A5D7C  DB A1 01 40 */ stfd f29, 0x140(r1)
 /* 801A8E40 001A5D80  F3 A1 01 48 */ psq_st f29, 328(r1), 0, 0
 /* 801A8E44 001A5D84  39 61 01 40 */ addi r11, r1, 0x140
-/* 801A8E48 001A5D88  48 1B 93 59 */ bl func_803621A0
+/* 801A8E48 001A5D88  48 1B 93 59 */ bl _savegpr_14
 /* 801A8E4C 001A5D8C  7C 6E 1B 78 */ mr r14, r3
 /* 801A8E50 001A5D90  7C 99 23 78 */ mr r25, r4
 /* 801A8E54 001A5D94  7C BA 2B 78 */ mr r26, r5
@@ -920,7 +920,7 @@ lbl_801A9994:
 /* 801A9BC4 001A6B04  E3 A1 01 48 */ psq_l f29, 328(r1), 0, 0
 /* 801A9BC8 001A6B08  CB A1 01 40 */ lfd f29, 0x140(r1)
 /* 801A9BCC 001A6B0C  39 61 01 40 */ addi r11, r1, 0x140
-/* 801A9BD0 001A6B10  48 1B 86 1D */ bl func_803621EC
+/* 801A9BD0 001A6B10  48 1B 86 1D */ bl _restgpr_14
 /* 801A9BD4 001A6B14  80 01 01 74 */ lwz r0, 0x174(r1)
 /* 801A9BD8 001A6B18  7C 08 03 A6 */ mtlr r0
 /* 801A9BDC 001A6B1C  38 21 01 70 */ addi r1, r1, 0x170
diff --git a/include/d/d_kankyo/asm/func_801A9D60.s b/include/d/d_kankyo/asm/func_801A9D60.s
index 823f3043ec..aa3b522f50 100644
--- a/include/d/d_kankyo/asm/func_801A9D60.s
+++ b/include/d/d_kankyo/asm/func_801A9D60.s
@@ -6,7 +6,7 @@
 /* 801A9D74 001A6CB4  DB C1 00 60 */ stfd f30, 0x60(r1)
 /* 801A9D78 001A6CB8  F3 C1 00 68 */ psq_st f30, 104(r1), 0, 0
 /* 801A9D7C 001A6CBC  39 61 00 60 */ addi r11, r1, 0x60
-/* 801A9D80 001A6CC0  48 1B 84 3D */ bl func_803621BC
+/* 801A9D80 001A6CC0  48 1B 84 3D */ bl _savegpr_21
 /* 801A9D84 001A6CC4  7C 76 1B 78 */ mr r22, r3
 /* 801A9D88 001A6CC8  7C 97 23 78 */ mr r23, r4
 /* 801A9D8C 001A6CCC  FF E0 08 90 */ fmr f31, f1
@@ -643,7 +643,7 @@ lbl_801AA63C:
 /* 801AA644 001A7584  E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0
 /* 801AA648 001A7588  CB C1 00 60 */ lfd f30, 0x60(r1)
 /* 801AA64C 001A758C  39 61 00 60 */ addi r11, r1, 0x60
-/* 801AA650 001A7590  48 1B 7B B9 */ bl func_80362208
+/* 801AA650 001A7590  48 1B 7B B9 */ bl _restgpr_21
 /* 801AA654 001A7594  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 801AA658 001A7598  7C 08 03 A6 */ mtlr r0
 /* 801AA65C 001A759C  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_kankyo/asm/func_801AA664.s b/include/d/d_kankyo/asm/func_801AA664.s
index 150100992b..9a930cffe4 100644
--- a/include/d/d_kankyo/asm/func_801AA664.s
+++ b/include/d/d_kankyo/asm/func_801AA664.s
@@ -12,7 +12,7 @@
 /* 801AA690 001A75D0  DB 61 00 50 */ stfd f27, 0x50(r1)
 /* 801AA694 001A75D4  F3 61 00 58 */ psq_st f27, 88(r1), 0, 0
 /* 801AA698 001A75D8  39 61 00 50 */ addi r11, r1, 0x50
-/* 801AA69C 001A75DC  48 1B 7B 21 */ bl func_803621BC
+/* 801AA69C 001A75DC  48 1B 7B 21 */ bl _savegpr_21
 /* 801AA6A0 001A75E0  7C 76 1B 78 */ mr r22, r3
 /* 801AA6A4 001A75E4  FF 60 08 90 */ fmr f27, f1
 /* 801AA6A8 001A75E8  FF 80 10 90 */ fmr f28, f2
@@ -418,7 +418,7 @@ lbl_801AAC18:
 /* 801AAC3C 001A7B7C  E3 61 00 58 */ psq_l f27, 88(r1), 0, 0
 /* 801AAC40 001A7B80  CB 61 00 50 */ lfd f27, 0x50(r1)
 /* 801AAC44 001A7B84  39 61 00 50 */ addi r11, r1, 0x50
-/* 801AAC48 001A7B88  48 1B 75 C1 */ bl func_80362208
+/* 801AAC48 001A7B88  48 1B 75 C1 */ bl _restgpr_21
 /* 801AAC4C 001A7B8C  80 01 00 A4 */ lwz r0, 0xa4(r1)
 /* 801AAC50 001A7B90  7C 08 03 A6 */ mtlr r0
 /* 801AAC54 001A7B94  38 21 00 A0 */ addi r1, r1, 0xa0
diff --git a/include/d/d_kankyo/asm/func_801ACD24.s b/include/d/d_kankyo/asm/func_801ACD24.s
index 29fa644b20..ce62950d14 100644
--- a/include/d/d_kankyo/asm/func_801ACD24.s
+++ b/include/d/d_kankyo/asm/func_801ACD24.s
@@ -8,7 +8,7 @@
 /* 801ACD40 001A9C80  DB A1 02 00 */ stfd f29, 0x200(r1)
 /* 801ACD44 001A9C84  F3 A1 02 08 */ psq_st f29, 520(r1), 0, 0
 /* 801ACD48 001A9C88  39 61 02 00 */ addi r11, r1, 0x200
-/* 801ACD4C 001A9C8C  48 1B 54 5D */ bl func_803621A8
+/* 801ACD4C 001A9C8C  48 1B 54 5D */ bl _savegpr_16
 /* 801ACD50 001A9C90  3C 80 80 43 */ lis r4, lbl_8042CA54@ha
 /* 801ACD54 001A9C94  3B A4 CA 54 */ addi r29, r4, lbl_8042CA54@l
 /* 801ACD58 001A9C98  3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
@@ -975,7 +975,7 @@ lbl_801ADB8C:
 /* 801ADB9C 001AAADC  E3 A1 02 08 */ psq_l f29, 520(r1), 0, 0
 /* 801ADBA0 001AAAE0  CB A1 02 00 */ lfd f29, 0x200(r1)
 /* 801ADBA4 001AAAE4  39 61 02 00 */ addi r11, r1, 0x200
-/* 801ADBA8 001AAAE8  48 1B 46 4D */ bl func_803621F4
+/* 801ADBA8 001AAAE8  48 1B 46 4D */ bl _restgpr_16
 /* 801ADBAC 001AAAEC  80 01 02 34 */ lwz r0, 0x234(r1)
 /* 801ADBB0 001AAAF0  7C 08 03 A6 */ mtlr r0
 /* 801ADBB4 001AAAF4  38 21 02 30 */ addi r1, r1, 0x230
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s
index 455866d156..53ccb59391 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s
@@ -10,7 +10,7 @@
 /* 8005BF2C 00058E6C  DB 81 01 60 */ stfd f28, 0x160(r1)
 /* 8005BF30 00058E70  F3 81 01 68 */ psq_st f28, 360(r1), 0, 0
 /* 8005BF34 00058E74  39 61 01 60 */ addi r11, r1, 0x160
-/* 8005BF38 00058E78  48 30 62 75 */ bl func_803621AC
+/* 8005BF38 00058E78  48 30 62 75 */ bl _savegpr_17
 /* 8005BF3C 00058E7C  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 8005BF40 00058E80  3B A3 CA 54 */ addi r29, r3, lbl_8042CA54@l
 /* 8005BF44 00058E84  83 1D 0E 74 */ lwz r24, 0xe74(r29)
@@ -900,7 +900,7 @@ lbl_8005CC24:
 /* 8005CC3C 00059B7C  E3 81 01 68 */ psq_l f28, 360(r1), 0, 0
 /* 8005CC40 00059B80  CB 81 01 60 */ lfd f28, 0x160(r1)
 /* 8005CC44 00059B84  39 61 01 60 */ addi r11, r1, 0x160
-/* 8005CC48 00059B88  48 30 55 B1 */ bl func_803621F8
+/* 8005CC48 00059B88  48 30 55 B1 */ bl _restgpr_17
 /* 8005CC4C 00059B8C  80 01 01 A4 */ lwz r0, 0x1a4(r1)
 /* 8005CC50 00059B90  7C 08 03 A6 */ mtlr r0
 /* 8005CC54 00059B94  38 21 01 A0 */ addi r1, r1, 0x1a0
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s
index 8d978e6926..1390149c08 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s
@@ -8,7 +8,7 @@
 /* 8005D1A8 0005A0E8  DB A1 01 40 */ stfd f29, 0x140(r1)
 /* 8005D1AC 0005A0EC  F3 A1 01 48 */ psq_st f29, 328(r1), 0, 0
 /* 8005D1B0 0005A0F0  39 61 01 40 */ addi r11, r1, 0x140
-/* 8005D1B4 0005A0F4  48 30 4F FD */ bl func_803621B0
+/* 8005D1B4 0005A0F4  48 30 4F FD */ bl _savegpr_18
 /* 8005D1B8 0005A0F8  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 8005D1BC 0005A0FC  38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l
 /* 8005D1C0 0005A100  83 43 0E 84 */ lwz r26, 0xe84(r3)
@@ -1633,7 +1633,7 @@ lbl_8005E880:
 /* 8005E890 0005B7D0  E3 A1 01 48 */ psq_l f29, 328(r1), 0, 0
 /* 8005E894 0005B7D4  CB A1 01 40 */ lfd f29, 0x140(r1)
 /* 8005E898 0005B7D8  39 61 01 40 */ addi r11, r1, 0x140
-/* 8005E89C 0005B7DC  48 30 39 61 */ bl func_803621FC
+/* 8005E89C 0005B7DC  48 30 39 61 */ bl _restgpr_18
 /* 8005E8A0 0005B7E0  80 01 01 74 */ lwz r0, 0x174(r1)
 /* 8005E8A4 0005B7E4  7C 08 03 A6 */ mtlr r0
 /* 8005E8A8 0005B7E8  38 21 01 70 */ addi r1, r1, 0x170
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s
index b461001e1e..c0fcba4bb4 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s
@@ -1323,7 +1323,7 @@ lbl_8005FB7C:
 /* 8005FBBC 0005CAFC  E2 E1 01 C8 */ psq_l f23, 456(r1), 0, 0
 /* 8005FBC0 0005CB00  CA E1 01 C0 */ lfd f23, 0x1c0(r1)
 /* 8005FBC4 0005CB04  39 61 01 C0 */ addi r11, r1, 0x1c0
-/* 8005FBC8 0005CB08  48 30 26 45 */ bl func_8036220C
+/* 8005FBC8 0005CB08  48 30 26 45 */ bl _restgpr_22
 /* 8005FBCC 0005CB0C  80 01 02 54 */ lwz r0, 0x254(r1)
 /* 8005FBD0 0005CB10  7C 08 03 A6 */ mtlr r0
 /* 8005FBD4 0005CB14  38 21 02 50 */ addi r1, r1, 0x250
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s
index 53aa4cfa9e..fabd559caf 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s
@@ -28,7 +28,7 @@
 /* 8005FDB4 0005CCF4  DA 61 01 80 */ stfd f19, 0x180(r1)
 /* 8005FDB8 0005CCF8  F2 61 01 88 */ psq_st f19, 392(r1), 0, 0
 /* 8005FDBC 0005CCFC  39 61 01 80 */ addi r11, r1, 0x180
-/* 8005FDC0 0005CD00  48 30 23 FD */ bl func_803621BC
+/* 8005FDC0 0005CD00  48 30 23 FD */ bl _savegpr_21
 /* 8005FDC4 0005CD04  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 8005FDC8 0005CD08  38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l
 /* 8005FDCC 0005CD0C  83 03 0E 94 */ lwz r24, 0xe94(r3)
@@ -1525,7 +1525,7 @@ lbl_800612A4:
 /* 80061304 0005E244  E2 61 01 88 */ psq_l f19, 392(r1), 0, 0
 /* 80061308 0005E248  CA 61 01 80 */ lfd f19, 0x180(r1)
 /* 8006130C 0005E24C  39 61 01 80 */ addi r11, r1, 0x180
-/* 80061310 0005E250  48 30 0E F9 */ bl func_80362208
+/* 80061310 0005E250  48 30 0E F9 */ bl _restgpr_21
 /* 80061314 0005E254  80 01 02 54 */ lwz r0, 0x254(r1)
 /* 80061318 0005E258  7C 08 03 A6 */ mtlr r0
 /* 8006131C 0005E25C  38 21 02 50 */ addi r1, r1, 0x250
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s
index 469db8ca39..0f7d3bf7f3 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s
@@ -22,7 +22,7 @@
 /* 8006148C 0005E3CC  DA C1 00 C0 */ stfd f22, 0xc0(r1)
 /* 80061490 0005E3D0  F2 C1 00 C8 */ psq_st f22, 200(r1), 0, 0
 /* 80061494 0005E3D4  39 61 00 C0 */ addi r11, r1, 0xc0
-/* 80061498 0005E3D8  48 30 0D 21 */ bl func_803621B8
+/* 80061498 0005E3D8  48 30 0D 21 */ bl _savegpr_20
 /* 8006149C 0005E3DC  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
 /* 800614A0 0005E3E0  3B 63 CA 54 */ addi r27, r3, lbl_8042CA54@l
 /* 800614A4 0005E3E4  83 1B 0E C0 */ lwz r24, 0xec0(r27)
@@ -866,7 +866,7 @@ lbl_80062044:
 /* 8006208C 0005EFCC  E2 C1 00 C8 */ psq_l f22, 200(r1), 0, 0
 /* 80062090 0005EFD0  CA C1 00 C0 */ lfd f22, 0xc0(r1)
 /* 80062094 0005EFD4  39 61 00 C0 */ addi r11, r1, 0xc0
-/* 80062098 0005EFD8  48 30 01 6D */ bl func_80362204
+/* 80062098 0005EFD8  48 30 01 6D */ bl _restgpr_20
 /* 8006209C 0005EFDC  80 01 01 64 */ lwz r0, 0x164(r1)
 /* 800620A0 0005EFE0  7C 08 03 A6 */ mtlr r0
 /* 800620A4 0005EFE4  38 21 01 60 */ addi r1, r1, 0x160
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s
index 932f2ca345..ada42cd2b5 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s
@@ -703,7 +703,7 @@ lbl_80062A3C:
 /* 80062ABC 0005F9FC  E2 81 00 88 */ psq_l f20, 136(r1), 0, 0
 /* 80062AC0 0005FA00  CA 81 00 80 */ lfd f20, 0x80(r1)
 /* 80062AC4 0005FA04  39 61 00 80 */ addi r11, r1, 0x80
-/* 80062AC8 0005FA08  48 2F F7 49 */ bl func_80362210
+/* 80062AC8 0005FA08  48 2F F7 49 */ bl _restgpr_23
 /* 80062ACC 0005FA0C  80 01 01 44 */ lwz r0, 0x144(r1)
 /* 80062AD0 0005FA10  7C 08 03 A6 */ mtlr r0
 /* 80062AD4 0005FA14  38 21 01 40 */ addi r1, r1, 0x140
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s
index 639ae56419..d3505bed8a 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s
@@ -22,7 +22,7 @@
 /* 800636C4 00060604  DA C1 01 80 */ stfd f22, 0x180(r1)
 /* 800636C8 00060608  F2 C1 01 88 */ psq_st f22, 392(r1), 0, 0
 /* 800636CC 0006060C  39 61 01 80 */ addi r11, r1, 0x180
-/* 800636D0 00060610  48 2F EA E9 */ bl func_803621B8
+/* 800636D0 00060610  48 2F EA E9 */ bl _savegpr_20
 /* 800636D4 00060614  7C 7B 1B 78 */ mr r27, r3
 /* 800636D8 00060618  7C 95 23 78 */ mr r21, r4
 /* 800636DC 0006061C  7C DC 33 78 */ mr r28, r6
@@ -916,7 +916,7 @@ lbl_800643E4:
 /* 8006442C 0006136C  E2 C1 01 88 */ psq_l f22, 392(r1), 0, 0
 /* 80064430 00061370  CA C1 01 80 */ lfd f22, 0x180(r1)
 /* 80064434 00061374  39 61 01 80 */ addi r11, r1, 0x180
-/* 80064438 00061378  48 2F DD CD */ bl func_80362204
+/* 80064438 00061378  48 2F DD CD */ bl _restgpr_20
 /* 8006443C 0006137C  80 01 02 24 */ lwz r0, 0x224(r1)
 /* 80064440 00061380  7C 08 03 A6 */ mtlr r0
 /* 80064444 00061384  38 21 02 20 */ addi r1, r1, 0x220
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s
index 24490c13ae..39c1210e7f 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s
@@ -38,7 +38,7 @@
 /* 800644E0 00061420  D9 C1 01 F0 */ stfd f14, 0x1f0(r1)
 /* 800644E4 00061424  F1 C1 01 F8 */ psq_st f14, 504(r1), 0, 0
 /* 800644E8 00061428  39 61 01 F0 */ addi r11, r1, 0x1f0
-/* 800644EC 0006142C  48 2F DC D1 */ bl func_803621BC
+/* 800644EC 0006142C  48 2F DC D1 */ bl _savegpr_21
 /* 800644F0 00061430  7C 78 1B 78 */ mr r24, r3
 /* 800644F4 00061434  7C 96 23 78 */ mr r22, r4
 /* 800644F8 00061438  7C D7 33 78 */ mr r23, r6
@@ -1187,7 +1187,7 @@ lbl_80065584:
 /* 8006560C 0006254C  E1 C1 01 F8 */ psq_l f14, 504(r1), 0, 0
 /* 80065610 00062550  C9 C1 01 F0 */ lfd f14, 0x1f0(r1)
 /* 80065614 00062554  39 61 01 F0 */ addi r11, r1, 0x1f0
-/* 80065618 00062558  48 2F CB F1 */ bl func_80362208
+/* 80065618 00062558  48 2F CB F1 */ bl _restgpr_21
 /* 8006561C 0006255C  80 01 03 14 */ lwz r0, 0x314(r1)
 /* 80065620 00062560  7C 08 03 A6 */ mtlr r0
 /* 80065624 00062564  38 21 03 10 */ addi r1, r1, 0x310
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s
index 697c48e494..7505bf524b 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s
@@ -30,7 +30,7 @@
 /* 800656A0 000625E0  DA 41 01 A0 */ stfd f18, 0x1a0(r1)
 /* 800656A4 000625E4  F2 41 01 A8 */ psq_st f18, 424(r1), 0, 0
 /* 800656A8 000625E8  39 61 01 A0 */ addi r11, r1, 0x1a0
-/* 800656AC 000625EC  48 2F CB 09 */ bl func_803621B4
+/* 800656AC 000625EC  48 2F CB 09 */ bl _savegpr_19
 /* 800656B0 000625F0  7C 75 1B 78 */ mr r21, r3
 /* 800656B4 000625F4  7C 93 23 78 */ mr r19, r4
 /* 800656B8 000625F8  3C 60 80 42 */ lis r3, lbl_80424950@ha
@@ -661,7 +661,7 @@ lbl_80065FC0:
 /* 80066028 00062F68  E2 41 01 A8 */ psq_l f18, 424(r1), 0, 0
 /* 8006602C 00062F6C  CA 41 01 A0 */ lfd f18, 0x1a0(r1)
 /* 80066030 00062F70  39 61 01 A0 */ addi r11, r1, 0x1a0
-/* 80066034 00062F74  48 2F C1 CD */ bl func_80362200
+/* 80066034 00062F74  48 2F C1 CD */ bl _restgpr_19
 /* 80066038 00062F78  80 01 02 84 */ lwz r0, 0x284(r1)
 /* 8006603C 00062F7C  7C 08 03 A6 */ mtlr r0
 /* 80066040 00062F80  38 21 02 80 */ addi r1, r1, 0x280
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s
index e99017e3a5..089430844f 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s
@@ -18,7 +18,7 @@
 /* 80066580 000634C0  DB 01 02 60 */ stfd f24, 0x260(r1)
 /* 80066584 000634C4  F3 01 02 68 */ psq_st f24, 616(r1), 0, 0
 /* 80066588 000634C8  39 61 02 60 */ addi r11, r1, 0x260
-/* 8006658C 000634CC  48 2F BC 21 */ bl func_803621AC
+/* 8006658C 000634CC  48 2F BC 21 */ bl _savegpr_17
 /* 80066590 000634D0  7C 78 1B 78 */ mr r24, r3
 /* 80066594 000634D4  7C 97 23 78 */ mr r23, r4
 /* 80066598 000634D8  3C 60 80 43 */ lis r3, lbl_8042CA54@ha
@@ -1018,7 +1018,7 @@ lbl_80067430:
 /* 80067468 000643A8  E3 01 02 68 */ psq_l f24, 616(r1), 0, 0
 /* 8006746C 000643AC  CB 01 02 60 */ lfd f24, 0x260(r1)
 /* 80067470 000643B0  39 61 02 60 */ addi r11, r1, 0x260
-/* 80067474 000643B4  48 2F AD 85 */ bl func_803621F8
+/* 80067474 000643B4  48 2F AD 85 */ bl _restgpr_17
 /* 80067478 000643B8  80 01 02 E4 */ lwz r0, 0x2e4(r1)
 /* 8006747C 000643BC  7C 08 03 A6 */ mtlr r0
 /* 80067480 000643C0  38 21 02 E0 */ addi r1, r1, 0x2e0
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s
index e541a26cbf..e6166e4723 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s
@@ -38,7 +38,7 @@
 /* 8006751C 0006445C  D9 C1 02 00 */ stfd f14, 0x200(r1)
 /* 80067520 00064460  F1 C1 02 08 */ psq_st f14, 520(r1), 0, 0
 /* 80067524 00064464  39 61 02 00 */ addi r11, r1, 0x200
-/* 80067528 00064468  48 2F AC 79 */ bl func_803621A0
+/* 80067528 00064468  48 2F AC 79 */ bl _savegpr_14
 /* 8006752C 0006446C  7C 70 1B 78 */ mr r16, r3
 /* 80067530 00064470  7C 8F 23 78 */ mr r15, r4
 /* 80067534 00064474  3C 60 80 42 */ lis r3, lbl_80424950@ha
@@ -1147,7 +1147,7 @@ lbl_80068534:
 /* 800685BC 000654FC  E1 C1 02 08 */ psq_l f14, 520(r1), 0, 0
 /* 800685C0 00065500  C9 C1 02 00 */ lfd f14, 0x200(r1)
 /* 800685C4 00065504  39 61 02 00 */ addi r11, r1, 0x200
-/* 800685C8 00065508  48 2F 9C 25 */ bl func_803621EC
+/* 800685C8 00065508  48 2F 9C 25 */ bl _restgpr_14
 /* 800685CC 0006550C  80 01 03 24 */ lwz r0, 0x324(r1)
 /* 800685D0 00065510  7C 08 03 A6 */ mtlr r0
 /* 800685D4 00065514  38 21 03 20 */ addi r1, r1, 0x320
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s
index d5de9c507c..949b1c97ee 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s
@@ -28,7 +28,7 @@
 /* 80068648 00065588  DA 61 01 E0 */ stfd f19, 0x1e0(r1)
 /* 8006864C 0006558C  F2 61 01 E8 */ psq_st f19, 488(r1), 0, 0
 /* 80068650 00065590  39 61 01 E0 */ addi r11, r1, 0x1e0
-/* 80068654 00065594  48 2F 9B 65 */ bl func_803621B8
+/* 80068654 00065594  48 2F 9B 65 */ bl _savegpr_20
 /* 80068658 00065598  7C 78 1B 78 */ mr r24, r3
 /* 8006865C 0006559C  3C 60 80 42 */ lis r3, lbl_80424950@ha
 /* 80068660 000655A0  3B E3 49 50 */ addi r31, r3, lbl_80424950@l
@@ -1027,7 +1027,7 @@ lbl_8006948C:
 /* 800694EC 0006642C  E2 61 01 E8 */ psq_l f19, 488(r1), 0, 0
 /* 800694F0 00066430  CA 61 01 E0 */ lfd f19, 0x1e0(r1)
 /* 800694F4 00066434  39 61 01 E0 */ addi r11, r1, 0x1e0
-/* 800694F8 00066438  48 2F 8D 0D */ bl func_80362204
+/* 800694F8 00066438  48 2F 8D 0D */ bl _restgpr_20
 /* 800694FC 0006643C  80 01 02 B4 */ lwz r0, 0x2b4(r1)
 /* 80069500 00066440  7C 08 03 A6 */ mtlr r0
 /* 80069504 00066444  38 21 02 B0 */ addi r1, r1, 0x2b0
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s
index 4670bb9dfc..7b5d853db7 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s
@@ -24,7 +24,7 @@
 /* 8006A0EC 0006702C  DA A1 01 F0 */ stfd f21, 0x1f0(r1)
 /* 8006A0F0 00067030  F2 A1 01 F8 */ psq_st f21, 504(r1), 0, 0
 /* 8006A0F4 00067034  39 61 01 F0 */ addi r11, r1, 0x1f0
-/* 8006A0F8 00067038  48 2F 80 A9 */ bl func_803621A0
+/* 8006A0F8 00067038  48 2F 80 A9 */ bl _savegpr_14
 /* 8006A0FC 0006703C  7C 7C 1B 78 */ mr r28, r3
 /* 8006A100 00067040  7C 9D 23 78 */ mr r29, r4
 /* 8006A104 00067044  7C AE 2B 78 */ mr r14, r5
@@ -1128,7 +1128,7 @@ lbl_8006B120:
 /* 8006B170 000680B0  E2 A1 01 F8 */ psq_l f21, 504(r1), 0, 0
 /* 8006B174 000680B4  CA A1 01 F0 */ lfd f21, 0x1f0(r1)
 /* 8006B178 000680B8  39 61 01 F0 */ addi r11, r1, 0x1f0
-/* 8006B17C 000680BC  48 2F 70 71 */ bl func_803621EC
+/* 8006B17C 000680BC  48 2F 70 71 */ bl _restgpr_14
 /* 8006B180 000680C0  80 01 02 A4 */ lwz r0, 0x2a4(r1)
 /* 8006B184 000680C4  7C 08 03 A6 */ mtlr r0
 /* 8006B188 000680C8  38 21 02 A0 */ addi r1, r1, 0x2a0
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s
index 1e8ce59c91..1a21d299d3 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s
@@ -644,7 +644,7 @@ lbl_8006E3C8:
 /* 8006E428 0006B368  E2 61 01 88 */ psq_l f19, 392(r1), 0, 0
 /* 8006E42C 0006B36C  CA 61 01 80 */ lfd f19, 0x180(r1)
 /* 8006E430 0006B370  39 61 01 80 */ addi r11, r1, 0x180
-/* 8006E434 0006B374  48 2F 3D DD */ bl func_80362210
+/* 8006E434 0006B374  48 2F 3D DD */ bl _restgpr_23
 /* 8006E438 0006B378  80 01 02 54 */ lwz r0, 0x254(r1)
 /* 8006E43C 0006B37C  7C 08 03 A6 */ mtlr r0
 /* 8006E440 0006B380  38 21 02 50 */ addi r1, r1, 0x250
diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s
index 59bd94224a..93bec20ece 100644
--- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s
+++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s
@@ -708,7 +708,7 @@ lbl_8006F128:
 /* 8006F140 0006C080  E3 81 01 78 */ psq_l f28, 376(r1), 0, 0
 /* 8006F144 0006C084  CB 81 01 70 */ lfd f28, 0x170(r1)
 /* 8006F148 0006C088  39 61 01 70 */ addi r11, r1, 0x170
-/* 8006F14C 0006C08C  48 2F 30 C1 */ bl func_8036220C
+/* 8006F14C 0006C08C  48 2F 30 C1 */ bl _restgpr_22
 /* 8006F150 0006C090  80 01 01 B4 */ lwz r0, 0x1b4(r1)
 /* 8006F154 0006C094  7C 08 03 A6 */ mtlr r0
 /* 8006F158 0006C098  38 21 01 B0 */ addi r1, r1, 0x1b0
diff --git a/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s b/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s
index c471717b1c..f73b855823 100644
--- a/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s
+++ b/include/d/d_meter/d_meter_HIO/asm/func_801FE730.s
@@ -2,7 +2,7 @@
 /* 801FE734 001FB674  7C 08 02 A6 */ mflr r0
 /* 801FE738 001FB678  90 01 00 44 */ stw r0, 0x44(r1)
 /* 801FE73C 001FB67C  39 61 00 40 */ addi r11, r1, 0x40
-/* 801FE740 001FB680  48 16 3A 71 */ bl func_803621B0
+/* 801FE740 001FB680  48 16 3A 71 */ bl _savegpr_18
 /* 801FE744 001FB684  3C 80 80 39 */ lis r4, lbl_80397E50@ha
 /* 801FE748 001FB688  39 04 7E 50 */ addi r8, r4, lbl_80397E50@l
 /* 801FE74C 001FB68C  3C 80 80 3C */ lis r4, lbl_803BF16C@ha
@@ -101,7 +101,7 @@ lbl_801FE7C8:
 /* 801FE8BC 001FB7FC  C0 02 AB 4C */ lfs f0, lbl_8045454C-_SDA2_BASE_(r2)
 /* 801FE8C0 001FB800  D0 03 02 10 */ stfs f0, 0x210(r3)
 /* 801FE8C4 001FB804  39 61 00 40 */ addi r11, r1, 0x40
-/* 801FE8C8 001FB808  48 16 39 35 */ bl func_803621FC
+/* 801FE8C8 001FB808  48 16 39 35 */ bl _restgpr_18
 /* 801FE8CC 001FB80C  80 01 00 44 */ lwz r0, 0x44(r1)
 /* 801FE8D0 001FB810  7C 08 03 A6 */ mtlr r0
 /* 801FE8D4 001FB814  38 21 00 40 */ addi r1, r1, 0x40
diff --git a/include/d/d_meter/d_meter_button/asm/func_80201404.s b/include/d/d_meter/d_meter_button/asm/func_80201404.s
index b6d6bc5bdb..7c0856b6f4 100644
--- a/include/d/d_meter/d_meter_button/asm/func_80201404.s
+++ b/include/d/d_meter/d_meter_button/asm/func_80201404.s
@@ -4,7 +4,7 @@
 /* 80201410 001FE350  DB E1 00 70 */ stfd f31, 0x70(r1)
 /* 80201414 001FE354  F3 E1 00 78 */ psq_st f31, 120(r1), 0, 0
 /* 80201418 001FE358  39 61 00 70 */ addi r11, r1, 0x70
-/* 8020141C 001FE35C  48 16 0D 85 */ bl func_803621A0
+/* 8020141C 001FE35C  48 16 0D 85 */ bl _savegpr_14
 /* 80201420 001FE360  7C 6F 1B 78 */ mr r15, r3
 /* 80201424 001FE364  7C 8E 23 78 */ mr r14, r4
 /* 80201428 001FE368  7C B1 2B 78 */ mr r17, r5
@@ -975,7 +975,7 @@ lbl_802021FC:
 /* 80202220 001FF160  E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0
 /* 80202224 001FF164  CB E1 00 70 */ lfd f31, 0x70(r1)
 /* 80202228 001FF168  39 61 00 70 */ addi r11, r1, 0x70
-/* 8020222C 001FF16C  48 15 FF C1 */ bl func_803621EC
+/* 8020222C 001FF16C  48 15 FF C1 */ bl _restgpr_14
 /* 80202230 001FF170  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 80202234 001FF174  7C 08 03 A6 */ mtlr r0
 /* 80202238 001FF178  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_meter/d_meter_button/asm/func_80202240.s b/include/d/d_meter/d_meter_button/asm/func_80202240.s
index 0cdbc7a66e..c9a746a304 100644
--- a/include/d/d_meter/d_meter_button/asm/func_80202240.s
+++ b/include/d/d_meter/d_meter_button/asm/func_80202240.s
@@ -8,7 +8,7 @@
 /* 8020225C 001FF19C  DB A1 03 30 */ stfd f29, 0x330(r1)
 /* 80202260 001FF1A0  F3 A1 03 38 */ psq_st f29, 824(r1), 0, 0
 /* 80202264 001FF1A4  39 61 03 30 */ addi r11, r1, 0x330
-/* 80202268 001FF1A8  48 15 FF 55 */ bl func_803621BC
+/* 80202268 001FF1A8  48 15 FF 55 */ bl _savegpr_21
 /* 8020226C 001FF1AC  7C 7E 1B 78 */ mr r30, r3
 /* 80202270 001FF1B0  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 80202274 001FF1B4  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -560,7 +560,7 @@ lbl_80202A50:
 /* 80202A7C 001FF9BC  E3 A1 03 38 */ psq_l f29, 824(r1), 0, 0
 /* 80202A80 001FF9C0  CB A1 03 30 */ lfd f29, 0x330(r1)
 /* 80202A84 001FF9C4  39 61 03 30 */ addi r11, r1, 0x330
-/* 80202A88 001FF9C8  48 15 F7 81 */ bl func_80362208
+/* 80202A88 001FF9C8  48 15 F7 81 */ bl _restgpr_21
 /* 80202A8C 001FF9CC  80 01 03 64 */ lwz r0, 0x364(r1)
 /* 80202A90 001FF9D0  7C 08 03 A6 */ mtlr r0
 /* 80202A94 001FF9D4  38 21 03 60 */ addi r1, r1, 0x360
diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s
index 3c9ad70dd9..be5b974e92 100644
--- a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s
+++ b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s
@@ -237,7 +237,7 @@ lbl_8020FA18:
 /* 8020FA68 0020C9A8  E3 01 00 88 */ psq_l f24, 136(r1), 0, 0
 /* 8020FA6C 0020C9AC  CB 01 00 80 */ lfd f24, 0x80(r1)
 /* 8020FA70 0020C9B0  39 61 00 80 */ addi r11, r1, 0x80
-/* 8020FA74 0020C9B4  48 15 27 9D */ bl func_80362210
+/* 8020FA74 0020C9B4  48 15 27 9D */ bl _restgpr_23
 /* 8020FA78 0020C9B8  80 01 01 04 */ lwz r0, 0x104(r1)
 /* 8020FA7C 0020C9BC  7C 08 03 A6 */ mtlr r0
 /* 8020FA80 0020C9C0  38 21 01 00 */ addi r1, r1, 0x100
diff --git a/include/d/d_meter2/d_meter2/asm/func_80221244.s b/include/d/d_meter2/d_meter2/asm/func_80221244.s
index b96be935ed..91670f2381 100644
--- a/include/d/d_meter2/d_meter2/asm/func_80221244.s
+++ b/include/d/d_meter2/d_meter2/asm/func_80221244.s
@@ -6,7 +6,7 @@
 /* 80221258 0021E198  DB C1 00 50 */ stfd f30, 0x50(r1)
 /* 8022125C 0021E19C  F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0
 /* 80221260 0021E1A0  39 61 00 50 */ addi r11, r1, 0x50
-/* 80221264 0021E1A4  48 14 0F 59 */ bl func_803621BC
+/* 80221264 0021E1A4  48 14 0F 59 */ bl _savegpr_21
 /* 80221268 0021E1A8  7C 7B 1B 78 */ mr r27, r3
 /* 8022126C 0021E1AC  3B C0 00 00 */ li r30, 0
 /* 80221270 0021E1B0  3B A0 00 00 */ li r29, 0
@@ -390,7 +390,7 @@ lbl_802217CC:
 /* 802217D4 0021E714  E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0
 /* 802217D8 0021E718  CB C1 00 50 */ lfd f30, 0x50(r1)
 /* 802217DC 0021E71C  39 61 00 50 */ addi r11, r1, 0x50
-/* 802217E0 0021E720  48 14 0A 29 */ bl func_80362208
+/* 802217E0 0021E720  48 14 0A 29 */ bl _restgpr_21
 /* 802217E4 0021E724  80 01 00 74 */ lwz r0, 0x74(r1)
 /* 802217E8 0021E728  7C 08 03 A6 */ mtlr r0
 /* 802217EC 0021E72C  38 21 00 70 */ addi r1, r1, 0x70
diff --git a/include/d/d_meter2/d_meter2/asm/func_802217F4.s b/include/d/d_meter2/d_meter2/asm/func_802217F4.s
index fc279e1864..423c424370 100644
--- a/include/d/d_meter2/d_meter2/asm/func_802217F4.s
+++ b/include/d/d_meter2/d_meter2/asm/func_802217F4.s
@@ -6,7 +6,7 @@
 /* 80221808 0021E748  DB C1 00 50 */ stfd f30, 0x50(r1)
 /* 8022180C 0021E74C  F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0
 /* 80221810 0021E750  39 61 00 50 */ addi r11, r1, 0x50
-/* 80221814 0021E754  48 14 09 A9 */ bl func_803621BC
+/* 80221814 0021E754  48 14 09 A9 */ bl _savegpr_21
 /* 80221818 0021E758  7C 7B 1B 78 */ mr r27, r3
 /* 8022181C 0021E75C  3B C0 00 00 */ li r30, 0
 /* 80221820 0021E760  3B A0 00 00 */ li r29, 0
@@ -473,7 +473,7 @@ lbl_80221EA0:
 /* 80221EA8 0021EDE8  E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0
 /* 80221EAC 0021EDEC  CB C1 00 50 */ lfd f30, 0x50(r1)
 /* 80221EB0 0021EDF0  39 61 00 50 */ addi r11, r1, 0x50
-/* 80221EB4 0021EDF4  48 14 03 55 */ bl func_80362208
+/* 80221EB4 0021EDF4  48 14 03 55 */ bl _restgpr_21
 /* 80221EB8 0021EDF8  80 01 00 74 */ lwz r0, 0x74(r1)
 /* 80221EBC 0021EDFC  7C 08 03 A6 */ mtlr r0
 /* 80221EC0 0021EE00  38 21 00 70 */ addi r1, r1, 0x70
diff --git a/include/d/d_meter2/d_meter2/asm/func_802231C8.s b/include/d/d_meter2/d_meter2/asm/func_802231C8.s
index e75488b8d6..f01ad9b45c 100644
--- a/include/d/d_meter2/d_meter2/asm/func_802231C8.s
+++ b/include/d/d_meter2/d_meter2/asm/func_802231C8.s
@@ -2,7 +2,7 @@
 /* 802231CC 0022010C  7C 08 02 A6 */ mflr r0
 /* 802231D0 00220110  90 01 00 84 */ stw r0, 0x84(r1)
 /* 802231D4 00220114  39 61 00 80 */ addi r11, r1, 0x80
-/* 802231D8 00220118  48 13 EF DD */ bl func_803621B4
+/* 802231D8 00220118  48 13 EF DD */ bl _savegpr_19
 /* 802231DC 0022011C  7C 7F 1B 78 */ mr r31, r3
 /* 802231E0 00220120  38 00 00 00 */ li r0, 0
 /* 802231E4 00220124  98 03 02 01 */ stb r0, 0x201(r3)
@@ -397,7 +397,7 @@ lbl_802237AC:
 /* 802237B8 002206F8  4B DE BA 15 */ bl mDoExt_setCurrentHeap
 lbl_802237BC:
 /* 802237BC 002206FC  39 61 00 80 */ addi r11, r1, 0x80
-/* 802237C0 00220700  48 13 EA 41 */ bl func_80362200
+/* 802237C0 00220700  48 13 EA 41 */ bl _restgpr_19
 /* 802237C4 00220704  80 01 00 84 */ lwz r0, 0x84(r1)
 /* 802237C8 00220708  7C 08 03 A6 */ mtlr r0
 /* 802237CC 0022070C  38 21 00 80 */ addi r1, r1, 0x80
diff --git a/include/d/d_meter2/d_meter2/asm/func_80223E00.s b/include/d/d_meter2/d_meter2/asm/func_80223E00.s
index f16d9d2013..b800c2d9cb 100644
--- a/include/d/d_meter2/d_meter2/asm/func_80223E00.s
+++ b/include/d/d_meter2/d_meter2/asm/func_80223E00.s
@@ -2,7 +2,7 @@
 /* 80223E04 00220D44  7C 08 02 A6 */ mflr r0
 /* 80223E08 00220D48  90 01 00 44 */ stw r0, 0x44(r1)
 /* 80223E0C 00220D4C  39 61 00 40 */ addi r11, r1, 0x40
-/* 80223E10 00220D50  48 13 E3 A1 */ bl func_803621B0
+/* 80223E10 00220D50  48 13 E3 A1 */ bl _savegpr_18
 /* 80223E14 00220D54  7C 75 1B 78 */ mr r21, r3
 /* 80223E18 00220D58  3A E0 00 00 */ li r23, 0
 /* 80223E1C 00220D5C  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
@@ -295,7 +295,7 @@ lbl_80224234:
 /* 80224238 00221178  2C 12 00 02 */ cmpwi r18, 2
 /* 8022423C 0022117C  41 80 FF 68 */ blt lbl_802241A4
 /* 80224240 00221180  39 61 00 40 */ addi r11, r1, 0x40
-/* 80224244 00221184  48 13 DF B9 */ bl func_803621FC
+/* 80224244 00221184  48 13 DF B9 */ bl _restgpr_18
 /* 80224248 00221188  80 01 00 44 */ lwz r0, 0x44(r1)
 /* 8022424C 0022118C  7C 08 03 A6 */ mtlr r0
 /* 80224250 00221190  38 21 00 40 */ addi r1, r1, 0x40
diff --git a/include/d/d_meter2/d_meter2/asm/func_80224258.s b/include/d/d_meter2/d_meter2/asm/func_80224258.s
index d18ef3671d..d539ed50bd 100644
--- a/include/d/d_meter2/d_meter2/asm/func_80224258.s
+++ b/include/d/d_meter2/d_meter2/asm/func_80224258.s
@@ -60,7 +60,7 @@ lbl_80224330:
 /* 80224334 00221274  2C 1F 00 04 */ cmpwi r31, 4
 /* 80224338 00221278  41 80 FF 4C */ blt lbl_80224284
 /* 8022433C 0022127C  39 61 00 30 */ addi r11, r1, 0x30
-/* 80224340 00221280  48 13 DE D1 */ bl func_80362210
+/* 80224340 00221280  48 13 DE D1 */ bl _restgpr_23
 /* 80224344 00221284  80 01 00 34 */ lwz r0, 0x34(r1)
 /* 80224348 00221288  7C 08 03 A6 */ mtlr r0
 /* 8022434C 0022128C  38 21 00 30 */ addi r1, r1, 0x30
diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s
index f663c6a175..f96095866b 100644
--- a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s
+++ b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s
@@ -556,7 +556,7 @@ lbl_802102B0:
 /* 802102D8 0020D218  90 1F 03 6C */ stw r0, 0x36c(r31)
 /* 802102DC 0020D21C  7F E3 FB 78 */ mr r3, r31
 /* 802102E0 0020D220  39 61 00 70 */ addi r11, r1, 0x70
-/* 802102E4 0020D224  48 15 1F 29 */ bl func_8036220C
+/* 802102E4 0020D224  48 15 1F 29 */ bl _restgpr_22
 /* 802102E8 0020D228  80 01 00 74 */ lwz r0, 0x74(r1)
 /* 802102EC 0020D22C  7C 08 03 A6 */ mtlr r0
 /* 802102F0 0020D230  38 21 00 70 */ addi r1, r1, 0x70
diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s
index 4402e56c82..c9dfb82daf 100644
--- a/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s
+++ b/include/d/d_meter2/d_meter2_draw/asm/func_802102F8.s
@@ -2,7 +2,7 @@
 /* 802102FC 0020D23C  7C 08 02 A6 */ mflr r0
 /* 80210300 0020D240  90 01 00 44 */ stw r0, 0x44(r1)
 /* 80210304 0020D244  39 61 00 40 */ addi r11, r1, 0x40
-/* 80210308 0020D248  48 15 1E B1 */ bl func_803621B8
+/* 80210308 0020D248  48 15 1E B1 */ bl _savegpr_20
 /* 8021030C 0020D24C  7C 7F 1B 79 */ or. r31, r3, r3
 /* 80210310 0020D250  7C 9E 23 78 */ mr r30, r4
 /* 80210314 0020D254  41 82 0C 80 */ beq lbl_80210F94
@@ -900,7 +900,7 @@ lbl_80210F74:
 lbl_80210F94:
 /* 80210F94 0020DED4  7F E3 FB 78 */ mr r3, r31
 /* 80210F98 0020DED8  39 61 00 40 */ addi r11, r1, 0x40
-/* 80210F9C 0020DEDC  48 15 12 69 */ bl func_80362204
+/* 80210F9C 0020DEDC  48 15 12 69 */ bl _restgpr_20
 /* 80210FA0 0020DEE0  80 01 00 44 */ lwz r0, 0x44(r1)
 /* 80210FA4 0020DEE4  7C 08 03 A6 */ mtlr r0
 /* 80210FA8 0020DEE8  38 21 00 40 */ addi r1, r1, 0x40
diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s
index 0584097288..fad6f9f656 100644
--- a/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s
+++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s
@@ -10,7 +10,7 @@
 /* 80211540 0020E480  DB 81 00 E0 */ stfd f28, 0xe0(r1)
 /* 80211544 0020E484  F3 81 00 E8 */ psq_st f28, 232(r1), 0, 0
 /* 80211548 0020E488  39 61 00 E0 */ addi r11, r1, 0xe0
-/* 8021154C 0020E48C  48 15 0C 71 */ bl func_803621BC
+/* 8021154C 0020E48C  48 15 0C 71 */ bl _savegpr_21
 /* 80211550 0020E490  7C 79 1B 78 */ mr r25, r3
 /* 80211554 0020E494  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 80211558 0020E498  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
@@ -452,7 +452,7 @@ lbl_80211BB4:
 /* 80211BCC 0020EB0C  E3 81 00 E8 */ psq_l f28, 232(r1), 0, 0
 /* 80211BD0 0020EB10  CB 81 00 E0 */ lfd f28, 0xe0(r1)
 /* 80211BD4 0020EB14  39 61 00 E0 */ addi r11, r1, 0xe0
-/* 80211BD8 0020EB18  48 15 06 31 */ bl func_80362208
+/* 80211BD8 0020EB18  48 15 06 31 */ bl _restgpr_21
 /* 80211BDC 0020EB1C  80 01 01 24 */ lwz r0, 0x124(r1)
 /* 80211BE0 0020EB20  7C 08 03 A6 */ mtlr r0
 /* 80211BE4 0020EB24  38 21 01 20 */ addi r1, r1, 0x120
diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s
index a046e50320..3c923cb01b 100644
--- a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s
+++ b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s
@@ -949,7 +949,7 @@ lbl_80213364:
 /* 802134EC 0021042C  C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2)
 /* 802134F0 00210430  48 04 22 E1 */ bl CPaneMgrAlpha_NS_setAlphaRate
 /* 802134F4 00210434  39 61 00 70 */ addi r11, r1, 0x70
-/* 802134F8 00210438  48 14 ED 15 */ bl func_8036220C
+/* 802134F8 00210438  48 14 ED 15 */ bl _restgpr_22
 /* 802134FC 0021043C  80 01 00 74 */ lwz r0, 0x74(r1)
 /* 80213500 00210440  7C 08 03 A6 */ mtlr r0
 /* 80213504 00210444  38 21 00 70 */ addi r1, r1, 0x70
diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s
index 9f6952e782..148d7a78c9 100644
--- a/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s
+++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s
@@ -2,7 +2,7 @@
 /* 8021878C 002156CC  7C 08 02 A6 */ mflr r0
 /* 80218790 002156D0  90 01 00 A4 */ stw r0, 0xa4(r1)
 /* 80218794 002156D4  39 61 00 A0 */ addi r11, r1, 0xa0
-/* 80218798 002156D8  48 14 9A 0D */ bl func_803621A4
+/* 80218798 002156D8  48 14 9A 0D */ bl _savegpr_15
 /* 8021879C 002156DC  7C 72 1B 78 */ mr r18, r3
 /* 802187A0 002156E0  7C 93 23 78 */ mr r19, r4
 /* 802187A4 002156E4  3B A0 00 00 */ li r29, 0
@@ -604,7 +604,7 @@ lbl_80218F30:
 /* 80219000 00215F40  98 03 01 0B */ stb r0, 0x10b(r3)
 lbl_80219004:
 /* 80219004 00215F44  39 61 00 A0 */ addi r11, r1, 0xa0
-/* 80219008 00215F48  48 14 91 E9 */ bl func_803621F0
+/* 80219008 00215F48  48 14 91 E9 */ bl _restgpr_15
 /* 8021900C 00215F4C  80 01 00 A4 */ lwz r0, 0xa4(r1)
 /* 80219010 00215F50  7C 08 03 A6 */ mtlr r0
 /* 80219014 00215F54  38 21 00 A0 */ addi r1, r1, 0xa0
diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s b/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s
index 7cb9e26503..69576e3af3 100644
--- a/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s
+++ b/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s
@@ -2,7 +2,7 @@
 /* 8021CF0C 00219E4C  7C 08 02 A6 */ mflr r0
 /* 8021CF10 00219E50  90 01 00 44 */ stw r0, 0x44(r1)
 /* 8021CF14 00219E54  39 61 00 40 */ addi r11, r1, 0x40
-/* 8021CF18 00219E58  48 14 52 9D */ bl func_803621B4
+/* 8021CF18 00219E58  48 14 52 9D */ bl _savegpr_19
 /* 8021CF1C 00219E5C  7C 7F 1B 78 */ mr r31, r3
 /* 8021CF20 00219E60  7C 94 23 78 */ mr r20, r4
 /* 8021CF24 00219E64  7C B6 2B 78 */ mr r22, r5
@@ -293,7 +293,7 @@ lbl_8021D34C:
 lbl_8021D350:
 /* 8021D350 0021A290  7E 63 9B 78 */ mr r3, r19
 /* 8021D354 0021A294  39 61 00 40 */ addi r11, r1, 0x40
-/* 8021D358 0021A298  48 14 4E A9 */ bl func_80362200
+/* 8021D358 0021A298  48 14 4E A9 */ bl _restgpr_19
 /* 8021D35C 0021A29C  80 01 00 44 */ lwz r0, 0x44(r1)
 /* 8021D360 0021A2A0  7C 08 03 A6 */ mtlr r0
 /* 8021D364 0021A2A4  38 21 00 40 */ addi r1, r1, 0x40
diff --git a/include/d/d_meter2/d_meter2_info/d_meter2_info.h b/include/d/d_meter2/d_meter2_info/d_meter2_info.h
index 8fdbdf61a0..5238aa141a 100644
--- a/include/d/d_meter2/d_meter2_info/d_meter2_info.h
+++ b/include/d/d_meter2/d_meter2_info/d_meter2_info.h
@@ -1,12 +1,12 @@
 #ifndef __D_METER2_INFO_H_
 #define __D_METER2_INFO_H_
 
-#include "JSystem/JMessage/control/control.h"
-#include "dolphin/types.h"
 #include "JSystem/J2DGraph/J2DPicture/J2DPicture.h"
 #include "JSystem/J2DGraph/J2DScreen/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox/J2DTextBox.h"
+#include "JSystem/JMessage/control/control.h"
 #include "JSystem/JUtility/JUTFont/JUTFont.h"
+#include "dolphin/types.h"
 
 struct dMeter2Info_c_vtable {
     u32* addr1;
diff --git a/include/d/d_save/d_save/asm/func_80035798.s b/include/d/d_save/d_save/asm/func_80035798.s
index a35449de64..2f10db059e 100644
--- a/include/d/d_save/d_save/asm/func_80035798.s
+++ b/include/d/d_save/d_save/asm/func_80035798.s
@@ -154,7 +154,7 @@ lbl_800359D0:
 /* 800359E4 00032924  48 33 0E 99 */	bl func_8036687C
 /* 800359E8 00032928  38 60 00 00 */	li r3, 0
 /* 800359EC 0003292C  39 61 00 30 */	addi r11, r1, 0x30
-/* 800359F0 00032930  48 32 C8 1D */	bl func_8036220C
+/* 800359F0 00032930  48 32 C8 1D */	bl _restgpr_22
 /* 800359F4 00032934  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 800359F8 00032938  7C 08 03 A6 */	mtlr r0
 /* 800359FC 0003293C  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h
index 060c470cc9..595c33bcb8 100644
--- a/include/d/d_save/d_save/d_save.h
+++ b/include/d/d_save/d_save/d_save.h
@@ -865,7 +865,7 @@ private:
     dSv_reserve_c reserve;
     dSv_MiniGame_c minigame_flags;
 };
-#pragma pack(push,1)
+#pragma pack(push, 1)
 class dSv_info_c {
 public:
     void init(void);
diff --git a/include/functions.h b/include/functions.h
index f6f406982b..ce2b01f85f 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -20,11 +20,11 @@ void PSMTXScale(void);
 void screenSet__12dFile_info_cFv(void);
 void dFile_info_c_NS_screenSet(void);
 void mDoExt_removeMesgFont(void);
-void func_80362210(void);
+
 void JKRAramHeap_NS_getTotalFreeSize(void);
 void JKRAramHeap_NS_getFreeSize(void);
 void heapDisplay__9HeapCheckCFv(void);
-void _savegpr_23(void);
+
 void init__20dSv_player_collect_cFv(void);
 void dComIfGp_setSelectItem(int);
 void getUsedCount__9HeapCheckCFv(void);
@@ -32,25 +32,11 @@ void isEventBit__11dSv_event_cCFUs(void);
 char* strcpy(char*, const char*);
 int strcmp(char*, char*);
 void setBombNum__21dSv_player_item_max_cFUcUc(void);
-void func_80362224(void);
-void func_803621D8(void);
-void _savegpr_25(void);
-void _restgpr_25(void);
-void _restgpr_26(void);
-void _savegpr_26(void);
-void func_8036221C(void);
-void func_803621D0(void);
+
 void func_803620AC(void);
 void func_803626BC(void);
 void func_803664DC(void);
-void _restgpr_29(void);
-void _savegpr_29(void);
-void _restgpr_28(void);
-void _savegpr_28(void);
-void _restgpr_27(void);
-void _savegpr_27(void);
-void _savegpr_26(void);
-void _restgpr_26(void);
+
 void JKRAramHeap_NS_dump(void);
 void dRes_control_c_NS_dump(void);
 void JUTConsole_NS_getLineOffset(void);
@@ -60,7 +46,7 @@ void JUTConsole_NS_clear(void);
 void JUTReport_X1_(void);
 void JUTAssertion_NS_setMessageCount(void);
 void DynamicModuleControlBase_NS_dump(void);
-void _restgpr_25(void);
+
 unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
 void setLineUpItem__17dSv_player_item_cFv(void);
 void dMeter2Info_c_NS_setHotSpringTimer(void);
@@ -103,18 +89,17 @@ void isItem__12dSv_memBit_cCFi(void);
 void isItem__12dSv_danBit_cCFi(void);
 void off__15dSv_zoneActor_cFi(void);
 void is__15dSv_zoneActor_cCFi(void);
-void func_8036220C(void);
+
 void onEventBit__11dSv_event_cFUs(void);
 void func_8036687C(void);
 void func_80003540(void);
 void func_80362324(void);
-void func_8036221C(void);
-void func_8036221C(void);
+
 void countUsed__FP10JKRExpHeap(void);
 void JUTReport(void);
-void func_803621D0(void);
+
 void offEventBit__11dSv_event_cFUs(void);
-void _savegpr_22(void);
+
 void dMeter2Info_c_NS_setSaveStageName(void);
 void dComIfG_play_c_NS_setNowVibration(void);
 void getVibration__19dSv_player_config_cFv(void);
@@ -177,18 +162,9 @@ void JUTReportConsole_f(void);
 void JUTWarningConsole(void);
 void JUTWarningConsole_f(void);
 
-void _savegpr_25(void);
 void VIWaitForRetrace(void);
 void func_80361C24(void);
 
-void _restgpr_26(void);
-void _restgpr_27(void);
-void _restgpr_28(void);
-void _restgpr_29(void);
-void _savegpr_26(void);
-void _savegpr_27(void);
-void _savegpr_28(void);
-void _savegpr_29(void);
 void func_80003540(void);
 void func_80365470(void);
 void func_803688DC(void);
@@ -196,13 +172,8 @@ void func_80368ABC(void);
 void func_80368BE4(void);
 void JKRArchive_NS_getDirEntry(void);
 
-void _restgpr_29(void);
-void _savegpr_29(void);
 void func_80361C24(void);
 
-void _savegpr_25(void);
-void _restgpr_25(void);
-
 void JKRArchive_NS_findDirectory(void);
 void JKRArchive_NS_findFsResource(void);
 void JKRArchive_NS_findIdResource(void);
@@ -217,8 +188,7 @@ void func_80365470(void);
 void DCInvalidateRange(void);
 void JKRDvdRipper_NS_loadToMainRAM_X1_(void);
 void func_80003458(void);
-void _savegpr_25(void);
-void _restgpr_25(void);
+
 void func_803650D0(void);
 
 void JKRDecomp_NS_orderSync(void);
@@ -235,12 +205,6 @@ void DCStoreRangeNoSync(void);
 void __RAS_OSDisableInterrupts_begin(void);
 void func_80003540(void);
 void func_80361C24(void);
-void func_803621B0(void);
-void _savegpr_23(void);
-void _savegpr_24(void);
-void func_803621FC(void);
-void func_80362210(void);
-void _restgpr_24(void);
 
 void ARQPostRequest(void);
 void DCStoreRange(void);
@@ -294,42 +258,26 @@ void PSMTXScale(void);
 void screenSet__12dFile_info_cFv(void);
 void dFile_info_c_NS_screenSet(void);
 void mDoExt_removeMesgFont(void);
-void func_80362210(void);
+
 void JKRAramHeap_NS_getTotalFreeSize(void);
 void JKRAramHeap_NS_getFreeSize(void);
 void heapDisplay__9HeapCheckCFv(void);
-void _savegpr_23(void);
+
 void init__20dSv_player_collect_cFv(void);
 void dComIfGp_setSelectItem(int);
 void getUsedCount__9HeapCheckCFv(void);
 void isEventBit__11dSv_event_cCFUs(void);
-void dComIfGs_setMixItemIndex(int,u8);
-void dComIfGs_setSelectItemIndex(int,u8);
+void dComIfGs_setMixItemIndex(int, u8);
+void dComIfGs_setSelectItemIndex(int, u8);
 void dComIfGs_getMixItemIndex(int);
 char* strcpy(char*, const char*);
 int strcmp(char*, char*);
 void setBombNum__21dSv_player_item_max_cFUcUc(void);
-void func_80362224(void);
-void func_803621D8(void);
-void _savegpr_25(void);
-void _restgpr_25(void);
-void _restgpr_26(void);
-void _savegpr_26(void);
-void _savegpr_25(void);
-void _restgpr_25(void);
-void func_8036221C(void);
-void func_803621D0(void);
+
 void func_803620AC(void);
 void func_803626BC(void);
 void func_803664DC(void);
-void _restgpr_29(void);
-void _savegpr_29(void);
-void _restgpr_28(void);
-void _savegpr_28(void);
-void _restgpr_27(void);
-void _savegpr_27(void);
-void _savegpr_26(void);
-void _restgpr_26(void);
+
 void JKRAramHeap_NS_dump(void);
 void dRes_control_c_NS_dump(void);
 void JUTConsole_NS_getLineOffset(void);
@@ -339,7 +287,7 @@ void JUTConsole_NS_clear(void);
 void JUTReport_X1_(void);
 void JUTAssertion_NS_setMessageCount(void);
 void DynamicModuleControlBase_NS_dump(void);
-void _restgpr_25(void);
+
 unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int);
 void setLineUpItem__17dSv_player_item_cFv(void);
 void dMeter2Info_c_NS_setHotSpringTimer(void);
@@ -367,7 +315,7 @@ void init__10dSv_info_cFvZone(void);
 void init__10dSv_zone_cFi(void);
 void onOneSwitch__13dSv_zoneBit_cFi(void);
 void onSwitch__13dSv_zoneBit_cFi(void);
-int dStage_roomControl_c_NS_getZoneNo(int,int);
+int dStage_roomControl_c_NS_getZoneNo(int, int);
 void onSwitch__12dSv_danBit_cFi(void);
 void onSwitch__12dSv_memBit_cFi(void);
 void revOneSwitch__13dSv_zoneBit_cFi(void);
@@ -384,18 +332,17 @@ void isItem__12dSv_memBit_cCFi(void);
 void isItem__12dSv_danBit_cCFi(void);
 void off__15dSv_zoneActor_cFi(void);
 void is__15dSv_zoneActor_cCFi(void);
-void func_8036220C(void);
+
 void onEventBit__11dSv_event_cFUs(void);
 void func_8036687C(void);
 void func_80003540(void);
 void func_80362324(void);
-void func_8036221C(void);
-void func_8036221C(void);
+
 void countUsed__FP10JKRExpHeap(void);
 void JUTReport(void);
-void func_803621D0(void);
+
 void offEventBit__11dSv_event_cFUs(void);
-void _savegpr_22(void);
+
 void dMeter2Info_c_NS_setSaveStageName(void);
 void dComIfG_play_c_NS_setNowVibration(void);
 void getVibration__19dSv_player_config_cFv(void);
@@ -459,17 +406,8 @@ void JUTReportConsole_f(void);
 void JUTWarningConsole(void);
 void JUTWarningConsole_f(void);
 
-void _savegpr_25(void);
 void func_80361C24(void);
 
-void _restgpr_26(void);
-void _restgpr_27(void);
-void _restgpr_28(void);
-void _restgpr_29(void);
-void _savegpr_26(void);
-void _savegpr_27(void);
-void _savegpr_28(void);
-void _savegpr_29(void);
 void func_80003540(void);
 void func_80365470(void);
 void func_803688DC(void);
@@ -477,13 +415,8 @@ void func_80368ABC(void);
 void func_80368BE4(void);
 void JKRArchive_NS_getDirEntry(void);
 
-void _restgpr_29(void);
-void _savegpr_29(void);
 void func_80361C24(void);
 
-void _savegpr_25(void);
-void _restgpr_25(void);
-
 // void JKRAramArchive(void);
 void JKRArchive_NS_findDirectory(void);
 void JKRArchive_NS_findFsResource(void);
@@ -499,8 +432,7 @@ void func_80365470(void);
 void DCInvalidateRange(void);
 void JKRDvdRipper_NS_loadToMainRAM_X1_(void);
 void func_80003458(void);
-void _savegpr_25(void);
-void _restgpr_25(void);
+
 void func_803650D0(void);
 
 void JKRDecomp_NS_orderSync(void);
@@ -517,12 +449,6 @@ void DCStoreRangeNoSync(void);
 void __RAS_OSDisableInterrupts_begin(void);
 void func_80003540(void);
 void func_80361C24(void);
-void func_803621B0(void);
-void _savegpr_23(void);
-void _savegpr_24(void);
-void func_803621FC(void);
-void func_80362210(void);
-void _restgpr_24(void);
 
 void ARQPostRequest(void);
 void DCStoreRange(void);
@@ -708,7 +634,7 @@ void resetFilterAll__10Z2SoundMgrFv(void);
 void moveVolume__18JAISoundParamsMoveFfUl(void);
 void Z2SeqMgr_NS_setBattleBgmOff(void);
 void setSceneExist__10Z2SceneMgrFb(void);
-void func_803621F4(void);
+
 void Z2SceneMgr_NS_sceneChange(void);
 void __ct__10JAISoundIDFRC10JAISoundID(void);
 void Z2EnvSeMgr_NS_initSceneEnvSe(void);
@@ -735,7 +661,7 @@ void Z2SeqMgr_NS_setTwilightGateVol(void);
 void Z2SeqMgr_NS_setWindStoneVol(void);
 void Z2SeqMgr_NS_resetBattleBgmParams(void);
 void JAISoundID_X1_(void);
-void func_803621A8(void);
+
 void moveVolume__18JAISoundParamsMoveFfUl(void);
 class Z2SoundMgr;
 void Z2SoundMgr_NS_pauseAllGameSound(Z2SoundMgr*, bool);
@@ -807,12 +733,12 @@ void item_func_BEE_CHILD(void);
 int func_80368954(char*, char*, u32);
 void dComIfG_play_c_NS_getLayerNo(int);
 u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8);
-void func_80362204(void);
+
 void dComIfG_play_c_NS_setItemBombNumCount(u8, s16);
 void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(u8, bool);
 u32 getBombNum__21dSv_player_item_max_cCFUc(u8);
 u8 getBombNum__24dSv_player_item_record_cCFUc(u8);
-void func_803621B8(void);
+
 int checkItemGet__FUci(u8, int);
 }
 
@@ -1263,7 +1189,7 @@ void dAttention_c_NS_stockAttention(void);
 void distace_angle_adjust(void);
 void dAttDraw_c_NS_draw(void);
 void dAttCatch_c_NS_convPId(void);
-void func_80362208(void);
+
 void dAttDraw_c_NS_setAnm(void);
 void dAttention_c_NS_lockSoundStart(void);
 void fopAcM_searchActorDistance(void);
@@ -1324,7 +1250,7 @@ void dAttention_c_NS_ActionTarget(void);
 void cSAngle_NS___mi_X2_(void);
 void dAttention_c_NS_GetLockonList(void);
 void dAttHint_c_NS_init(void);
-//void dAttention_c(void);
+// void dAttention_c(void);
 void PSMTXTrans(void);
 void dAttention_c_NS_makeList(void);
 void mDoExt_bpkAnm_NS_entry(void);
@@ -1347,8 +1273,7 @@ void dAttDrawParam_c_NS_dtor(void);
 void dAttDraw_c_NS_alphaAnm(void);
 void dAttention_c_NS_LockonReleaseDistanse(void);
 void dAttention_c_NS_runDebugDisp(void);
-void func_803621BC(void);
-//void dAttParam_c(void);
+
 void dAttention_c_NS_judgementStatus4Hold(void);
 void dAttention_c_NS_calcWeight(void);
 void dAttHint_c_NS_getPId(void);
@@ -1407,7 +1332,7 @@ void func_801119D8(void);
 void daAlink_c_NS_setLandPassiveData(void);
 void func_800D0290(void);
 void daAlink_c_NS_setCutTurnEffect(void);
-void func_80362208(void);
+
 void func_8014190C(void);
 void daAlink_c_NS_checkHorseGetOffDirection(void);
 void func_80101534(void);
@@ -1668,7 +1593,7 @@ void daAlink_c_NS_getSwimMaxFallSpeed(void);
 void JPAParticleCallBack_NS_dtor(void);
 void func_801417D4(void);
 void func_8011E960(void);
-void func_803621EC(void);
+
 void setLinkBootsType__14Z2CreatureLinkFl(void);
 void cM_atan2s(void);
 void daAlink_c_NS_setLastSceneMode(void);
@@ -2004,7 +1929,7 @@ void dStage_stagInfo_GetSaveTbl(void);
 void daAlink_c_NS_setWolfScreamWaitAnime(void);
 void daObjSwHang_c_NS_getHangPos(void);
 void func_800C4514(void);
-void func_803621F0(void);
+
 void daAlink_c_NS_checkAtnWaitAnime(void);
 void dKy_plight_cut(void);
 void Z2Creature_NS_updateAnime(void);
@@ -2203,7 +2128,7 @@ void func_800D0688(void);
 void daAlink_c_NS_checkHangStartSideWall(void);
 void daAlink_c_NS_setDrawHand(void);
 void cM_rnd(void);
-void func_803621BC(void);
+
 void dCcD_GObjInf_NS_GetAtHitGObj(void);
 void dBgS_RoofChk(void);
 void daAlink_c_NS_getCutDirection(void);
@@ -2301,7 +2226,7 @@ void func_801391DC(void);
 void daAlink_c_NS_setWolfAnmVoice(void);
 void func_80362018(void);
 void daAlink_c_NS_resetWolfAtCollision(void);
-void func_803621A4(void);
+
 void func_800EA4CC(void);
 void daAlink_c_NS_getLadderMoveAnmSpeed(void);
 void daAlink_c_NS_checkBoomerangCatchAction(void);
@@ -2929,7 +2854,7 @@ void func_80140038(void);
 void daAlink_c_NS_seStartSwordCut(void);
 void daAlink_c_NS_checkItemButtonChange(void);
 void daAlink_c_NS_setOctaIealHangPos(void);
-void func_803621A0(void);
+
 void daAlink_c_NS_procCutJumpInit(void);
 void func_8011A5CC(void);
 void daAlink_c_NS_checkWolfComboCnt(void);
@@ -4211,7 +4136,7 @@ void dComIfGs_setWarpItemData_X1_(void);
 void dMeter2Info_setNewLetterSender(void);
 void dMeter2Info_getNewLetterNum(void);
 void dMsgFlow_c_NS_getMsgNo(void);
-void func_80362200(void);
+
 void func_8021C11C(void);
 void dMeter2Info_c_NS_isFloatingMessageVisible(void);
 void dMeter2Info_c_NS_changeWater(void);
@@ -4238,7 +4163,7 @@ void dMeter2Info_c_NS_resetMeterString(void);
 void offFirstBit__21dSv_player_get_item_cFUc(void);
 void dComIfGs_setWarpMarkFlag(void);
 void func_8021C7F4(void);
-void func_803621B4(void);
+
 void dMeter2Info_c_NS_decMsgKeyWaitTimer(void);
 void dMeter2Info_c_NS_getItemType(void);
 void isLetterGetFlag__17dSv_letter_info_cCFi(void);
@@ -4778,7 +4703,7 @@ void dKy_efplight_cut(void);
 void forward_overhead_bg_chk(void);
 void dKy_set_bgcol_ratio(void);
 void dKy_GxFog_set(void);
-void func_80362200(void);
+
 void GXSetZCompLoc(void);
 void dKyr_moon_arrival_check(void);
 void PSVECAdd(Vec*, Vec*, Vec*);
@@ -4786,7 +4711,7 @@ void dKy_set_vrboxcol_ratio(void);
 void func_8036C590(void);
 void dBgS_CamGndChk_Wtr_NS_dtor(void);
 void func_8006F160(void);
-void func_803621F8(void);
+
 void dBgS_ObjGndChk_All_NS_dtor(void);
 void dKy_bg_addcol_amb_set(void);
 void dKy_set_fogcol_ratio(void);
@@ -4810,7 +4735,7 @@ void vectle_calc_X1_(void);
 void dKy_vrbox_addcol_sky0_set(void);
 void dKy_efplight_set(void);
 void dKy_set_actcol_ratio(void);
-void func_803621B4(void);
+
 void PSMTXRotRad(void);
 void daPy_py_c_NS_checkNowWolfEyeUp(void);
 void dKyr_near_bosslight_check(void);
@@ -4828,7 +4753,6 @@ void func_8036C028(void);
 void C_MTXLightPerspective(void);
 void cM3d_VectorProduct2d(void);
 void dCcMassS_Mng_NS_Prepare(void);
-void func_803621AC(void);
 }
 
 // additional symbols needed for d_kankyo.cpp
@@ -4961,7 +4885,7 @@ void func_801A7814(void);
 void func_801A789C(void);
 void dKy_bg3_addcol_amb_set(void);
 void dScnKy_env_light_c_NS_Eflight_flush_proc(void);
-void func_80362144(void);
+
 void func_801A441C(void);
 void BOSS_LIGHT_NS_dtor(void);
 void dKy_Outdoor_check(void);
@@ -4978,7 +4902,7 @@ void dKy_ParticleColor_get_base(void);
 void dScnKy_env_light_c_NS_setSunpos(void);
 void dKy_ParticleColor_get_actor(void);
 void dKy_pol_eff2_ratio_get(void);
-void func_80362190(void);
+
 void dKy_darkworld_Area_set(void);
 void dKy_shadow_mode_check(void);
 void mDoGph_gInf_c_NS_bloom_c_NS_create(void);
diff --git a/include/global.h b/include/global.h
index ce61a31439..bdfdf01300 100644
--- a/include/global.h
+++ b/include/global.h
@@ -8,8 +8,8 @@ struct Vec {
 };
 
 #include "dolphin/types.h"
-
 #include "functions.h"
+#include "mwcc.h"
 #include "os/OS.h"
 #include "variables.h"
 
diff --git a/include/m_Do/m_Do_main/asm/func_80005AD8.s b/include/m_Do/m_Do_main/asm/func_80005AD8.s
index 4fe782b51a..9048c2b44f 100644
--- a/include/m_Do/m_Do_main/asm/func_80005AD8.s
+++ b/include/m_Do/m_Do_main/asm/func_80005AD8.s
@@ -160,7 +160,7 @@ lbl_80005CD8:
 /* 80005D30 00002C70  41 80 FF 08 */	blt lbl_80005C38
 lbl_80005D34:
 /* 80005D34 00002C74  39 61 00 30 */	addi r11, r1, 0x30
-/* 80005D38 00002C78  48 35 C4 D9 */	bl func_80362210
+/* 80005D38 00002C78  48 35 C4 D9 */	bl _restgpr_23
 /* 80005D3C 00002C7C  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 80005D40 00002C80  7C 08 03 A6 */	mtlr r0
 /* 80005D44 00002C84  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/mwcc.h b/include/mwcc.h
new file mode 100644
index 0000000000..07c5536be5
--- /dev/null
+++ b/include/mwcc.h
@@ -0,0 +1,52 @@
+#ifndef _MWCC_H_
+#define _MWCC_H_
+
+extern "C" {
+void _savegpr_14(void);
+void _savegpr_15(void);
+void _savegpr_16(void);
+void _savegpr_17(void);
+void _savegpr_18(void);
+void _savegpr_19(void);
+void _savegpr_20(void);
+void _savegpr_21(void);
+void _savegpr_22(void);
+void _savegpr_23(void);
+void _savegpr_24(void);
+void _savegpr_25(void);
+void _savegpr_26(void);
+void _savegpr_27(void);
+void _savegpr_28(void);
+void _savegpr_29(void);
+
+void _restgpr_14(void);
+void _restgpr_15(void);
+void _restgpr_16(void);
+void _restgpr_17(void);
+void _restgpr_18(void);
+void _restgpr_19(void);
+void _restgpr_20(void);
+void _restgpr_21(void);
+void _restgpr_22(void);
+void _restgpr_23(void);
+void _restgpr_24(void);
+void _restgpr_25(void);
+void _restgpr_26(void);
+void _restgpr_27(void);
+void _restgpr_28(void);
+void _restgpr_29(void);
+
+void _savefpr_25(void);
+void _savefpr_26(void);
+void _savefpr_27(void);
+void _savefpr_28(void);
+void _savefpr_29(void);
+
+void _restfpr_25(void);
+void _restfpr_26(void);
+void _restfpr_27(void);
+void _restfpr_28(void);
+void _restfpr_29(void);
+}
+
+#endif
+\ No newline at end of file
author	Jonathan Wase <jonathan@familjenwase.se>	2021-01-03 05:15:12 +0100
committer	GitHub <noreply@github.com>	2021-01-02 23:15:12 -0500
commit	d2e9db37484e64f05830aad7b7e59f48139639f2 (patch)
tree	9c0b5d84e6305a71901b3cca22f320228d4cf02b /include
parent	609891bc25ed4341312a056b869f0a9b5619d875 (diff)