more d_save funcs OK, initial map out of dcomifg_play_c and it's classes

19 files changed, 59 insertions, 22 deletions

diff --git a/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
new file mode 100644
index 0000000000..35d90e7b20
--- /dev/null
+++ b/include/JSystem/J2DGraph/J2DPicture/J2DPicture.h
@@ -0,0 +1,8 @@
+#ifndef __J2DPICTURE_H_
+#define __J2DPICTURE_H_
+
+#include "global.h"
+
+class J2DPicture{};
+
+#endif
\ No newline at end of file
diff --git a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
index 52cffc57a2..c917c070f3 100644
--- a/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
@@ -1,5 +1,7 @@
-#ifndef J2DSCREEN_H_
-#define J2DSCREEN_H_
+#ifndef __J2DSCREEN_H_
+#define __J2DSCREEN_H_
+
+#include "global.h"
 
 class J2DScreen {};
 
diff --git a/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
new file mode 100644
index 0000000000..15d6edf34c
--- /dev/null
+++ b/include/JSystem/J2DGraph/J2DTextBox/J2DTextBox.h
@@ -0,0 +1,8 @@
+#ifndef __J2DTEXTBOX_H_
+#define __J2DTEXTBOX_H_
+
+#include "global.h"
+
+class J2DTextBox{};
+
+#endif
\ No newline at end of file
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
new file mode 100644
index 0000000000..bebf803743
--- /dev/null
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -0,0 +1,19 @@
+#ifndef __J3DANIMATION_H_
+#define __J3DANIMATION_H_
+
+#include "global.h"
+
+class J3DFrameCtrl {
+public:
+private:
+    void* vtable;
+    u8 field_0x4;
+    u8 field_0x5;
+    u16 field_0x6;
+    s16 field_0x8;
+    u16 field_0xa;
+    float field_0xc;
+    float field_0x10;
+};
+
+#endif
\ No newline at end of file
diff --git a/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s b/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s
index cf2f3592a3..84e5d17878 100644
--- a/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s
+++ b/include/JSystem/JKernel/JKRAram/asm/func_802D2830.s
@@ -4,7 +4,7 @@
 /* 802D2834 002CF774  7C 08 02 A6 */	mflr r0
 /* 802D2838 002CF778  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802D283C 002CF77C  39 61 00 30 */	addi r11, r1, 0x30
-/* 802D2840 002CF780  48 08 F9 8D */	bl func_803621CC
+/* 802D2840 002CF780  48 08 F9 8D */	bl _savegpr_25
 /* 802D2844 002CF784  7C 7A 1B 78 */	mr r26, r3
 /* 802D2848 002CF788  7C 9B 23 78 */	mr r27, r4
 /* 802D284C 002CF78C  7C BC 2B 78 */	mr r28, r5
diff --git a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s
index aa79dd2ac0..18cac1905e 100644
--- a/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s
+++ b/include/JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s
@@ -4,7 +4,7 @@
 /* 802D3618 002D0558  7C 08 02 A6 */	mflr r0
 /* 802D361C 002D055C  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802D3620 002D0560  39 61 00 30 */	addi r11, r1, 0x30
-/* 802D3624 002D0564  48 08 EB A9 */	bl func_803621CC
+/* 802D3624 002D0564  48 08 EB A9 */	bl _savegpr_25
 /* 802D3628 002D0568  7C 7A 1B 78 */	mr r26, r3
 /* 802D362C 002D056C  7C 9B 23 78 */	mr r27, r4
 /* 802D3630 002D0570  7C BC 2B 78 */	mr r28, r5
diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s
index c5aa5f9a6b..11970ccc3e 100644
--- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s
+++ b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s
@@ -4,7 +4,7 @@
 /* 802D3CE4 002D0C24  7C 08 02 A6 */	mflr r0
 /* 802D3CE8 002D0C28  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802D3CEC 002D0C2C  39 61 00 30 */	addi r11, r1, 0x30
-/* 802D3CF0 002D0C30  48 08 E4 D9 */	bl func_803621C8
+/* 802D3CF0 002D0C30  48 08 E4 D9 */	bl _savegpr_24
 /* 802D3CF4 002D0C34  7C 78 1B 78 */	mr r24, r3
 /* 802D3CF8 002D0C38  83 C3 00 08 */	lwz r30, 8(r3)
 /* 802D3CFC 002D0C3C  83 A3 00 14 */	lwz r29, 0x14(r3)
