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_8012A18.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_8012A18.s')
-rw-r--r-- | asm/code_8012A18.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s index 7d65e4a..350e33d 100644 --- a/asm/code_8012A18.s +++ b/asm/code_8012A18.s @@ -469,7 +469,7 @@ sub_8012EBC: ldr r3, [r5, 0x10] movs r1, 0 str r1, [sp] - bl sub_8014FF0 + bl xxx_format_and_draw _08012F24: ldr r7, [r5, 0x8] ldr r4, [r5, 0x4] @@ -521,7 +521,7 @@ _08012F64: str r0, [sp] movs r0, 0x8 mov r2, r8 - bl sub_8014FF0 + bl xxx_format_and_draw adds r4, 0x8 movs r1, 0x1 add r9, r1 @@ -4717,8 +4717,8 @@ _08014FE8: bx r1 thumb_func_end sub_8014FA8 - thumb_func_start sub_8014FF0 -sub_8014FF0: + thumb_func_start xxx_format_and_draw +xxx_format_and_draw: push {r4-r6,lr} mov r6, r8 push {r6} @@ -4750,7 +4750,7 @@ sub_8014FF0: bx r0 .align 2, 0 _08015030: .4byte 0x000001f7 - thumb_func_end sub_8014FF0 + thumb_func_end xxx_format_and_draw thumb_func_start sub_8015034 sub_8015034: |