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

dSv_player_item_max_c::init ok dSv_player_item_max_c::setBombNum ok

Browse Source
This commit is contained in:
unknown
2020-11-23 00:31:50 -05:00
parent e956a55a26
commit 8b358fdf8d
17 changed files with 224 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d_save.h
+2 -4
View File
@@ -281,13 +281,11 @@ class dSv_player_item_record_c {
class dSv_player_item_max_c {
public:
void init(void);
void setbombNum(u8, u8);
void setBombNum(u8, u8);
u8 getBombNum(u8) const;
private:
u8 bow_ammo_max;
u8 bomb_bags_ammo_max[3];
u8 unk_ammo_max[4];
u8 unk0[8];
};
class dSv_player_collect_c {
include/func_80033828.s
+1 -1
View File
@@ -26,7 +26,7 @@ lbl_80033854:
/* 80033888 000307C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 8003388C 000307CC 38 63 00 F8 */ addi r3, r3, 0xf8
/* 80033890 000307D0 7F C4 F3 78 */ mr r4, r30
/* 80033894 000307D4 48 00 08 65 */ bl dSv_player_item_max_c_NS_getBombNum
/* 80033894 000307D4 48 00 08 65 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 80033898 000307D8 7C 65 1B 78 */ mr r5, r3
/* 8003389C 000307DC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 800338A0 000307E0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
include/func_80033910.s
+2 -2
View File
@@ -28,14 +28,14 @@ lbl_80033940:
/* 80033978 000308B8 3B C3 00 F8 */ addi r30, r3, 0xf8
/* 8003397C 000308BC 7F C3 F3 78 */ mr r3, r30
/* 80033980 000308C0 7F 64 DB 78 */ mr r4, r27
/* 80033984 000308C4 48 00 07 75 */ bl dSv_player_item_max_c_NS_getBombNum
/* 80033984 000308C4 48 00 07 75 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 80033988 000308C8 57 84 06 3E */ clrlwi r4, r28, 0x18
/* 8003398C 000308CC 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80033990 000308D0 7C 04 00 40 */ cmplw r4, r0
/* 80033994 000308D4 40 81 00 14 */ ble lbl_800339A8
/* 80033998 000308D8 7F C3 F3 78 */ mr r3, r30
/* 8003399C 000308DC 7F 64 DB 78 */ mr r4, r27
/* 800339A0 000308E0 48 00 07 59 */ bl dSv_player_item_max_c_NS_getBombNum
/* 800339A0 000308E0 48 00 07 59 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 800339A4 000308E4 7C 7C 1B 78 */ mr r28, r3
lbl_800339A8:
/* 800339A8 000308E8 3C 60 80 40 */ lis r3, lbl_804061C0@ha
include/func_80033B08.s
+2 -2
View File
@@ -31,14 +31,14 @@ lbl_80033B34:
/* 80033B7C 00030ABC 3B 83 00 F8 */ addi r28, r3, 0xf8
/* 80033B80 00030AC0 7F 83 E3 78 */ mr r3, r28
/* 80033B84 00030AC4 7F 64 DB 78 */ mr r4, r27
/* 80033B88 00030AC8 48 00 05 71 */ bl dSv_player_item_max_c_NS_getBombNum
/* 80033B88 00030AC8 48 00 05 71 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 80033B8C 00030ACC 57 C4 06 3E */ clrlwi r4, r30, 0x18
/* 80033B90 00030AD0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 80033B94 00030AD4 7C 04 00 40 */ cmplw r4, r0
/* 80033B98 00030AD8 40 81 00 14 */ ble lbl_80033BAC
/* 80033B9C 00030ADC 7F 83 E3 78 */ mr r3, r28
/* 80033BA0 00030AE0 7F 64 DB 78 */ mr r4, r27
/* 80033BA4 00030AE4 48 00 05 55 */ bl dSv_player_item_max_c_NS_getBombNum
/* 80033BA4 00030AE4 48 00 05 55 */ bl getBombNum__21dSv_player_item_max_cCFUc
/* 80033BA8 00030AE8 7C 7E 1B 78 */ mr r30, r3
lbl_80033BAC:
/* 80033BAC 00030AEC 3C 60 80 40 */ lis r3, lbl_804061C0@ha
include/func_80034040.s
+31
View File
@@ -0,0 +1,31 @@
/* 80034040 00030F80 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80034044 00030F84 7C 08 02 A6 */ mflr r0
/* 80034048 00030F88 90 01 00 14 */ stw r0, 0x14(r1)
/* 8003404C 00030F8C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80034050 00030F90 7C 7F 1B 78 */ mr r31, r3
/* 80034054 00030F94 38 80 00 1E */ li r4, 0x1e
/* 80034058 00030F98 38 00 00 07 */ li r0, 7
/* 8003405C 00030F9C 7C 09 03 A6 */ mtctr r0
lbl_80034060:
/* 80034060 00030FA0 98 83 00 00 */ stb r4, 0(r3)
/* 80034064 00030FA4 38 63 00 01 */ addi r3, r3, 1
/* 80034068 00030FA8 42 00 FF F8 */ bdnz lbl_80034060
/* 8003406C 00030FAC 7F E3 FB 78 */ mr r3, r31
/* 80034070 00030FB0 38 80 00 70 */ li r4, 0x70
/* 80034074 00030FB4 38 A0 00 1E */ li r5, 0x1e
/* 80034078 00030FB8 48 00 00 41 */ bl setBombNum__21dSv_player_item_max_cFUcUc
/* 8003407C 00030FBC 7F E3 FB 78 */ mr r3, r31
/* 80034080 00030FC0 38 80 00 71 */ li r4, 0x71
/* 80034084 00030FC4 38 A0 00 0F */ li r5, 0xf
/* 80034088 00030FC8 48 00 00 31 */ bl setBombNum__21dSv_player_item_max_cFUcUc
/* 8003408C 00030FCC 7F E3 FB 78 */ mr r3, r31
/* 80034090 00030FD0 38 80 00 72 */ li r4, 0x72
/* 80034094 00030FD4 38 A0 00 0A */ li r5, 0xa
/* 80034098 00030FD8 48 00 00 21 */ bl setBombNum__21dSv_player_item_max_cFUcUc
/* 8003409C 00030FDC 38 00 00 00 */ li r0, 0
/* 800340A0 00030FE0 98 1F 00 07 */ stb r0, 7(r31)
/* 800340A4 00030FE4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 800340A8 00030FE8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800340AC 00030FEC 7C 08 03 A6 */ mtlr r0
/* 800340B0 00030FF0 38 21 00 10 */ addi r1, r1, 0x10
/* 800340B4 00030FF4 4E 80 00 20 */ blr
include/func_800340B8.s
+20
View File
@@ -0,0 +1,20 @@
/* 800340B8 00030FF8 54 80 06 3E */ clrlwi r0, r4, 0x18
/* 800340BC 00030FFC 2C 00 00 71 */ cmpwi r0, 0x71
/* 800340C0 00031000 41 82 00 28 */ beq lbl_800340E8
/* 800340C4 00031004 40 80 00 10 */ bge lbl_800340D4
/* 800340C8 00031008 2C 00 00 70 */ cmpwi r0, 0x70
/* 800340CC 0003100C 40 80 00 14 */ bge lbl_800340E0
/* 800340D0 00031010 4E 80 00 20 */ blr
lbl_800340D4:
/* 800340D4 00031014 2C 00 00 73 */ cmpwi r0, 0x73
/* 800340D8 00031018 4C 80 00 20 */ bgelr
/* 800340DC 0003101C 48 00 00 14 */ b lbl_800340F0
lbl_800340E0:
/* 800340E0 00031020 98 A3 00 01 */ stb r5, 1(r3)
/* 800340E4 00031024 4E 80 00 20 */ blr
lbl_800340E8:
/* 800340E8 00031028 98 A3 00 02 */ stb r5, 2(r3)
/* 800340EC 0003102C 4E 80 00 20 */ blr
lbl_800340F0:
/* 800340F0 00031030 98 A3 00 06 */ stb r5, 6(r3)
/* 800340F4 00031034 4E 80 00 20 */ blr
include/func_800340F8.s
+52
View File
@@ -0,0 +1,52 @@
/* 800340F8 00031038 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 800340FC 0003103C 7C 08 02 A6 */ mflr r0
/* 80034100 00031040 90 01 00 24 */ stw r0, 0x24(r1)
/* 80034104 00031044 39 61 00 20 */ addi r11, r1, 0x20
/* 80034108 00031048 48 32 E0 D5 */ bl _savegpr_29
/* 8003410C 0003104C 7C 7D 1B 78 */ mr r29, r3
/* 80034110 00031050 7C 9E 23 78 */ mr r30, r4
/* 80034114 00031054 3B E0 00 01 */ li r31, 1
/* 80034118 00031058 3C 60 80 40 */ lis r3, lbl_804061C0@ha
/* 8003411C 0003105C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l
/* 80034120 00031060 38 63 00 CC */ addi r3, r3, 0xcc
/* 80034124 00031064 38 80 00 4F */ li r4, 0x4f
/* 80034128 00031068 4B FF FD A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc
/* 8003412C 0003106C 2C 03 00 00 */ cmpwi r3, 0
/* 80034130 00031070 41 82 00 08 */ beq lbl_80034138
/* 80034134 00031074 3B E0 00 02 */ li r31, 2
lbl_80034138:
/* 80034138 00031078 57 C0 06 3E */ clrlwi r0, r30, 0x18
/* 8003413C 0003107C 2C 00 00 71 */ cmpwi r0, 0x71
/* 80034140 00031080 41 82 00 30 */ beq lbl_80034170
/* 80034144 00031084 40 80 00 10 */ bge lbl_80034154
/* 80034148 00031088 2C 00 00 70 */ cmpwi r0, 0x70
/* 8003414C 0003108C 40 80 00 14 */ bge lbl_80034160
/* 80034150 00031090 48 00 00 40 */ b lbl_80034190
lbl_80034154:
/* 80034154 00031094 2C 00 00 73 */ cmpwi r0, 0x73
/* 80034158 00031098 40 80 00 38 */ bge lbl_80034190
/* 8003415C 0003109C 48 00 00 24 */ b lbl_80034180
lbl_80034160:
/* 80034160 000310A0 88 1D 00 01 */ lbz r0, 1(r29)
/* 80034164 000310A4 7C 00 F9 D6 */ mullw r0, r0, r31
/* 80034168 000310A8 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8003416C 000310AC 48 00 00 28 */ b lbl_80034194
lbl_80034170:
/* 80034170 000310B0 88 1D 00 02 */ lbz r0, 2(r29)
/* 80034174 000310B4 7C 00 F9 D6 */ mullw r0, r0, r31
/* 80034178 000310B8 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8003417C 000310BC 48 00 00 18 */ b lbl_80034194
lbl_80034180:
/* 80034180 000310C0 88 1D 00 06 */ lbz r0, 6(r29)
/* 80034184 000310C4 7C 00 F9 D6 */ mullw r0, r0, r31
/* 80034188 000310C8 54 03 06 3E */ clrlwi r3, r0, 0x18
/* 8003418C 000310CC 48 00 00 08 */ b lbl_80034194
lbl_80034190:
/* 80034190 000310D0 38 60 00 00 */ li r3, 0
lbl_80034194:
/* 80034194 000310D4 39 61 00 20 */ addi r11, r1, 0x20
/* 80034198 000310D8 48 32 E0 91 */ bl _restgpr_29
/* 8003419C 000310DC 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800341A0 000310E0 7C 08 03 A6 */ mtlr r0
/* 800341A4 000310E4 38 21 00 20 */ addi r1, r1, 0x20
/* 800341A8 000310E8 4E 80 00 20 */ blr
include/func_800341AC.s
+16
View File
@@ -0,0 +1,16 @@
/* 800341AC 000310EC 38 A0 00 00 */ li r5, 0
/* 800341B0 000310F0 7C 64 1B 78 */ mr r4, r3
/* 800341B4 000310F4 38 00 00 08 */ li r0, 8
/* 800341B8 000310F8 7C 09 03 A6 */ mtctr r0
lbl_800341BC:
/* 800341BC 000310FC 98 A4 00 00 */ stb r5, 0(r4)
/* 800341C0 00031100 38 84 00 01 */ addi r4, r4, 1
/* 800341C4 00031104 42 00 FF F8 */ bdnz lbl_800341BC
/* 800341C8 00031108 38 80 00 00 */ li r4, 0
/* 800341CC 0003110C 98 83 00 08 */ stb r4, 8(r3)
/* 800341D0 00031110 98 83 00 09 */ stb r4, 9(r3)
/* 800341D4 00031114 98 83 00 0A */ stb r4, 0xa(r3)
/* 800341D8 00031118 38 00 00 FF */ li r0, 0xff
/* 800341DC 0003111C 98 03 00 0B */ stb r0, 0xb(r3)
/* 800341E0 00031120 98 83 00 0C */ stb r4, 0xc(r3)
/* 800341E4 00031124 4E 80 00 20 */ blr
include/functions.h
+3 -1
View File
@@ -1,4 +1,5 @@
extern "C" {
void init__20dSv_player_collect_cFv(void);
void dComIfGp_setSelectItem(int);
void OSReport_Error(void);
void dSv_event_c_NS_isEventBit(void);
@@ -7,6 +8,7 @@ extern "C" {
void dComIfGs_getMixItemIndex(void);
void dComIfGs_getBottleMax(void);
char* strcpy(char*,const char*);
void setBombNum__21dSv_player_item_max_cFUcUc(void);
void func_80362224(void);
void func_803621D8(void);
void func_8036221C(void);
@@ -27,6 +29,6 @@ extern "C" {
void setEquipBottleItemIn__17dSv_player_item_cFUcUc(u8,u8);
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 getBombNum__21dSv_player_item_max_cCFUc(void);
void setItem__17dSv_player_item_cFiUc(void);
}