diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index 09e6d31a0..1ec27292e 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -14,20 +14,6 @@ UNK_021C5A0C: ; 0x021C5A0C .text - thumb_func_start ScrCmd_Unk0062 -ScrCmd_Unk0062: ; 0x0203B3C0 - push {r4, lr} - add r1, r0, #0x0 - add r1, #0x80 - ldr r4, [r1, #0x0] - bl ScriptReadHalfword - add r1, r0, #0x0 - ldr r0, [r4, #0x34] - bl FUN_02058060 - bl FUN_02058908 - mov r0, #0x0 - pop {r4, pc} - thumb_func_start ScrCmd_Unk0063 ScrCmd_Unk0063: ; 0x0203B3DC push {r4, lr} diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 09ef2f69b..81a71cdd5 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -247,7 +247,7 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_WaitForMovement .word ScrCmd_LockAllEvents .word ScrCmd_ReleaseAllEvents - .word ScrCmd_Unk0062 + .word ScrCmd_LockEvent .word ScrCmd_Unk0063 .word ScrCmd_Unk0064 .word ScrCmd_Unk0065 diff --git a/arm9/global.inc b/arm9/global.inc index def8abf4c..c5804741d 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2792,7 +2792,7 @@ .extern ScrCmd_LockAllEvents .extern ScrCmd_LockAllEvents2 .extern ScrCmd_ReleaseAllEvents -.extern ScrCmd_Unk0062 +.extern ScrCmd_LockEvent .extern ScrCmd_Unk0063 .extern ScrCmd_Unk0064 .extern ScrCmd_Unk0065 diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 96ac860a4..658b7592c 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -1576,3 +1576,11 @@ THUMB_FUNC BOOL ScrCmd_ReleaseAllEvents(struct ScriptContext *ctx) FUN_020587B0(ctx->unk80->unk34); return TRUE; } + +THUMB_FUNC BOOL ScrCmd_LockEvent(struct ScriptContext *ctx) +{ + struct UnkSavStruct80 *unk80 = ctx->unk80; + u16 eventId = ScriptReadHalfword(ctx); + FUN_02058908(FUN_02058060(unk80->unk34, eventId)); + return FALSE; +} diff --git a/include/scrcmd.h b/include/scrcmd.h index 0c33260e8..28c0ac92f 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -119,6 +119,7 @@ BOOL ScrCmd_WaitForMovement(struct ScriptContext *ctx); BOOL ScrCmd_LockAllEvents(struct ScriptContext *ctx); BOOL ScrCmd_LockAllEvents2(struct ScriptContext *ctx); BOOL ScrCmd_ReleaseAllEvents(struct ScriptContext *ctx); +BOOL ScrCmd_LockEvent(struct ScriptContext *ctx); // scrcmd_mart.c BOOL ScrCmd_NormalMart(struct ScriptContext * ctx);