dSv_player_config_c::init ok

This commit is contained in:
unknown
2020-11-26 20:14:44 -05:00
parent 2fceccbd08
commit 363fd35933
14 changed files with 453 additions and 383 deletions
+8 -8
View File
@@ -339,7 +339,7 @@ class dSv_letter_info_c {
bool isLetterReadFlag(int) const;
private:
u8 letter_read_flags[16];
u32 letter_read_flags[4];
u8 unk16[64];
};
@@ -349,7 +349,7 @@ class dSv_fishing_info_c {
void addFishCount(u8); // merged with init in the assembly
private:
u8 unk0[32];
u16 fish_count[16];
u8 unk32[16];
u8 padding[4];
};
@@ -359,12 +359,12 @@ class dSv_player_info_c {
void init(void);
private:
u8 unk0[4];
u8 unk4[4];
u8 unk8[4];
u8 unk12[4];
u8 unk16[2];
u8 unk18[2];
u32 unk0;
u32 unk4;
u32 unk8;
u32 unk12;
u16 unk16;
u16 unk18;
u8 link_name[16];
u8 unk36;
u8 epona_name[16];
+9
View File
@@ -0,0 +1,9 @@
/* 80034428 00031368 7C 80 2E 70 */ srawi r0, r4, 5
/* 8003442C 0003136C 54 07 10 3A */ slwi r7, r0, 2
/* 80034430 00031370 7C C3 38 2E */ lwzx r6, r3, r7
/* 80034434 00031374 38 A0 00 01 */ li r5, 1
/* 80034438 00031378 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 8003443C 0003137C 7C A0 00 30 */ slw r0, r5, r0
/* 80034440 00031380 7C C0 03 78 */ or r0, r6, r0
/* 80034444 00031384 7C 03 39 2E */ stwx r0, r3, r7
/* 80034448 00031388 4E 80 00 20 */ blr
+10
View File
@@ -0,0 +1,10 @@
/* 8003444C 0003138C 38 A0 00 01 */ li r5, 1
/* 80034450 00031390 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 80034454 00031394 7C A5 00 30 */ slw r5, r5, r0
/* 80034458 00031398 7C 80 2E 70 */ srawi r0, r4, 5
/* 8003445C 0003139C 54 00 10 3A */ slwi r0, r0, 2
/* 80034460 000313A0 7C 03 00 2E */ lwzx r0, r3, r0
/* 80034464 000313A4 7C A3 00 38 */ and r3, r5, r0
/* 80034468 000313A8 30 03 FF FF */ addic r0, r3, -1
/* 8003446C 000313AC 7C 60 19 10 */ subfe r3, r0, r3
/* 80034470 000313B0 4E 80 00 20 */ blr
+10
View File
@@ -0,0 +1,10 @@
/* 80034474 000313B4 7C 80 2E 70 */ srawi r0, r4, 5
/* 80034478 000313B8 54 00 10 3A */ slwi r0, r0, 2
/* 8003447C 000313BC 7C C3 02 14 */ add r6, r3, r0
/* 80034480 000313C0 80 A6 00 08 */ lwz r5, 8(r6)
/* 80034484 000313C4 38 60 00 01 */ li r3, 1
/* 80034488 000313C8 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 8003448C 000313CC 7C 60 00 30 */ slw r0, r3, r0
/* 80034490 000313D0 7C A0 03 78 */ or r0, r5, r0
/* 80034494 000313D4 90 06 00 08 */ stw r0, 8(r6)
/* 80034498 000313D8 4E 80 00 20 */ blr
+11
View File
@@ -0,0 +1,11 @@
/* 8003449C 000313DC 7C 80 2E 70 */ srawi r0, r4, 5
/* 800344A0 000313E0 54 00 10 3A */ slwi r0, r0, 2
/* 800344A4 000313E4 7C 63 02 14 */ add r3, r3, r0
/* 800344A8 000313E8 80 A3 00 08 */ lwz r5, 8(r3)
/* 800344AC 000313EC 38 60 00 01 */ li r3, 1
/* 800344B0 000313F0 54 80 06 FE */ clrlwi r0, r4, 0x1b
/* 800344B4 000313F4 7C 60 00 30 */ slw r0, r3, r0
/* 800344B8 000313F8 7C A3 00 38 */ and r3, r5, r0
/* 800344BC 000313FC 30 03 FF FF */ addic r0, r3, -1
/* 800344C0 00031400 7C 60 19 10 */ subfe r3, r0, r3
/* 800344C4 00031404 4E 80 00 20 */ blr
+7
View File
@@ -0,0 +1,7 @@
/* 800344FC 0003143C 54 85 0D FC */ rlwinm r5, r4, 1, 0x17, 0x1e
/* 80034500 00031440 7C 83 2A 2E */ lhzx r4, r3, r5
/* 80034504 00031444 28 04 03 E7 */ cmplwi r4, 0x3e7
/* 80034508 00031448 4C 80 00 20 */ bgelr
/* 8003450C 0003144C 38 04 00 01 */ addi r0, r4, 1
/* 80034510 00031450 7C 03 2B 2E */ sthx r0, r3, r5
/* 80034514 00031454 4E 80 00 20 */ blr
+38
View File
@@ -0,0 +1,38 @@
/* 80034518 00031458 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8003451C 0003145C 7C 08 02 A6 */ mflr r0
/* 80034520 00031460 90 01 00 14 */ stw r0, 0x14(r1)
/* 80034524 00031464 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80034528 00031468 7C 7F 1B 78 */ mr r31, r3
/* 8003452C 0003146C 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80034530 00031470 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 80034534 00031474 38 80 03 82 */ li r4, 0x382
/* 80034538 00031478 38 BF 00 14 */ addi r5, r31, 0x14
/* 8003453C 0003147C 38 C0 00 00 */ li r6, 0
/* 80034540 00031480 48 1E 7D 11 */ bl dMeter2Info_c_NS_getString
/* 80034544 00031484 3C 60 80 43 */ lis r3, lbl_80430188@ha
/* 80034548 00031488 38 63 01 88 */ addi r3, r3, lbl_80430188@l
/* 8003454C 0003148C 38 80 03 83 */ li r4, 0x383
/* 80034550 00031490 38 BF 00 25 */ addi r5, r31, 0x25
/* 80034554 00031494 38 C0 00 00 */ li r6, 0
/* 80034558 00031498 48 1E 7C F9 */ bl dMeter2Info_c_NS_getString
/* 8003455C 0003149C 38 60 00 00 */ li r3, 0
/* 80034560 000314A0 90 7F 00 04 */ stw r3, 4(r31)
/* 80034564 000314A4 90 7F 00 00 */ stw r3, 0(r31)
/* 80034568 000314A8 90 7F 00 0C */ stw r3, 0xc(r31)
/* 8003456C 000314AC 90 7F 00 08 */ stw r3, 8(r31)
/* 80034570 000314B0 B0 7F 00 10 */ sth r3, 0x10(r31)
/* 80034574 000314B4 B0 7F 00 12 */ sth r3, 0x12(r31)
/* 80034578 000314B8 98 7F 00 36 */ stb r3, 0x36(r31)
/* 8003457C 000314BC 38 80 00 00 */ li r4, 0
/* 80034580 000314C0 38 00 00 05 */ li r0, 5
/* 80034584 000314C4 7C 09 03 A6 */ mtctr r0
lbl_80034588:
/* 80034588 000314C8 38 04 00 37 */ addi r0, r4, 0x37
/* 8003458C 000314CC 7C 7F 01 AE */ stbx r3, r31, r0
/* 80034590 000314D0 38 84 00 01 */ addi r4, r4, 1
/* 80034594 000314D4 42 00 FF F4 */ bdnz lbl_80034588
/* 80034598 000314D8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8003459C 000314DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800345A0 000314E0 7C 08 03 A6 */ mtlr r0
/* 800345A4 000314E4 38 21 00 10 */ addi r1, r1, 0x10
/* 800345A8 000314E8 4E 80 00 20 */ blr
+7
View File
@@ -1,3 +1,7 @@
class JMSMesgEntry_c {
};
extern "C" {
void init__20dSv_player_collect_cFv(void);
void dComIfGp_setSelectItem(int);
@@ -31,4 +35,7 @@ extern "C" {
void setBombNum__24dSv_player_item_record_cFUcUc(void);
void getBombNum__21dSv_player_item_max_cCFUc(void);
void setItem__17dSv_player_item_cFiUc(void);
void dMeter2Info_c_NS_getString(void);
u32 OSGetSoundMode(void);
void Z2AudioMgr_NS_setOutputMode(u32,unsigned long);
}
+1
View File
@@ -5,4 +5,5 @@ extern float lbl_80451D58;
extern u8 lbl_803A7270[24];
extern u8 lbl_80430188[16];
extern u8 lbl_803A7288;
extern u32 lbl_80451368;
#define _SDA2_BASE_(dummy) 0