summaryrefslogtreecommitdiff
path: root/asm/friend_list_menu.s
diff options
context:
space:
mode:
authorDennis <dhilhorst2000@gmail.com>2021-07-17 18:45:13 +0200
committerGitHub <noreply@github.com>2021-07-17 09:45:13 -0700
commitbad7f7f688253c87c2cb2d063ea57c884cb6adff (patch)
treef853042438f42634f8d64b6daec015f3e287d77a /asm/friend_list_menu.s
parenta65d358927f668cb5e34a6046afef5bd61380a28 (diff)
More item related decomp (#45)
* decompile sub_80918EC * some more item related functions * more item functions * more decomp, fix types in other places * more small functions * more item related decomp * one more weird branching item function * fix global.h includes * figured out branch pattern * decompile sub_8090F58 * make temporary struct for function * :crab: items.s is gone :crab: * some renaming * rename some obvious item related constants * fix spelling error
Diffstat (limited to 'asm/friend_list_menu.s')
-rw-r--r--asm/friend_list_menu.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s
index d9a0e57..caa5a02 100644
--- a/asm/friend_list_menu.s
+++ b/asm/friend_list_menu.s
@@ -13139,7 +13139,7 @@ _08025668:
ldr r1, [r5]
adds r1, 0x14
add r0, sp, 0x8
- bl sub_8090B64
+ bl HeldItemToSlot
add r0, sp, 0x8
bl sub_801B3C0
b _08025720
@@ -13973,7 +13973,7 @@ _08025D24:
ldr r1, [r5]
adds r1, 0x14
adds r0, r4, 0
- bl sub_8090B64
+ bl HeldItemToSlot
movs r1, 0
str r1, [sp]
mov r0, sp
@@ -14144,7 +14144,7 @@ sub_8025E68:
add r4, sp, 0x10
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8090B64
+ bl HeldItemToSlot
movs r5, 0
str r5, [sp, 0x4]
add r0, sp, 0x4
@@ -14721,7 +14721,7 @@ _08026350:
ldr r1, [r4]
adds r1, 0x10
add r0, sp, 0x14
- bl sub_8090B64
+ bl HeldItemToSlot
add r0, sp, 0x14
bl sub_801B3C0
b _080264BA
@@ -15876,7 +15876,7 @@ _08026C84:
ldr r1, [r5]
adds r1, 0x10
adds r0, r4, 0
- bl sub_8090B64
+ bl HeldItemToSlot
movs r1, 0
str r1, [sp]
mov r0, sp
@@ -16027,7 +16027,7 @@ sub_8026DAC:
add r4, sp, 0x10
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8090B64
+ bl HeldItemToSlot
movs r5, 0
str r5, [sp, 0x4]
add r0, sp, 0x4