mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

migrate remaining d_save and m_Do_main asm to inline, add intial class mapping for dFile_select_c

Browse Source
This commit is contained in:
unknown
2020-11-29 20:16:52 -05:00
parent 58afa9ed78
commit 44b14ec128
163 changed files with 1975 additions and 1732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_drawlist/d_drawlist.h
+3
View File
@@ -0,0 +1,3 @@
class dDlst_FileInfo_c {
};
include/d/d_file/d_file_sel_info/d_file_sel_info.h
+48
View File
@@ -0,0 +1,48 @@
#include "JSystem/J2DGraph/J2DScreen/J2DScreen.h"
#include "JSystem/JKernel/JKRArchive/JKRArchive.h"
#include "JSystem/JUtility/JUTFont/JUTFont.h"
#include "d/d_drawlist/d_drawlist.h"
#include "d/d_save/d_save/d_save.h"
#include "d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h"
struct dFile_info_c_vtable {
u32* addr1;
u32* addr2;
u32* dtor;
};
class dFile_info_c {
public:
dFile_info_c();
~dFile_info_c();
void screenSet(void);
int setSaveDate(dSv_save_c*, int, u8);
void setHeartCnt(dSv_save_c*);
void setSaveDate(dSv_save_c*);
void setPlayTime(dSv_save_c*);
void modeWait(void);
void modeMove(void);
void _draw(void);
private:
dFile_info_c_vtable vtable;
JKRArchive* archive;
dDlst_FileInfo_c file_info_draw_list;
J2DScreen* screen;
JUTFont* font;
u32 unk0;
u32 unk4;
u32 unk8;
u8 unk12;
u8 unk13;
u8 unk14;
u8 unk15;
CPaneMgrAlpha* w_dat_i1;
CPaneMgrAlpha* w_nda_i1;
char* unk28;
char* save_date;
char* play_time;
char* unk40;
};
int i = sizeof(dFile_info_c);
include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h
+3
View File
@@ -0,0 +1,3 @@
class CPaneMgrAlpha {
};
include/d/d_save/d_save/asm/func_80033030.s
+2 -2
View File
@@ -2,7 +2,7 @@
/* 80033034 0002FF74 7C 08 02 A6 */ mflr r0
/* 80033038 0002FF78 90 01 00 24 */ stw r0, 0x24(r1)
/* 8003303C 0002FF7C 39 61 00 20 */ addi r11, r1, 0x20
/* 80033040 0002FF80 48 32 F1 91 */ bl func_803621D0
/* 80033040 0002FF80 48 32 F1 91 */ bl _savegpr_26
/* 80033044 0002FF84 7C 7A 1B 78 */ mr r26, r3
/* 80033048 0002FF88 7C 9B 23 78 */ mr r27, r4
/* 8003304C 0002FF8C 2C 1B 00 18 */ cmpwi r27, 0x18
@@ -199,7 +199,7 @@ lbl_800332DC:
/* 800332DC 0003021C 38 60 00 FF */ li r3, 0xff
lbl_800332E0:
/* 800332E0 00030220 39 61 00 20 */ addi r11, r1, 0x20
/* 800332E4 00030224 48 32 EF 39 */ bl func_8036221C
/* 800332E4 00030224 48 32 EF 39 */ bl _restgpr_26
/* 800332E8 00030228 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800332EC 0003022C 7C 08 03 A6 */ mtlr r0
/* 800332F0 00030230 38 21 00 20 */ addi r1, r1, 0x20
include/d/d_save/d_save/asm/func_80035BD0.s
+46
View File
@@ -0,0 +1,46 @@
/* 80035BD0 00032B10 94 21 F6 90 */ stwu r1, -0x970(r1)
/* 80035BD4 00032B14 7C 08 02 A6 */ mflr r0
/* 80035BD8 00032B18 90 01 09 74 */ stw r0, 0x974(r1)
/* 80035BDC 00032B1C 93 E1 09 6C */ stw r31, 0x96c(r1)
/* 80035BE0 00032B20 1C 05 0A 94 */ mulli r0, r5, 0xa94
/* 80035BE4 00032B24 7F E4 02 14 */ add r31, r4, r0
/* 80035BE8 00032B28 38 61 01 F8 */ addi r3, r1, 0x1f8
/* 80035BEC 00032B2C 3C 80 80 03 */ lis r4, __ct__12dSv_memory_cFv@ha
/* 80035BF0 00032B30 38 84 0D B0 */ addi r4, r4, __ct__12dSv_memory_cFv@l
/* 80035BF4 00032B34 38 A0 00 00 */ li r5, 0
/* 80035BF8 00032B38 38 C0 00 20 */ li r6, 0x20
/* 80035BFC 00032B3C 38 E0 00 20 */ li r7, 0x20
/* 80035C00 00032B40 48 32 C1 61 */ bl func_80361D60
/* 80035C04 00032B44 38 61 05 F8 */ addi r3, r1, 0x5f8
/* 80035C08 00032B48 3C 80 80 03 */ lis r4, __ct__13dSv_memory2_cFv@ha
/* 80035C0C 00032B4C 38 84 0D 80 */ addi r4, r4, __ct__13dSv_memory2_cFv@l
/* 80035C10 00032B50 38 A0 00 00 */ li r5, 0
/* 80035C14 00032B54 38 C0 00 08 */ li r6, 8
/* 80035C18 00032B58 38 E0 00 40 */ li r7, 0x40
/* 80035C1C 00032B5C 48 32 C1 45 */ bl func_80361D60
/* 80035C20 00032B60 38 61 00 08 */ addi r3, r1, 8
/* 80035C24 00032B64 4B FF F3 F9 */ bl init__10dSv_save_cFv
/* 80035C28 00032B68 38 61 01 BC */ addi r3, r1, 0x1bc
/* 80035C2C 00032B6C 3C 80 80 38 */ lis r4, lbl_80379234@ha
/* 80035C30 00032B70 38 84 92 34 */ addi r4, r4, lbl_80379234@l
/* 80035C34 00032B74 48 33 2E F9 */ bl strcpy
/* 80035C38 00032B78 38 61 01 CD */ addi r3, r1, 0x1cd
/* 80035C3C 00032B7C 3C 80 80 38 */ lis r4, lbl_80379234@ha
/* 80035C40 00032B80 38 84 92 34 */ addi r4, r4, lbl_80379234@l
/* 80035C44 00032B84 48 33 2E E9 */ bl strcpy
/* 80035C48 00032B88 7F E3 FB 78 */ mr r3, r31
/* 80035C4C 00032B8C 38 81 00 08 */ addi r4, r1, 8
/* 80035C50 00032B90 38 A0 09 58 */ li r5, 0x958
/* 80035C54 00032B94 4B FC D8 ED */ bl func_80003540
/* 80035C58 00032B98 3C 60 80 38 */ lis r3, lbl_80379234@ha
/* 80035C5C 00032B9C 38 63 92 34 */ addi r3, r3, lbl_80379234@l
/* 80035C60 00032BA0 38 63 00 54 */ addi r3, r3, 0x54
/* 80035C64 00032BA4 38 80 09 58 */ li r4, 0x958
/* 80035C68 00032BA8 4C C6 31 82 */ crclr 6
/* 80035C6C 00032BAC 48 33 0C 11 */ bl func_8036687C
/* 80035C70 00032BB0 38 60 00 00 */ li r3, 0
/* 80035C74 00032BB4 83 E1 09 6C */ lwz r31, 0x96c(r1)
/* 80035C78 00032BB8 80 01 09 74 */ lwz r0, 0x974(r1)
/* 80035C7C 00032BBC 7C 08 03 A6 */ mtlr r0
/* 80035C80 00032BC0 38 21 09 70 */ addi r1, r1, 0x970
/* 80035C84 00032BC4 4E 80 00 20 */ blr
include/d/d_save/d_save/d_save.h
+4 -4
View File
@@ -427,8 +427,8 @@ class dSv_player_c {
class dSv_memBit_c {
public:
void init(void);
void onTbox(int); // merged with init in the assembly
void offTbox(int); // merged with init in the assembly
void onTbox(int);
void offTbox(int);
bool isTbox(int) const;
void onSwitch(int);
void offSwitch(int);
@@ -627,11 +627,11 @@ class dSv_info_c {
void onSwitch(int, int);
void offSwitch(int, int);
bool isSwitch(int, int) const;
u8 revSwitch(int, int); // merged with isSwitch in the assembly
u8 revSwitch(int, int);
void onItem(int, int);
bool isItem(int, int) const;
void onActor(int, int);
void offActor(int, int); // merged with onActor in the assembly
void offActor(int, int);
bool isActor(int, int) const;
void memory_to_card(char*, int);
void card_to_memory(char*, int);