diff options
| author | Dennis <dhilhorst2000@gmail.com> | 2021-07-12 21:10:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 14:10:32 -0500 |
| commit | da7b30612f2cac57da0ffe09d1d7c42e309d15f2 (patch) | |
| tree | e82dbc33b112798b308e8c001eb3979cab69aa05 /asm/friend_list_menu.s | |
| parent | 2104c4f7623f2bfc94130d25f2c903fa54991676 (diff) | |
More work on item related functions (#44)
* decompile sub_8091290
* decompile sub_80912c8
* rename functions / struct field
* more names
* decompile 80913A0
* decompile GetItemMove
* decompile sub_80913E0
* rename function
* decompile CanSellItem function
* rename inventory struct
* add some item check functions
* fix renaming stuff
* this file shouldnt have been here
* forgot merge conflict
* decompile more item functions
* rename some stuff
* fix HM/TM naming
* Update src/code_801AFA4.c
Use enum value for USED_TM
* Fix incorrect value
* decompile sub_80915F4
* decompile HasGummiItem
* decompiled another function and renamed stuff
* decompile 2 smaller functions
* more functions
* more decompiling and renaming
* redo change that was undone in the merge
Diffstat (limited to 'asm/friend_list_menu.s')
| -rw-r--r-- | asm/friend_list_menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s index d2e6283..d9a0e57 100644 --- a/asm/friend_list_menu.s +++ b/asm/friend_list_menu.s @@ -7271,7 +7271,7 @@ sub_80227B8: adds r1, r5, 0 movs r2, 0x6 bl sub_808D9AC - bl sub_809177C + bl HasGummiItem lsls r0, 24 cmp r0, 0 beq _08022818 @@ -7921,7 +7921,7 @@ sub_8022D2C: adds r0, r2, 0 adds r0, 0x52 ldrb r0, [r0] - bl sub_8091764 + bl IsGummiItem lsls r0, 24 cmp r0, 0 bne _08022D74 @@ -8194,7 +8194,7 @@ _08022F68: ldrb r1, [r1] adds r3, 0x44 movs r2, 0 - bl sub_80915F4 + bl GetGummiItemStatBoost ldr r1, [r4] adds r0, r1, 0 adds r0, 0x20 @@ -15029,7 +15029,7 @@ _080265B4: adds r2, r3 movs r0, 0xA str r0, [r2] - bl sub_809177C + bl HasGummiItem lsls r0, 24 cmp r0, 0 bne _080265EC |