diff options
| -rw-r--r-- | asm/mevent.s | 52 | ||||
| -rw-r--r-- | src/mevent.c | 14 |
2 files changed, 14 insertions, 52 deletions
diff --git a/asm/mevent.s b/asm/mevent.s index 42d4f322b..53b7226de 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -5,58 +5,6 @@ .text - thumb_func_start sub_8144054 -sub_8144054: @ 8144054 - push {lr} - ldr r0, _0814406C @ =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, _08144070 @ =0x000032e4 - adds r0, r1 - ldrb r1, [r0, 0x8] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - beq _08144074 - movs r0, 0x1 - b _08144076 - .align 2, 0 -_0814406C: .4byte gSaveBlock1Ptr -_08144070: .4byte 0x000032e4 -_08144074: - movs r0, 0 -_08144076: - pop {r1} - bx r1 - thumb_func_end sub_8144054 - - thumb_func_start sub_814407C -sub_814407C: @ 814407C - push {r4,r5,lr} - sub sp, 0x4 - movs r5, 0 - str r5, [sp] - ldr r4, _081440A4 @ =gSaveBlock1Ptr - ldr r1, [r4] - ldr r0, _081440A8 @ =0x000032e4 - adds r1, r0 - ldr r2, _081440AC @ =0x05000053 - mov r0, sp - bl CpuSet - ldr r0, [r4] - ldr r1, _081440B0 @ =0x000032e0 - adds r0, r1 - str r5, [r0] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_081440A4: .4byte gSaveBlock1Ptr -_081440A8: .4byte 0x000032e4 -_081440AC: .4byte 0x05000053 -_081440B0: .4byte 0x000032e0 - thumb_func_end sub_814407C - thumb_func_start sub_81440B4 sub_81440B4: @ 81440B4 push {r4,lr} diff --git a/src/mevent.c b/src/mevent.c index 74a3d1b5f..f61f7b7a2 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -614,3 +614,17 @@ bool32 sub_8144018(const struct MEventBuffer_32E0_Sub * data) return FALSE; return TRUE; } + +bool32 sub_8144054(void) +{ + const struct MEventBuffer_32E0_Sub * data = &gSaveBlock1Ptr->unk_3120.buffer_1c0.data; + if (data->unk_08_6 == 0) + return FALSE; + return TRUE; +} + +void sub_814407C(void) +{ + CpuFill32(0, &gSaveBlock1Ptr->unk_3120.buffer_1c0.data, sizeof(struct MEventBuffer_32E0_Sub)); + gSaveBlock1Ptr->unk_3120.buffer_1c0.crc = 0; +} |