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/event_flag.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/event_flag.s')
| -rw-r--r-- | asm/event_flag.s | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/asm/event_flag.s b/asm/event_flag.s index 1affa18..6777a5b 100644 --- a/asm/event_flag.s +++ b/asm/event_flag.s @@ -487,7 +487,7 @@ _08001754: lsls r1, 2 b _0800176C .align 2, 0 -_08001760: .4byte gUnknown_203B460 +_08001760: .4byte gTeamInventory_203B460 _08001764: ldr r0, _08001774 ldr r0, [r0] @@ -498,7 +498,7 @@ _0800176C: ldr r0, [r0] b _0800177A .align 2, 0 -_08001774: .4byte gUnknown_203B460 +_08001774: .4byte gTeamInventory_203B460 _08001778: movs r0, 0 _0800177A: @@ -652,7 +652,7 @@ _080018A4: ldr r0, [r0] b _080018CE .align 2, 0 -_080018B4: .4byte gUnknown_203B460 +_080018B4: .4byte gTeamInventory_203B460 _080018B8: ldr r0, _080018C8 ldr r0, [r0] @@ -662,7 +662,7 @@ _080018B8: ldr r0, [r0] b _080018CE .align 2, 0 -_080018C8: .4byte gUnknown_203B460 +_080018C8: .4byte gTeamInventory_203B460 _080018CC: movs r0, 0 _080018CE: @@ -757,7 +757,7 @@ _08001972: adds r0, r1 b _0800198E .align 2, 0 -_08001980: .4byte gUnknown_203B460 +_08001980: .4byte gTeamInventory_203B460 _08001984: ldr r0, _08001998 ldr r0, [r0] @@ -772,7 +772,7 @@ _08001990: pop {r0} bx r0 .align 2, 0 -_08001998: .4byte gUnknown_203B460 +_08001998: .4byte gTeamInventory_203B460 thumb_func_end sub_80018D8 thumb_func_start sub_800199C @@ -871,7 +871,7 @@ _08001A4E: lsls r1, 2 b _08001A64 .align 2, 0 -_08001A58: .4byte gUnknown_203B460 +_08001A58: .4byte gTeamInventory_203B460 _08001A5C: ldr r0, _08001A70 ldr r0, [r0] @@ -886,7 +886,7 @@ _08001A68: pop {r0} bx r0 .align 2, 0 -_08001A70: .4byte gUnknown_203B460 +_08001A70: .4byte gTeamInventory_203B460 thumb_func_end sub_800199C thumb_func_start sub_8001A74 @@ -1400,7 +1400,7 @@ _08001E3E: movs r1, 0x1 bl sub_80973A8 movs r0, 0xE7 - bl sub_8091130 + bl FindItemInInventory movs r1, 0x1 negs r1, r1 cmp r0, r1 @@ -1499,7 +1499,7 @@ _08001F06: bl ScenarioCalc _08001F20: movs r0, 0xE2 - bl sub_8091130 + bl FindItemInInventory movs r1, 0x1 negs r1, r1 cmp r0, r1 @@ -1698,7 +1698,7 @@ _080020D4: pop {r0} bx r0 .align 2, 0 -_080020DC: .4byte gUnknown_203B460 +_080020DC: .4byte gTeamInventory_203B460 _080020E0: .4byte 0x0000021e _080020E4: .4byte 0x00000113 thumb_func_end sub_8001D88 |