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_8027C84.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_8027C84.s')
| -rw-r--r-- | asm/code_8027C84.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_8027C84.s b/asm/code_8027C84.s index c007807..c2bbfa0 100644 --- a/asm/code_8027C84.s +++ b/asm/code_8027C84.s @@ -115,7 +115,7 @@ sub_8027D40: movs r0, 0x4 movs r1, 0x3 adds r3, r6, 0 - bl sub_8014FF0 + bl xxx_format_and_draw adds r0, r6, 0 bl sub_80073E0 add sp, 0x14 @@ -209,7 +209,7 @@ sub_8027E18: movs r0, 0 b _08027E46 _08027E28: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 bgt _08027E34 movs r0, 0x1 @@ -237,12 +237,12 @@ sub_8027E4C: adds r4, r5, 0 adds r4, 0x28 ldrb r0, [r4] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _08027E88 ldrb r0, [r4] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08027E94 @@ -264,7 +264,7 @@ _08027E88: movs r0, 0 b _08027EAA .align 2, 0 -_08027E8C: .4byte gUnknown_203B460 +_08027E8C: .4byte gTeamInventory_203B460 _08027E90: .4byte 0x000003e7 _08027E94: ldr r0, _08027EB0 @@ -284,7 +284,7 @@ _08027EAA: pop {r1} bx r1 .align 2, 0 -_08027EB0: .4byte gUnknown_203B460 +_08027EB0: .4byte gTeamInventory_203B460 _08027EB4: .4byte 0x000003e6 thumb_func_end sub_8027E4C @@ -310,7 +310,7 @@ _08027ED8: ldr r0, [r4] adds r0, 0x14 bl sub_8091274 - bl sub_80910B4 + bl FillInventoryGaps ldr r0, [r4] movs r1, 0 strb r1, [r0, 0x14] @@ -331,7 +331,7 @@ _08027F0C: bl PlaySound ldr r0, [r4] ldrb r0, [r0, 0x14] - bl sub_8090A60 + bl IsThrowableItem lsls r0, 24 cmp r0, 0 beq _08027F40 @@ -348,7 +348,7 @@ _08027F0C: b _08027F52 .align 2, 0 _08027F38: .4byte 0x0000014d -_08027F3C: .4byte gUnknown_203B460 +_08027F3C: .4byte gTeamInventory_203B460 _08027F40: ldr r0, _08027F74 ldr r1, [r0] @@ -376,7 +376,7 @@ _08027F52: bl sub_8027184 b _08027F82 .align 2, 0 -_08027F74: .4byte gUnknown_203B460 +_08027F74: .4byte gTeamInventory_203B460 _08027F78: .4byte gUnknown_203B2BC _08027F7C: movs r0, 0x2 |