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_8048480.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_8048480.s')
| -rw-r--r-- | asm/code_8048480.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/code_8048480.s b/asm/code_8048480.s index c24da61..df967ae 100644 --- a/asm/code_8048480.s +++ b/asm/code_8048480.s @@ -584,7 +584,7 @@ _08048984: .4byte gUnknown_80FE3E8 _08048988: mov r1, r8 ldrb r0, [r1, 0x2] - bl sub_80915A0 + bl IsHMItem lsls r0, 24 cmp r0, 0 beq _080489A0 @@ -1095,7 +1095,7 @@ _08048D78: cmp r0, 0x1 bne _08048DB0 ldrb r0, [r2, 0x2] - bl sub_8091570 + bl IsEdibleItem lsls r0, 24 cmp r0, 0 beq _08048DB0 @@ -20335,7 +20335,7 @@ _08052196: movs r0, 0 b _080521CA .align 2, 0 -_080521B4: .4byte gUnknown_203B460 +_080521B4: .4byte gTeamInventory_203B460 _080521B8: .4byte gRecruitedPokemonRef _080521BC: .4byte 0x00008df8 _080521C0: .4byte 0x00008e38 |