summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotyourav <65437533+notyourav@users.noreply.github.com>2022-01-20 21:27:47 -0800
committerGitHub <noreply@github.com>2022-01-20 21:27:47 -0800
commiteeb685220e7bb7eb6a0ecae2bb3e57ff261c26fc (patch)
treeb3ed205d54bda1ebd226d0e270159242e01e9901
parentbfd7b5693378e3df7e6235021c225447c5453490 (diff)
parentd3bac0a30399932c5e4415c6f882e8ebd02a0349 (diff)
Merge pull request #302 from hatal175/PutItemOnSlot
Remove assembly instruction from PutItemOnSlot
-rw-r--r--src/code_0805436C.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index 72da2bf9..6d3eb919 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -48,7 +48,7 @@ u32 IsItemEquipped(u32 itemID) {
void PutItemOnSlot(u32 itemID) {
u32 itemSlot;
- register u32 itemID2 asm("r5") = itemID;
+ u32 itemID2 = itemID;
if (itemID2 < 0x47) {
sub_0807CAA0(0, 1);
}
@@ -60,7 +60,7 @@ void PutItemOnSlot(u32 itemID) {
itemSlot = 1;
}
if (itemSlot == 2) {
- u8 temp = gUnk_080FD5B4[itemID2].unk;
+ u32 temp = gUnk_080FD5B4[itemID2].unk;
if (temp == gUnk_080FD5B4[gSave.stats.itemButtons[SLOT_A]].unk) {
itemSlot = 0;
} else {