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_801C620.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_801C620.s')
| -rw-r--r-- | asm/code_801C620.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_801C620.s b/asm/code_801C620.s index 8c97b65..1f2dd00 100644 --- a/asm/code_801C620.s +++ b/asm/code_801C620.s @@ -220,7 +220,7 @@ _0801CA7C: movs r6, 0 cmp r0, 0 bne _0801CAB0 - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots adds r4, r0, 0 bl sub_801CFB8 adds r4, r0 @@ -669,7 +669,7 @@ _0801CE44: .4byte 0x000004d2 _0801CE48: .4byte 0x000004ce _0801CE4C: .4byte 0x000004b4 _0801CE50: .4byte 0x000004ec -_0801CE54: .4byte gUnknown_203B460 +_0801CE54: .4byte gTeamInventory_203B460 thumb_func_end sub_801CCD8 thumb_func_start sub_801CE58 @@ -698,7 +698,7 @@ _0801CE68: lsls r0, r6, 24 lsrs r0, 24 str r3, [sp] - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 ldr r3, [sp] cmp r0, 0 @@ -771,7 +771,7 @@ _0801CEFC: bx r1 .align 2, 0 _0801CF0C: .4byte gUnknown_203B244 -_0801CF10: .4byte gUnknown_203B460 +_0801CF10: .4byte gTeamInventory_203B460 thumb_func_end sub_801CE58 thumb_func_start sub_801CF14 @@ -795,7 +795,7 @@ _0801CF20: beq _0801CF3E lsls r0, r4, 24 lsrs r0, 24 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 bne _0801CF1A @@ -809,7 +809,7 @@ _0801CF46: pop {r1} bx r1 .align 2, 0 -_0801CF4C: .4byte gUnknown_203B460 +_0801CF4C: .4byte gTeamInventory_203B460 thumb_func_end sub_801CF14 thumb_func_start sub_801CF50 @@ -826,7 +826,7 @@ _0801CF5A: _0801CF5E: lsls r0, r4, 24 lsrs r0, 24 - bl sub_8091524 + bl IsNotMoneyOrUsedTMItem lsls r0, 24 cmp r0, 0 beq _0801CF7C @@ -849,7 +849,7 @@ _0801CF84: bx r1 .align 2, 0 _0801CF8C: .4byte 0x000003e6 -_0801CF90: .4byte gUnknown_203B460 +_0801CF90: .4byte gTeamInventory_203B460 thumb_func_end sub_801CF50 thumb_func_start sub_801CF94 @@ -1554,7 +1554,7 @@ sub_801D4C0: str r0, [r1, 0x6C] ldr r0, _0801D558 str r0, [r1, 0x68] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801D4FE ldr r0, [r4] @@ -1640,7 +1640,7 @@ _0801D59A: str r0, [r1, 0x74] ldr r0, _0801D648 str r0, [r1, 0x70] - bl sub_8090A34 + bl GetNumberOfFilledInventorySlots cmp r0, 0 bne _0801D5B4 ldr r0, [r4] |