mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-01 09:17:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

move SComponent and SStandard under SSystem, some dSv_player_config_c methods ok

Browse Source
This commit is contained in:
unknown
2020-11-26 21:35:46 -05:00
parent 0d0718f518
commit ca042ff23e
57 changed files with 176 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d_save.h
+3 -1
View File
@@ -259,6 +259,7 @@ class dSv_player_get_item_c {
private:
u32 pause_menu_bit_fields[4];
u8 ok[16];
};
class dSv_player_item_record_c {
@@ -305,6 +306,7 @@ class dSv_player_collect_c {
u8 mirror;
u8 unk11;
u8 poe_count;
u8 padding[3];
};
class dSv_player_wolf_c {
@@ -425,7 +427,7 @@ class dSv_player_c {
class dSv_memBit_c {
public:
void init(void);
void onTBox(int); // merged with init in the assembly
void onTbox(int); // merged with init in the assembly
void offTbox(int); // merged with init in the assembly
bool isTbox(int) const;
void onSwitch(int);
include/func_80034644.s
+18
View File
@@ -0,0 +1,18 @@
/* 80034644 00031584 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80034648 00031588 7C 08 02 A6 */ mflr r0
/* 8003464C 0003158C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80034650 00031590 80 0D 8F 60 */ lwz r0, lbl_804514E0-_SDA_BASE_(r13)
/* 80034654 00031594 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0
/* 80034658 00031598 41 82 00 18 */ beq lbl_80034670
/* 8003465C 0003159C 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80034660 000315A0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80034664 000315A4 38 63 0F 38 */ addi r3, r3, 0xf38
/* 80034668 000315A8 4B FF 6D 49 */ bl dComIfG_play_c_NS_getNowVibration
/* 8003466C 000315AC 48 00 00 08 */ b lbl_80034674
lbl_80034670:
/* 80034670 000315B0 38 60 00 00 */ li r3, 0
lbl_80034674:
/* 80034674 000315B4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80034678 000315B8 7C 08 03 A6 */ mtlr r0
/* 8003467C 000315BC 38 21 00 10 */ addi r1, r1, 0x10
/* 80034680 000315C0 4E 80 00 20 */ blr
include/func_800347A0.s
+9
View File
@@ -0,0 +1,9 @@
/* 800347A0 000316E0 7C 80 2E 70 */ srawi r0, r4, 5
/* 800347A4 000316E4 54 07 10 3A */ slwi r7, r0, 2
/* 800347A8 000316E8 7C C3 38 2E */ lwzx r6, r3, r7
/* 800347AC 000316EC 38 A0 00 01 */ li r5, 1
/* 800347B0 000316F0 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 800347B4 000316F4 7C A0 00 30 */ slw r0, r5, r0
/* 800347B8 000316F8 7C C0 03 78 */ or r0, r6, r0
/* 800347BC 000316FC 7C 03 39 2E */ stwx r0, r3, r7
/* 800347C0 00031700 4E 80 00 20 */ blr
include/func_800347C4.s
+9
View File
@@ -0,0 +1,9 @@
/* 800347C4 00031704 7C 80 2E 70 */ srawi r0, r4, 5
/* 800347C8 00031708 54 07 10 3A */ slwi r7, r0, 2
/* 800347CC 0003170C 7C C3 38 2E */ lwzx r6, r3, r7
/* 800347D0 00031710 38 A0 00 01 */ li r5, 1
/* 800347D4 00031714 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 800347D8 00031718 7C A0 00 30 */ slw r0, r5, r0
/* 800347DC 0003171C 7C C0 00 78 */ andc r0, r6, r0
/* 800347E0 00031720 7C 03 39 2E */ stwx r0, r3, r7
/* 800347E4 00031724 4E 80 00 20 */ blr
include/func_800347E8.s
+10
View File
@@ -0,0 +1,10 @@
/* 800347E8 00031728 38 A0 00 01 */ li r5, 1
/* 800347EC 0003172C 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 800347F0 00031730 7C A5 00 30 */ slw r5, r5, r0
/* 800347F4 00031734 7C 80 2E 70 */ srawi r0, r4, 5
/* 800347F8 00031738 54 00 10 3A */ slwi r0, r0, 2
/* 800347FC 0003173C 7C 03 00 2E */ lwzx r0, r3, r0
/* 80034800 00031740 7C A3 00 38 */ and r3, r5, r0
/* 80034804 00031744 30 03 FF FF */ addic r0, r3, -1
/* 80034808 00031748 7C 60 19 10 */ subfe r3, r0, r3
/* 8003480C 0003174C 4E 80 00 20 */ blr
include/functions.h
+1
View File
@@ -38,4 +38,5 @@ extern "C" {
void dMeter2Info_c_NS_getString(void);
u32 OSGetSoundMode(void);
void Z2AudioMgr_NS_setOutputMode(u32,unsigned long);
void dComIfG_play_c_NS_getNowVibration(void);
}
include/variables.h
+2
View File
@@ -6,4 +6,6 @@ extern u8 lbl_803A7270[24];
extern u8 lbl_80430188[16];
extern u8 lbl_803A7288;
extern u32 lbl_80451368;
extern u32 lbl_804514E0;
#define _SDA_BASE_(dummy) 0
#define _SDA2_BASE_(dummy) 0