mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-02 10:10:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix nonmatching PutItemOnSlot

Browse Source
This commit is contained in:
Tal Hayon
2021-12-27 17:06:51 +02:00
parent 60e74d1ba9
commit 167fe1122e
2 changed files with 6 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_0805436C.c
+6 -7
View File
@@ -44,13 +44,13 @@ u32 IsItemEquipped(u32 itemID) {
return itemSlot;
}
NONMATCH("asm/non_matching/PutItemOnSlot.inc", void PutItemOnSlot(u32 itemID)) {
// reg-alloc
void PutItemOnSlot(u32 itemID) {
u32 itemSlot;
if (itemID < 0x47) {
register u32 itemID2 asm ("r5") = itemID;
if (itemID2 < 0x47) {
sub_0807CAA0(0, 1);
}
if (itemID - 1 < 0x1f) {
if (itemID2 - 1 < 0x1f) {
itemSlot = 2;
if (gSave.stats.itemOnA == 0) {
itemSlot = 0;
@@ -58,7 +58,7 @@ NONMATCH("asm/non_matching/PutItemOnSlot.inc", void PutItemOnSlot(u32 itemID)) {
itemSlot = 1;
}
if (itemSlot == 2) {
u8 temp = gUnk_080FD5B4[itemID].unk;
u8 temp = gUnk_080FD5B4[itemID2].unk;
if (temp == gUnk_080FD5B4[gSave.stats.itemOnA].unk) {
itemSlot = 0;
} else {
@@ -70,10 +70,9 @@ NONMATCH("asm/non_matching/PutItemOnSlot.inc", void PutItemOnSlot(u32 itemID)) {
return;
}
}
ForceEquipItem(itemID, itemSlot);
ForceEquipItem(itemID2, itemSlot);
}
}
END_NONMATCH
ASM_FUNC("asm/non_matching/ForceEquipItem.inc", void ForceEquipItem(u32 itemID, u8 itemSlot))