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_801C620.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_801C620.c')
| -rw-r--r-- | src/code_801C620.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/code_801C620.c b/src/code_801C620.c index 8272340..7ae8c6a 100644 --- a/src/code_801C620.c +++ b/src/code_801C620.c @@ -2,12 +2,7 @@ #include "input.h" #include "memory.h" #include "text.h" - -struct subStruct_203B240 -{ - char * unk0; - char * unk4; -}; +#include "subStruct_203B240.h" struct unkStruct_203B240 { @@ -39,7 +34,7 @@ extern void sub_801317C(u32 *); extern void sub_80140B4(struct UnkTextStruct2 *); -extern void sub_8014FF0(u32, u32, char *, u32, u32); +extern void xxx_format_and_draw(u32, u32, char *, u32, u32); extern void sub_8008C54(u32); extern void sub_80073B8(u32); extern void xxx_call_draw_string(u32, u32, char *, u32, u32); @@ -116,7 +111,7 @@ void sub_801C6E4(void) sub_80073B8(gUnknown_203B240->unk24); skillName = GetIQSkillName(gUnknown_203B240->unk4); strcpy(gUnknown_202DE58,skillName); - sub_8014FF0(16,0,gUnknown_80DBE2C,0,0); // $i0 + xxx_format_and_draw(16,0,gUnknown_80DBE2C,0,0); // $i0 xxx_call_draw_string(8,16,GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk24,0); sub_80073E0(gUnknown_203B240->unk24); gUnknown_203B240->unkC = sub_8097DF0(GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk10); @@ -127,8 +122,8 @@ void sub_801C6E4(void) sub_80073B8(gUnknown_203B240->unk24); preload = gUnknown_203B240->unk10[gUnknown_203B240->unk8]; strcpy(gAvailablePokemonNames,preload->unk0); - sub_8014FF0(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // $m0 - sub_8014FF0(4,16,gUnknown_203B240->unk10[gUnknown_203B240->unk8]->unk4, gUnknown_203B240->unk24,0); + xxx_format_and_draw(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // $m0 + xxx_format_and_draw(4,16,gUnknown_203B240->unk10[gUnknown_203B240->unk8]->unk4, gUnknown_203B240->unk24,0); sub_80073E0(gUnknown_203B240->unk24); break; case 2: |