@@ -134,7 +134,7 @@ lbl_802D3EA4:
 /* 802D3EB0 002D0DF0  48 06 AB 45 */	bl OSSendMessage
 /* 802D3EB4 002D0DF4  7F 83 E3 78 */	mr r3, r28
 /* 802D3EB8 002D0DF8  39 61 00 30 */	addi r11, r1, 0x30
-/* 802D3EBC 002D0DFC  48 08 E3 59 */	bl func_80362214
+/* 802D3EBC 002D0DFC  48 08 E3 59 */	bl _restgpr_24
 /* 802D3EC0 002D0E00  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802D3EC4 002D0E04  7C 08 03 A6 */	mtlr r0
 /* 802D3EC8 002D0E08  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s
index 94e7d9f6e0..ad0584f715 100644
--- a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s
+++ b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s
@@ -4,7 +4,7 @@
 /* 802D89C0 002D5900  7C 08 02 A6 */	mflr r0
 /* 802D89C4 002D5904  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802D89C8 002D5908  39 61 00 30 */	addi r11, r1, 0x30
-/* 802D89CC 002D590C  48 08 98 01 */	bl func_803621CC
+/* 802D89CC 002D590C  48 08 98 01 */	bl _savegpr_25
 /* 802D89D0 002D5910  7C 7F 1B 78 */	mr r31, r3
 /* 802D89D4 002D5914  7C 9A 23 78 */	mr r26, r4
 /* 802D89D8 002D5918  38 00 00 00 */	li r0, 0
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s
index 107159f6b1..227d7f6f41 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s
+++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s
@@ -4,7 +4,7 @@
 /* 802DA9C4 002D7904  7C 08 02 A6 */	mflr r0
 /* 802DA9C8 002D7908  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802DA9CC 002D790C  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DA9D0 002D7910  48 08 77 F9 */	bl func_803621C8
+/* 802DA9D0 002D7910  48 08 77 F9 */	bl _savegpr_24
 /* 802DA9D4 002D7914  7C 78 1B 78 */	mr r24, r3
 /* 802DA9D8 002D7918  7C 99 23 78 */	mr r25, r4
 /* 802DA9DC 002D791C  7C BA 2B 78 */	mr r26, r5
@@ -43,7 +43,7 @@ lbl_802DAA58:
 /* 802DAA58 002D7998  7F E3 FB 78 */	mr r3, r31
 lbl_802DAA5C:
 /* 802DAA5C 002D799C  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DAA60 002D79A0  48 08 77 B5 */	bl func_80362214
+/* 802DAA60 002D79A0  48 08 77 B5 */	bl _restgpr_24
 /* 802DAA64 002D79A4  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802DAA68 002D79A8  7C 08 03 A6 */	mtlr r0
 /* 802DAA6C 002D79AC  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s
index d2a7845114..5d13010788 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s
+++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s
@@ -4,7 +4,7 @@
 /* 802DAA78 002D79B8  7C 08 02 A6 */	mflr r0
 /* 802DAA7C 002D79BC  90 01 00 74 */	stw r0, 0x74(r1)
 /* 802DAA80 002D79C0  39 61 00 70 */	addi r11, r1, 0x70
-/* 802DAA84 002D79C4  48 08 77 49 */	bl func_803621CC
+/* 802DAA84 002D79C4  48 08 77 49 */	bl _savegpr_25
 /* 802DAA88 002D79C8  7C 7D 1B 78 */	mr r29, r3
 /* 802DAA8C 002D79CC  3B E0 00 01 */	li r31, 1
 /* 802DAA90 002D79D0  83 C3 00 28 */	lwz r30, 0x28(r3)
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s
index 8f0bab04f7..88c813916d 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s
+++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s
@@ -4,7 +4,7 @@
 /* 802DAFEC 002D7F2C  7C 08 02 A6 */	mflr r0
 /* 802DAFF0 002D7F30  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802DAFF4 002D7F34  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DAFF8 002D7F38  48 08 71 D1 */	bl func_803621C8
+/* 802DAFF8 002D7F38  48 08 71 D1 */	bl _savegpr_24
 /* 802DAFFC 002D7F3C  7C 79 1B 78 */	mr r25, r3
 /* 802DB000 002D7F40  7C 9A 23 78 */	mr r26, r4
 /* 802DB004 002D7F44  7C BB 2B 78 */	mr r27, r5
