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_2.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_2.s')
| -rw-r--r-- | asm/code_2.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/code_2.s b/asm/code_2.s index 2fca8d0..b9d3464 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -1509,7 +1509,7 @@ _08001266: adds r4, 0x1 cmp r4, 0x13 ble _0800124E - bl sub_80910B4 + bl FillInventoryGaps movs r4, 0 ldr r5, _080012BC movs r3, 0x1 @@ -1548,7 +1548,7 @@ _08001298: pop {r0} bx r0 .align 2, 0 -_080012B8: .4byte gUnknown_203B460 +_080012B8: .4byte gTeamInventory_203B460 _080012BC: .4byte gRecruitedPokemonRef thumb_func_end sub_8001248 @@ -1568,7 +1568,7 @@ _080012C8: adds r3, 0x1 cmp r3, 0x13 ble _080012C8 - bl sub_80910B4 + bl FillInventoryGaps movs r3, 0 ldr r5, _08001328 movs r4, 0x1 @@ -1607,7 +1607,7 @@ _08001306: pop {r0} bx r0 .align 2, 0 -_08001324: .4byte gUnknown_203B460 +_08001324: .4byte gTeamInventory_203B460 _08001328: .4byte gRecruitedPokemonRef thumb_func_end sub_80012C0 |