diff options
| author | Dennis <dhilhorst2000@gmail.com> | 2021-07-10 18:23:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-10 11:23:20 -0500 |
| commit | 92a8e55fdd348a88a365eb389181d8e29da6dad9 (patch) | |
| tree | 2467ef22cb8cf75bdf056143fab3fac4a68ef404 /asm/code_8098BDC.s | |
| parent | 386299d1f401cb939e6fe3ea16d0ca57731b2648 (diff) | |
Decompiled some item related functions (#42)
* 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
Co-authored-by: Seth Barberee <seth.barberee@gmail.com>
Diffstat (limited to 'asm/code_8098BDC.s')
| -rw-r--r-- | asm/code_8098BDC.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s index fb72947..e068e60 100644 --- a/asm/code_8098BDC.s +++ b/asm/code_8098BDC.s @@ -6500,7 +6500,7 @@ _0809C2CA: adds r0, r1 ldrb r4, [r0, 0x2] adds r0, r4, 0 - bl sub_8091570 + bl IsEdibleItem lsls r0, 24 cmp r0, 0 beq _0809C30C @@ -6509,7 +6509,7 @@ _0809C2CA: movs r2, 0 bl sub_8090DC4 adds r0, r5, 0 - bl sub_80911F8 + bl ShiftItemsDownFrom ldr r0, [r6] movs r2, 0x86 lsls r2, 3 @@ -6517,7 +6517,7 @@ _0809C2CA: movs r1, 0x1 b _0809C318 .align 2, 0 -_0809C304: .4byte gUnknown_203B460 +_0809C304: .4byte gTeamInventory_203B460 _0809C308: .4byte gUnknown_202DE58 _0809C30C: ldr r0, [r6] @@ -7637,7 +7637,7 @@ sub_809CBA4: push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_8091130 + bl FindItemInInventory cmp r0, 0 bge _0809CBB6 movs r0, 0 @@ -7693,7 +7693,7 @@ sub_809CBBC: .align 2, 0 _0809CC0C: .4byte gUnknown_81163E4 _0809CC10: .4byte gItemParametersData -_0809CC14: .4byte gUnknown_203B460 +_0809CC14: .4byte gTeamInventory_203B460 _0809CC18: .4byte 0x0001869f _0809CC1C: str r1, [r2] @@ -7709,7 +7709,7 @@ _0809CC20: adds r1, r4, 0 movs r2, 0 bl sub_8090E14 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _0809CC52 cmp r5, 0 @@ -7727,7 +7727,7 @@ _0809CC52: ldrb r0, [r4, 0x2] movs r1, 0 bl sub_809124C - bl sub_80910B4 + bl FillInventoryGaps _0809CC5E: cmp r7, 0 beq _0809CC80 @@ -7779,10 +7779,10 @@ sub_809CC90: b _0809CCD6 .align 2, 0 _0809CCBC: .4byte gUnknown_81163BC -_0809CCC0: .4byte gUnknown_203B460 +_0809CCC0: .4byte gTeamInventory_203B460 _0809CCC4: .4byte 0x0001869f _0809CCC8: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _0809CCD4 movs r0, 0x2 |