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 /src/code_801AFA4.c | |
| 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 'src/code_801AFA4.c')
| -rw-r--r-- | src/code_801AFA4.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index 4ad68a8..c9d71dd 100644 --- a/src/code_801AFA4.c +++ b/src/code_801AFA4.c @@ -2,11 +2,10 @@ #include "memory.h" #include "text.h" #include "item.h" -#include "gUnknown_203B460.h" +#include "team_inventory.h" -extern struct unkStruct_203B460 *gUnknown_203B460; +extern struct TeamInventory *gTeamInventory_203B460; -extern u16 GetItemMove(u8); extern void sub_8092C84(u8 *, u16); extern void sub_8099690(u32); extern u32 sub_801B2F4(void); @@ -25,7 +24,7 @@ extern u32 gUnknown_80DBA0C; extern u8 gUnknown_202E1C8[0x50]; -extern bool8 sub_80915A0(u8); +extern bool8 IsHMItem(u8); extern void DisplayGulpinDialogueSprite(u32, u32, u32 *); extern void sub_801B178(void); extern void sub_8094060(u32 *, u32 *); @@ -60,7 +59,7 @@ u32 sub_801AFA4(u32 r0) { gUnknown_203B22C = MemoryAlloc(0xA4, 8); gUnknown_203B22C->unk4 = r0; - gUnknown_203B22C->unk8 = gUnknown_203B460->fill0[r0].itemIndex; + gUnknown_203B22C->unk8 = gTeamInventory_203B460->teamItems[r0].itemIndex; gUnknown_203B22C->unkA = GetItemMove(gUnknown_203B22C->unk8); sub_8092C84(gUnknown_202E1C8, gUnknown_203B22C->unkA); sub_8099690(0); @@ -130,10 +129,10 @@ void sub_801B080(void) break; case 2: sub_8094060(&gUnknown_203B22C->unkC, &gUnknown_203B22C->unk5C->unk2C); - if(!sub_80915A0(gUnknown_203B22C->unk8)) + if(!IsHMItem(gUnknown_203B22C->unk8)) { - gUnknown_203B460->fill0[gUnknown_203B22C->unk4].numItems = gUnknown_203B22C->unk8 - 0x7D; - gUnknown_203B460->fill0[gUnknown_203B22C->unk4].itemIndex = 0x7C; + gTeamInventory_203B460->teamItems[gUnknown_203B22C->unk4].numItems = gUnknown_203B22C->unk8 - 0x7D; + gTeamInventory_203B460->teamItems[gUnknown_203B22C->unk4].itemIndex = ITEM_ID_USED_TM; } PlaySound(0x9C << 1); // #+CM$m8#R learned |