@@ -94,7 +94,7 @@ lbl_802DB114:
 /* 802DB140 002D8080  48 06 3F DD */	bl OSUnlockMutex
 /* 802DB144 002D8084  7F 23 CB 78 */	mr r3, r25
 /* 802DB148 002D8088  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DB14C 002D808C  48 08 70 C9 */	bl func_80362214
+/* 802DB14C 002D808C  48 08 70 C9 */	bl _restgpr_24
 /* 802DB150 002D8090  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802DB154 002D8094  7C 08 03 A6 */	mtlr r0
 /* 802DB158 002D8098  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s
index 4b504daf08..9620f15949 100644
--- a/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s
+++ b/include/JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s
@@ -4,7 +4,7 @@
 /* 802D8478 002D53B8  7C 08 02 A6 */	mflr r0
 /* 802D847C 002D53BC  90 01 00 74 */	stw r0, 0x74(r1)
 /* 802D8480 002D53C0  39 61 00 70 */	addi r11, r1, 0x70
-/* 802D8484 002D53C4  48 08 9D 49 */	bl func_803621CC
+/* 802D8484 002D53C4  48 08 9D 49 */	bl _savegpr_25
 /* 802D8488 002D53C8  7C 7D 1B 78 */	mr r29, r3
 /* 802D848C 002D53CC  7C 9E 23 78 */	mr r30, r4
 /* 802D8490 002D53D0  7C B9 2B 78 */	mr r25, r5
diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s
index 96ddefc380..7afadde3ee 100644
--- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s
+++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s
@@ -4,7 +4,7 @@
 /* 802DA1E8 002D7128  7C 08 02 A6 */	mflr r0
 /* 802DA1EC 002D712C  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802DA1F0 002D7130  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DA1F4 002D7134  48 08 7F D5 */	bl func_803621C8
+/* 802DA1F4 002D7134  48 08 7F D5 */	bl _savegpr_24
 /* 802DA1F8 002D7138  7C 79 1B 78 */	mr r25, r3
 /* 802DA1FC 002D713C  7C 9A 23 78 */	mr r26, r4
 /* 802DA200 002D7140  7C BB 2B 78 */	mr r27, r5
@@ -97,7 +97,7 @@ lbl_802DA324:
 /* 802DA33C 002D727C  48 06 4D E1 */	bl OSUnlockMutex
 /* 802DA340 002D7280  7F 03 C3 78 */	mr r3, r24
 /* 802DA344 002D7284  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DA348 002D7288  48 08 7E CD */	bl func_80362214
+/* 802DA348 002D7288  48 08 7E CD */	bl _restgpr_24
 /* 802DA34C 002D728C  80 01 00 34 */	lwz r0, 0x34(r1)
 /* 802DA350 002D7290  7C 08 03 A6 */	mtlr r0
 /* 802DA354 002D7294  38 21 00 30 */	addi r1, r1, 0x30
diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s
index 5a11a1f51e..556672dc51 100644
--- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s
+++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CF234.s
@@ -4,7 +4,7 @@
 /* 802CF238 002CC178  7C 08 02 A6 */	mflr r0
 /* 802CF23C 002CC17C  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802CF240 002CC180  39 61 00 30 */	addi r11, r1, 0x30
-/* 802CF244 002CC184  48 09 2F 89 */	bl func_803621CC
+/* 802CF244 002CC184  48 09 2F 89 */	bl _savegpr_25
 /* 802CF248 002CC188  7C 7D 1B 78 */	mr r29, r3
 /* 802CF24C 002CC18C  38 04 00 03 */	addi r0, r4, 3
 /* 802CF250 002CC190  54 1E 00 3A */	rlwinm r30, r0, 0, 0, 0x1d
diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s
index 5bc3540b37..2a610361c4 100644
--- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s
+++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D03B8.s
@@ -4,7 +4,7 @@
 /* 802D03BC 002CD2FC  7C 08 02 A6 */	mflr r0
 /* 802D03C0 002CD300  90 01 00 44 */	stw r0, 0x44(r1)
 /* 802D03C4 002CD304  39 61 00 40 */	addi r11, r1, 0x40
-/* 802D03C8 002CD308  48 09 1E 05 */	bl func_803621CC
+/* 802D03C8 002CD308  48 09 1E 05 */	bl _savegpr_25
 /* 802D03CC 002CD30C  7C 7A 1B 78 */	mr r26, r3
 /* 802D03D0 002CD310  38 7A 00 18 */	addi r3, r26, 0x18
 /* 802D03D4 002CD314  48 06 EC 6D */	bl OSLockMutex
diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s
index 3110df3f26..e7af7e2b81 100644
--- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s
+++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D05CC.s
@@ -4,7 +4,7 @@
 /* 802D05D0 002CD510  7C 08 02 A6 */	mflr r0
 /* 802D05D4 002CD514  90 01 00 44 */	stw r0, 0x44(r1)
 /* 802D05D8 002CD518  39 61 00 40 */	addi r11, r1, 0x40
-/* 802D05DC 002CD51C  48 09 1B F1 */	bl func_803621CC
+/* 802D05DC 002CD51C  48 09 1B F1 */	bl _savegpr_25
 /* 802D05E0 002CD520  7C 79 1B 78 */	mr r25, r3
 /* 802D05E4 002CD524  38 79 00 18 */	addi r3, r25, 0x18
 /* 802D05E8 002CD528  48 06 EA 59 */	bl OSLockMutex
diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s
index 3d501ed482..d5b4811bc5 100644
--- a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s
+++ b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s
@@ -4,7 +4,7 @@
 /* 802D1C80 002CEBC0  DB E1 00 40 */	stfd f31, 0x40(r1)
 /* 802D1C84 002CEBC4  F3 E1 00 48 */	psq_st f31, 72(r1), 0, 0
 /* 802D1C88 002CEBC8  39 61 00 40 */	addi r11, r1, 0x40
-/* 802D1C8C 002CEBCC  48 09 05 41 */	bl func_803621CC
+/* 802D1C8C 002CEBCC  48 09 05 41 */	bl _savegpr_25
 /* 802D1C90 002CEBD0  7C 7A 1B 78 */	mr r26, r3
 /* 802D1C94 002CEBD4  7C 9B 23 78 */	mr r27, r4
 /* 802D1C98 002CEBD8  7C BC 2B 79 */	or. r28, r5, r5
diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
index f527c02d56..946c19c7ff 100644
--- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
+++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s
@@ -7,7 +7,7 @@
 /* 802E08FC 002DD83C  3B E3 43 D8 */	addi r31, r3, lbl_804343D8@l
 /* 802E0900 002DD840  38 7F 00 18 */	addi r3, r31, 0x18
 /* 802E0904 002DD844  48 06 E5 9D */	bl PADRead
-/* 802E0908 002DD848  90 6D 8F 60 */	stw r3, lbl_804514E0-_SDA_BASE_(r13)
+/* 802E0908 002DD848  90 6D 8F 60 */	stw r3, _sRumbleSupported-_SDA_BASE_(r13)
 /* 802E090C 002DD84C  80 0D 83 5C */	lwz r0, lbl_804508DC-_SDA_BASE_(r13)
 /* 802E0910 002DD850  2C 00 00 02 */	cmpwi r0, 2
 /* 802E0914 002DD854  41 82 00 20 */	beq lbl_802E0934
@@ -187,7 +187,7 @@ lbl_802E0B84:
 /* 802E0B98 002DDAD8  48 06 DF 95 */	bl PADReset
 lbl_802E0B9C:
 /* 802E0B9C 002DDADC  48 00 04 09 */	bl checkResetSwitch__10JUTGamePadFv
-/* 802E0BA0 002DDAE0  80 6D 8F 60 */	lwz r3, lbl_804514E0-_SDA_BASE_(r13)
+/* 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
 /* 802E0BAC 002DDAEC  80 01 00 44 */	lwz r0, 0x44(r1)
diff --git a/include/JSystem/JUtility/asm/JUTResFont__setBlock.s b/include/JSystem/JUtility/asm/JUTResFont__setBlock.s
index 445bbb3003..94a17a9da3 100644
--- a/include/JSystem/JUtility/asm/JUTResFont__setBlock.s
+++ b/include/JSystem/JUtility/asm/JUTResFont__setBlock.s
@@ -2,7 +2,7 @@
 /* 802DF348 002DC288  7C 08 02 A6 */	mflr r0
 /* 802DF34C 002DC28C  90 01 00 34 */	stw r0, 0x34(r1)
 /* 802DF350 002DC290  39 61 00 30 */	addi r11, r1, 0x30
-/* 802DF354 002DC294  48 08 2E 79 */	bl func_803621CC
+/* 802DF354 002DC294  48 08 2E 79 */	bl _savegpr_25
 /* 802DF358 002DC298  7C 7C 1B 78 */	mr r28, r3
 /* 802DF35C 002DC29C  3B 60 00 00 */	li r27, 0
 /* 802DF360 002DC2A0  3B 40 00 00 */	li r26, 0