diff options
author | Dennis <dhilhorst2000@gmail.com> | 2021-07-12 21:10:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-12 14:10:32 -0500 |
commit | da7b30612f2cac57da0ffe09d1d7c42e309d15f2 (patch) | |
tree | e82dbc33b112798b308e8c001eb3979cab69aa05 /asm/kangaskhan_storage_2.s | |
parent | 2104c4f7623f2bfc94130d25f2c903fa54991676 (diff) |
More work on item related functions (#44)
* 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
* decompile sub_80915F4
* decompile HasGummiItem
* decompiled another function and renamed stuff
* decompile 2 smaller functions
* more functions
* more decompiling and renaming
* redo change that was undone in the merge
Diffstat (limited to 'asm/kangaskhan_storage_2.s')
-rw-r--r-- | asm/kangaskhan_storage_2.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s index 58c8bc6..0d1743f 100644 --- a/asm/kangaskhan_storage_2.s +++ b/asm/kangaskhan_storage_2.s @@ -465,7 +465,7 @@ _0801864A: lsls r4, r5, 2 ldr r0, [r6] adds r0, r4 - bl sub_80917B8 + bl MoveToStorage ldr r0, [r6] adds r0, r4 strb r7, [r0, 0x2] @@ -849,7 +849,7 @@ _08018978: .4byte gUnknown_203B20C _0801897C: ldr r0, [r4] adds r0, 0x8 - bl sub_80917B8 + bl MoveToStorage ldr r0, [r4] ldr r0, [r0, 0xC] bl ShiftItemsDownFrom |