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/kangaskhan_storage.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/kangaskhan_storage.s')
| -rw-r--r-- | asm/kangaskhan_storage.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/kangaskhan_storage.s b/asm/kangaskhan_storage.s index cdd121a..58d18fd 100644 --- a/asm/kangaskhan_storage.s +++ b/asm/kangaskhan_storage.s @@ -389,7 +389,7 @@ _0801731C: _0801733C: .4byte gUnknown_203B208 _08017340: .4byte gUnknown_80D5404 _08017344: - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801735C bl sub_801A928 @@ -508,7 +508,7 @@ _08017404: movs r0, 0x63 b _0801743A .align 2, 0 -_08017430: .4byte gUnknown_203B460 +_08017430: .4byte gTeamInventory_203B460 _08017434: adds r1, r2, 0 adds r1, 0xB4 @@ -634,7 +634,7 @@ _08017530: lsls r0, 24 cmp r0, 0 bne _08017544 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0x13 ble _08017554 _08017544: |