diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-12-02 17:31:54 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-12-02 17:31:54 -0500 |
| commit | c7f9c8f1a52ca6284892442a76b462d67d23145e (patch) | |
| tree | 6c8dee5502f9b25df37bd6447351debfaa7f713a | |
| parent | 5151db6054d0704584fdf53e55840e262cde32a4 (diff) | |
sub_81462EC
| -rw-r--r-- | asm/mevent_8145654.s | 21 | ||||
| -rw-r--r-- | src/mevent_8145654.c | 10 |
2 files changed, 10 insertions, 21 deletions
diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 22b042b50..9641e4e87 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -5,27 +5,6 @@ .text - thumb_func_start sub_81462EC -sub_81462EC: @ 81462EC - push {r4,lr} - ldr r4, =gUnknown_203F3CC - ldr r0, [r4] - cmp r0, 0 - beq _08146308 - ldr r2, =0x000013a4 - movs r1, 0 - bl memset - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08146308: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81462EC - thumb_func_start sub_8146318 sub_8146318: @ 8146318 push {r4-r7,lr} diff --git a/src/mevent_8145654.c b/src/mevent_8145654.c index 4c81cb620..300a1bf3e 100644 --- a/src/mevent_8145654.c +++ b/src/mevent_8145654.c @@ -477,3 +477,13 @@ bool32 sub_8146288(const struct MEventBuffer_3120_Sub * a0) gUnknown_203F3CC->unk_01C1 = 0xFF; return TRUE; } + +void sub_81462EC(void) +{ + if (gUnknown_203F3CC != NULL) + { + *gUnknown_203F3CC = (struct UnkStruct_203F3CC){}; + Free(gUnknown_203F3CC); + gUnknown_203F3CC = NULL; + } +} |