falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dSv_player_item_c::setEmptyBombBagItemIn ok

This commit is contained in:
unknown 2020-11-22 16:07:42 -05:00
parent 02c62c1132
commit 15ecc6ac7d
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
3 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/d/d_item.s
View File

@ -1008,7 +1008,7 @@ lbl_80098680:
/* 80098E14 00095D54 7F E3 FB 78 */ mr r3, r31
/* 80098E18 00095D58 38 80 00 71 */ li r4, 0x71
/* 80098E1C 00095D5C 38 A0 00 01 */ li r5, 1
/* 80098E20 00095D60 4B F9 AC 01 */ bl dSv_player_item_c_NS_setEmptyBombBagItemIn
/* 80098E20 00095D60 4B F9 AC 01 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcb
/* 80098E24 00095D64 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80098E28 00095D68 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80098E2C 00095D6C 7C 08 03 A6 */ mtlr r0
@ -1026,7 +1026,7 @@ lbl_80098680:
/* 80098E5C 00095D9C 7F E3 FB 78 */ mr r3, r31
/* 80098E60 00095DA0 38 80 00 72 */ li r4, 0x72
/* 80098E64 00095DA4 38 A0 00 01 */ li r5, 1
/* 80098E68 00095DA8 4B F9 AB B9 */ bl dSv_player_item_c_NS_setEmptyBombBagItemIn
/* 80098E68 00095DA8 4B F9 AB B9 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcb
/* 80098E6C 00095DAC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80098E70 00095DB0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80098E74 00095DB4 7C 08 03 A6 */ mtlr r0
@ -3952,7 +3952,7 @@ lbl_8009BAC0:
/* 8009BAE8 00098A28 7F C4 F3 78 */ mr r4, r30
/* 8009BAEC 00098A2C 7F E5 FB 78 */ mr r5, r31
/* 8009BAF0 00098A30 38 C0 00 01 */ li r6, 1
/* 8009BAF4 00098A34 4B F9 7F 5D */ bl dSv_player_item_c_NS_setEmptyBombBagItemIn_X1_
/* 8009BAF4 00098A34 4B F9 7F 5D */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb
/* 8009BAF8 00098A38 38 60 00 00 */ li r3, 0
/* 8009BAFC 00098A3C 48 00 00 C4 */ b lbl_8009BBC0
lbl_8009BB00:
@ -3960,7 +3960,7 @@ lbl_8009BB00:
/* 8009BB04 00098A44 7F C4 F3 78 */ mr r4, r30
/* 8009BB08 00098A48 7F E5 FB 78 */ mr r5, r31
/* 8009BB0C 00098A4C 38 C0 00 01 */ li r6, 1
/* 8009BB10 00098A50 4B F9 7F 41 */ bl dSv_player_item_c_NS_setEmptyBombBagItemIn_X1_
/* 8009BB10 00098A50 4B F9 7F 41 */ bl setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb
/* 8009BB14 00098A54 7F 63 DB 78 */ mr r3, r27
/* 8009BB18 00098A58 7F C4 F3 78 */ mr r4, r30
/* 8009BB1C 00098A5C 4B F9 85 DD */ bl dSv_player_item_max_c_NS_getBombNum

32
asm/d/d_save.s
View File

@ -2,38 +2,6 @@
.section .text, "ax" # 80032918
.global dSv_player_item_c_NS_setEmptyBombBagItemIn
dSv_player_item_c_NS_setEmptyBombBagItemIn:
/* 80033A20 00030960 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80033A24 00030964 7C 08 02 A6 */ mflr r0
/* 80033A28 00030968 90 01 00 14 */ stw r0, 0x14(r1)
/* 80033A2C 0003096C 7C 80 23 78 */ mr r0, r4
/* 80033A30 00030970 7C A6 2B 78 */ mr r6, r5
/* 80033A34 00030974 38 80 00 50 */ li r4, 0x50
/* 80033A38 00030978 7C 05 03 78 */ mr r5, r0
/* 80033A3C 0003097C 4B FF FD ED */ bl setBombBagItemIn__17dSv_player_item_cFUcUcb
/* 80033A40 00030980 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80033A44 00030984 7C 08 03 A6 */ mtlr r0
/* 80033A48 00030988 38 21 00 10 */ addi r1, r1, 0x10
/* 80033A4C 0003098C 4E 80 00 20 */ blr
.global dSv_player_item_c_NS_setEmptyBombBagItemIn_X1_
dSv_player_item_c_NS_setEmptyBombBagItemIn_X1_:
/* 80033A50 00030990 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80033A54 00030994 7C 08 02 A6 */ mflr r0
/* 80033A58 00030998 90 01 00 14 */ stw r0, 0x14(r1)
/* 80033A5C 0003099C 7C 88 23 78 */ mr r8, r4
/* 80033A60 000309A0 7C A0 2B 78 */ mr r0, r5
/* 80033A64 000309A4 7C C7 33 78 */ mr r7, r6
/* 80033A68 000309A8 38 80 00 50 */ li r4, 0x50
/* 80033A6C 000309AC 7D 05 43 78 */ mr r5, r8
/* 80033A70 000309B0 7C 06 03 78 */ mr r6, r0
/* 80033A74 000309B4 4B FF FE 9D */ bl setBombBagItemIn__17dSv_player_item_cFUcUcUcb
/* 80033A78 000309B8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80033A7C 000309BC 7C 08 03 A6 */ mtlr r0
/* 80033A80 000309C0 38 21 00 10 */ addi r1, r1, 0x10
/* 80033A84 000309C4 4E 80 00 20 */ blr
.global dSv_player_item_c_NS_setEmptyBombBag
dSv_player_item_c_NS_setEmptyBombBag:
/* 80033A88 000309C8 94 21 FF E0 */ stwu r1, -0x20(r1)

10
src/d/d_save/d_save.cpp
View File

@ -446,4 +446,14 @@ asm void dSv_player_item_c::setBombBagItemIn(u8, u8, bool) {
asm void dSv_player_item_c::setBombBagItemIn(u8, u8, u8, bool) {
nofralloc
#include "func_80033910.s"
}
void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,bool param_2) {
setBombBagItemIn(EMPTY_BOMBBAG,param_1,param_2);
return;
}
void dSv_player_item_c::setEmptyBombBagItemIn(u8 param_1,u8 param_2, bool param_3) {
setBombBagItemIn(EMPTY_BOMBBAG,param_1,param_2,param_3);
return;
}