mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-15 04:50:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

dSv_player_item_record_c and dSv_player_get_item_c funcs ok

Browse Source
This commit is contained in:
unknown
2020-11-22 20:17:49 -05:00
parent 5111810104
commit e956a55a26
31 changed files with 431 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d_save.h
+7 -7
View File
@@ -255,10 +255,10 @@ class dSv_player_get_item_c {
void init(void);
void onFirstBit(u8);
void offFirstBit(u8);
u8 isFirstBit(u8) const;
bool isFirstBit(u8) const;
private:
u32 pause_menu_items[4];
u32 pause_menu_bit_fields[4];
};
class dSv_player_item_record_c {
@@ -271,11 +271,11 @@ class dSv_player_item_record_c {
u8 getBottleNum(u8) const;
private:
u8 bow_ammo;
u8 bomb_bags_ammo[3];
u8 unk4_ammo[4];
u8 slingshot_ammo;
u8 unk5_ammo[3];
u8 bow;
u8 bomb_bags[3];
u8 bottles[4];
u8 slingshot;
u8 unk5[3];
};
class dSv_player_item_max_c {
include/func_80033754.s
+1 -1
View File
@@ -15,7 +15,7 @@ lbl_80033788:
/* 80033788 000306C8 7F A3 EB 78 */ mr r3, r29
/* 8003378C 000306CC 38 1B 00 C0 */ addi r0, r27, 0xc0
/* 80033790 000306D0 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80033794 000306D4 48 00 07 35 */ bl dSv_player_get_item_c_NS_isFirstBit
/* 80033794 000306D4 48 00 07 35 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80033798 000306D8 2C 03 00 00 */ cmpwi r3, 0
/* 8003379C 000306DC 41 82 00 24 */ beq lbl_800337C0
/* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28
include/func_80033828.s
+1 -1
View File
@@ -32,7 +32,7 @@ lbl_80033854:
/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 800338A4 000307E4 38 63 00 EC */ addi r3, r3, 0xec
/* 800338A8 000307E8 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 800338AC 000307EC 48 00 06 C1 */ bl dSv_player_item_record_c_NS_setBombNum
/* 800338AC 000307EC 48 00 06 C1 */ bl setBombNum__24dSv_player_item_record_cFUcUc
lbl_800338B0:
/* 800338B0 000307F0 3B A0 00 00 */ li r29, 0
/* 800338B4 000307F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha
include/func_80033910.s
+1 -1
View File
@@ -43,7 +43,7 @@ lbl_800339A8:
/* 800339B0 000308F0 38 63 00 EC */ addi r3, r3, 0xec
/* 800339B4 000308F4 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 800339B8 000308F8 7F 85 E3 78 */ mr r5, r28
/* 800339BC 000308FC 48 00 05 B1 */ bl dSv_player_item_record_c_NS_setBombNum
/* 800339BC 000308FC 48 00 05 B1 */ bl setBombNum__24dSv_player_item_record_cFUcUc
lbl_800339C0:
/* 800339C0 00030900 3B A0 00 00 */ li r29, 0
/* 800339C4 00030904 3C 60 80 40 */ lis r3, lbl_804061C0@ha
include/func_80033B08.s
+1 -1
View File
@@ -46,7 +46,7 @@ lbl_80033BAC:
/* 80033BB4 00030AF4 38 63 00 EC */ addi r3, r3, 0xec
/* 80033BB8 00030AF8 57 E4 06 3E */ clrlwi r4, r31, 0x18
/* 80033BBC 00030AFC 7F C5 F3 78 */ mr r5, r30
/* 80033BC0 00030B00 48 00 03 AD */ bl dSv_player_item_record_c_NS_setBombNum
/* 80033BC0 00030B00 48 00 03 AD */ bl setBombNum__24dSv_player_item_record_cFUcUc
/* 80033BC4 00030B04 48 00 00 10 */ b lbl_80033BD4
lbl_80033BC8:
/* 80033BC8 00030B08 3B FF 00 01 */ addi r31, r31, 1
include/func_80033D40.s
+73
View File
@@ -0,0 +1,73 @@
/* 80033D40 00030C80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80033D44 00030C84 7C 08 02 A6 */ mflr r0
/* 80033D48 00030C88 90 01 00 14 */ stw r0, 0x14(r1)
/* 80033D4C 00030C8C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80033D50 00030C90 7C 7F 1B 78 */ mr r31, r3
/* 80033D54 00030C94 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033D58 00030C98 2C 00 00 76 */ cmpwi r0, 0x76
/* 80033D5C 00030C9C 41 82 00 20 */ beq lbl_80033D7C
/* 80033D60 00030CA0 40 80 00 10 */ bge lbl_80033D70
/* 80033D64 00030CA4 2C 00 00 74 */ cmpwi r0, 0x74
/* 80033D68 00030CA8 41 82 00 48 */ beq lbl_80033DB0
/* 80033D6C 00030CAC 48 00 00 A8 */ b lbl_80033E14
lbl_80033D70:
/* 80033D70 00030CB0 2C 00 00 FF */ cmpwi r0, 0xff
/* 80033D74 00030CB4 41 82 00 70 */ beq lbl_80033DE4
/* 80033D78 00030CB8 48 00 00 9C */ b lbl_80033E14
lbl_80033D7C:
/* 80033D7C 00030CBC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033D80 00030CC0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033D84 00030CC4 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033D88 00030CC8 38 80 00 3D */ li r4, 0x3d
/* 80033D8C 00030CCC 48 00 01 3D */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80033D90 00030CD0 2C 03 00 00 */ cmpwi r3, 0
/* 80033D94 00030CD4 41 82 00 10 */ beq lbl_80033DA4
/* 80033D98 00030CD8 38 00 00 5E */ li r0, 0x5e
/* 80033D9C 00030CDC 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DA0 00030CE0 48 00 00 74 */ b lbl_80033E14
lbl_80033DA4:
/* 80033DA4 00030CE4 38 00 00 5B */ li r0, 0x5b
/* 80033DA8 00030CE8 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DAC 00030CEC 48 00 00 68 */ b lbl_80033E14
lbl_80033DB0:
/* 80033DB0 00030CF0 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033DB4 00030CF4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033DB8 00030CF8 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033DBC 00030CFC 38 80 00 3D */ li r4, 0x3d
/* 80033DC0 00030D00 48 00 01 09 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80033DC4 00030D04 2C 03 00 00 */ cmpwi r3, 0
/* 80033DC8 00030D08 41 82 00 10 */ beq lbl_80033DD8
/* 80033DCC 00030D0C 38 00 00 5F */ li r0, 0x5f
/* 80033DD0 00030D10 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DD4 00030D14 48 00 00 40 */ b lbl_80033E14
lbl_80033DD8:
/* 80033DD8 00030D18 38 00 00 5D */ li r0, 0x5d
/* 80033DDC 00030D1C 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033DE0 00030D20 48 00 00 34 */ b lbl_80033E14
lbl_80033DE4:
/* 80033DE4 00030D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033DE8 00030D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033DEC 00030D2C 38 63 00 CC */ addi r3, r3, 0xcc
/* 80033DF0 00030D30 38 80 00 3D */ li r4, 0x3d
/* 80033DF4 00030D34 48 00 00 D5 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 80033DF8 00030D38 2C 03 00 00 */ cmpwi r3, 0
/* 80033DFC 00030D3C 41 82 00 10 */ beq lbl_80033E0C
/* 80033E00 00030D40 38 00 00 5C */ li r0, 0x5c
/* 80033E04 00030D44 98 1F 00 14 */ stb r0, 0x14(r31)
/* 80033E08 00030D48 48 00 00 0C */ b lbl_80033E14
lbl_80033E0C:
/* 80033E0C 00030D4C 38 00 00 4A */ li r0, 0x4a
/* 80033E10 00030D50 98 1F 00 14 */ stb r0, 0x14(r31)
lbl_80033E14:
/* 80033E14 00030D54 3B E0 00 00 */ li r31, 0
lbl_80033E18:
/* 80033E18 00030D58 7F E3 FB 78 */ mr r3, r31
/* 80033E1C 00030D5C 4B FF 9F D9 */ bl dComIfGp_setSelectItem
/* 80033E20 00030D60 3B FF 00 01 */ addi r31, r31, 1
/* 80033E24 00030D64 2C 1F 00 04 */ cmpwi r31, 4
/* 80033E28 00030D68 41 80 FF F0 */ blt lbl_80033E18
/* 80033E2C 00030D6C 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80033E30 00030D70 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80033E34 00030D74 7C 08 03 A6 */ mtlr r0
/* 80033E38 00030D78 38 21 00 10 */ addi r1, r1, 0x10
/* 80033E3C 00030D7C 4E 80 00 20 */ blr
include/func_80033E60.s
+13
View File
@@ -0,0 +1,13 @@
/* 80033E60 00030DA0 54 88 06 3E */ clrlwi r8, r4, 0x18
/* 80033E64 00030DA4 54 87 EE FA */ rlwinm r7, r4, 0x1d, 0x1b, 0x1d
/* 80033E68 00030DA8 7C C3 38 2E */ lwzx r6, r3, r7
/* 80033E6C 00030DAC 38 A0 00 01 */ li r5, 1
/* 80033E70 00030DB0 54 80 D8 08 */ slwi r0, r4, 0x1b
/* 80033E74 00030DB4 55 04 0F FE */ srwi r4, r8, 0x1f
/* 80033E78 00030DB8 7C 04 00 50 */ subf r0, r4, r0
/* 80033E7C 00030DBC 54 00 28 3E */ rotlwi r0, r0, 5
/* 80033E80 00030DC0 7C 00 22 14 */ add r0, r0, r4
/* 80033E84 00030DC4 7C A0 00 30 */ slw r0, r5, r0
/* 80033E88 00030DC8 7C C0 03 78 */ or r0, r6, r0
/* 80033E8C 00030DCC 7C 03 39 2E */ stwx r0, r3, r7
/* 80033E90 00030DD0 4E 80 00 20 */ blr
include/func_80033E94.s
+13
View File
@@ -0,0 +1,13 @@
/* 80033E94 00030DD4 54 88 06 3E */ clrlwi r8, r4, 0x18
/* 80033E98 00030DD8 54 87 EE FA */ rlwinm r7, r4, 0x1d, 0x1b, 0x1d
/* 80033E9C 00030DDC 7C C3 38 2E */ lwzx r6, r3, r7
/* 80033EA0 00030DE0 38 A0 00 01 */ li r5, 1
/* 80033EA4 00030DE4 54 80 D8 08 */ slwi r0, r4, 0x1b
/* 80033EA8 00030DE8 55 04 0F FE */ srwi r4, r8, 0x1f
/* 80033EAC 00030DEC 7C 04 00 50 */ subf r0, r4, r0
/* 80033EB0 00030DF0 54 00 28 3E */ rotlwi r0, r0, 5
/* 80033EB4 00030DF4 7C 00 22 14 */ add r0, r0, r4
/* 80033EB8 00030DF8 7C A0 00 30 */ slw r0, r5, r0
/* 80033EBC 00030DFC 7C C0 00 78 */ andc r0, r6, r0
/* 80033EC0 00030E00 7C 03 39 2E */ stwx r0, r3, r7
/* 80033EC4 00030E04 4E 80 00 20 */ blr
include/func_80033EC8.s
+14
View File
@@ -0,0 +1,14 @@
/* 80033EC8 00030E08 38 C0 00 01 */ li r6, 1
/* 80033ECC 00030E0C 54 85 06 3E */ clrlwi r5, r4, 0x18
/* 80033ED0 00030E10 54 80 D8 08 */ slwi r0, r4, 0x1b
/* 80033ED4 00030E14 54 A5 0F FE */ srwi r5, r5, 0x1f
/* 80033ED8 00030E18 7C 05 00 50 */ subf r0, r5, r0
/* 80033EDC 00030E1C 54 00 28 3E */ rotlwi r0, r0, 5
/* 80033EE0 00030E20 7C 00 2A 14 */ add r0, r0, r5
/* 80033EE4 00030E24 7C C5 00 30 */ slw r5, r6, r0
/* 80033EE8 00030E28 54 80 EE FA */ rlwinm r0, r4, 0x1d, 0x1b, 0x1d
/* 80033EEC 00030E2C 7C 03 00 2E */ lwzx r0, r3, r0
/* 80033EF0 00030E30 7C A3 00 38 */ and r3, r5, r0
/* 80033EF4 00030E34 30 03 FF FF */ addic r0, r3, -1
/* 80033EF8 00030E38 7C 60 19 10 */ subfe r3, r0, r3
/* 80033EFC 00030E3C 4E 80 00 20 */ blr
include/func_80033F9C.s
+40
View File
@@ -0,0 +1,40 @@
/* 80033F9C 00030EDC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80033FA0 00030EE0 7C 08 02 A6 */ mflr r0
/* 80033FA4 00030EE4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80033FA8 00030EE8 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80033FAC 00030EEC 93 C1 00 08 */ stw r30, 8(r1)
/* 80033FB0 00030EF0 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 80033FB4 00030EF4 7F E3 02 14 */ add r31, r3, r0
/* 80033FB8 00030EF8 88 7F 00 04 */ lbz r3, 4(r31)
/* 80033FBC 00030EFC 7C A0 07 34 */ extsh r0, r5
/* 80033FC0 00030F00 7F C3 02 14 */ add r30, r3, r0
/* 80033FC4 00030F04 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 80033FC8 00030F08 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80033FCC 00030F0C 38 63 00 9C */ addi r3, r3, 0x9c
/* 80033FD0 00030F10 38 04 00 0B */ addi r0, r4, 0xb
/* 80033FD4 00030F14 54 04 06 3E */ clrlwi r4, r0, 0x18
/* 80033FD8 00030F18 38 A0 00 01 */ li r5, 1
/* 80033FDC 00030F1C 4B FF F0 55 */ bl getItem__17dSv_player_item_cCFib
/* 80033FE0 00030F20 2C 1E 00 00 */ cmpwi r30, 0
/* 80033FE4 00030F24 40 80 00 10 */ bge lbl_80033FF4
/* 80033FE8 00030F28 38 00 00 00 */ li r0, 0
/* 80033FEC 00030F2C 98 1F 00 04 */ stb r0, 4(r31)
/* 80033FF0 00030F30 48 00 00 24 */ b lbl_80034014
lbl_80033FF4:
/* 80033FF4 00030F34 4B FF A5 C5 */ bl dComIfGs_getBottleMax
/* 80033FF8 00030F38 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80033FFC 00030F3C 7C 1E 00 00 */ cmpw r30, r0
/* 80034000 00030F40 40 81 00 10 */ ble lbl_80034010
/* 80034004 00030F44 4B FF A5 B5 */ bl dComIfGs_getBottleMax
/* 80034008 00030F48 98 7F 00 04 */ stb r3, 4(r31)
/* 8003400C 00030F4C 48 00 00 08 */ b lbl_80034014
lbl_80034010:
/* 80034010 00030F50 9B DF 00 04 */ stb r30, 4(r31)
lbl_80034014:
/* 80034014 00030F54 88 7F 00 04 */ lbz r3, 4(r31)
/* 80034018 00030F58 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8003401C 00030F5C 83 C1 00 08 */ lwz r30, 8(r1)
/* 80034020 00030F60 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80034024 00030F64 7C 08 03 A6 */ mtlr r0
/* 80034028 00030F68 38 21 00 10 */ addi r1, r1, 0x10
/* 8003402C 00030F6C 4E 80 00 20 */ blr
include/functions.h
+3 -2
View File
@@ -5,6 +5,7 @@ extern "C" {
void dComIfGs_setMixItemIndex(void);
void dComIfGs_setSelectItemIndex(void);
void dComIfGs_getMixItemIndex(void);
void dComIfGs_getBottleMax(void);
char* strcpy(char*,const char*);
void func_80362224(void);
void func_803621D8(void);
@@ -24,8 +25,8 @@ extern "C" {
void setBottleItemIn__17dSv_player_item_cFUcUc(void);
void getItem__17dSv_player_item_cCFib(void);
void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8,u8);
void dSv_player_get_item_c_NS_isFirstBit(void);
void dSv_player_item_record_c_NS_setBombNum(void);
void isFirstBit__21dSv_player_get_item_cCFUc(void);
void setBombNum__24dSv_player_item_record_cFUcUc(void);
void dSv_player_item_max_c_NS_getBombNum(void);
void setItem__17dSv_player_item_cFiUc(void);
}