diff options
| author | Dennis <dhilhorst2000@gmail.com> | 2021-07-17 18:45:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 09:45:13 -0700 |
| commit | bad7f7f688253c87c2cb2d063ea57c884cb6adff (patch) | |
| tree | f853042438f42634f8d64b6daec015f3e287d77a /asm/pokemon_2.s | |
| parent | a65d358927f668cb5e34a6046afef5bd61380a28 (diff) | |
More item related decomp (#45)
* decompile sub_80918EC
* some more item related functions
* more item functions
* more decomp, fix types in other places
* more small functions
* more item related decomp
* one more weird branching item function
* fix global.h includes
* figured out branch pattern
* decompile sub_8090F58
* make temporary struct for function
* :crab: items.s is gone :crab:
* some renaming
* rename some obvious item related constants
* fix spelling error
Diffstat (limited to 'asm/pokemon_2.s')
| -rw-r--r-- | asm/pokemon_2.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s index 8232d41..f2e7742 100644 --- a/asm/pokemon_2.s +++ b/asm/pokemon_2.s @@ -92,7 +92,7 @@ _0808DEDA: beq _0808DF00 adds r0, r2, 0 mov r1, r12 - bl sub_8090B64 + bl HeldItemToSlot b _0808DF06 _0808DF00: strb r0, [r2, 0x2] @@ -204,7 +204,7 @@ _0808DFB2: beq _0808DFD4 adds r0, r6, 0 adds r1, r7, 0 - bl sub_8090BB0 + bl SlotToHeldItem b _0808DFD6 _0808DFD4: strb r1, [r6] @@ -230,7 +230,7 @@ sub_808DFDC: beq _0808E004 adds r0, r3, 0 adds r0, 0x28 - bl sub_8090BB0 + bl SlotToHeldItem b _0808E00A .align 2, 0 _0808E000: .4byte gRecruitedPokemonRef |