From 6fed117565f30cb3f7d61c67df08096fbe2b9ba5 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 16 Feb 2021 18:18:39 +0100 Subject: [PATCH] match sub_0807D184 --- asm/code_0807CC3C.s | 18 ------------------ src/code_0807CC3C.c | 6 ++++++ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index a42a1965..9e7e4d8a 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -272,21 +272,3 @@ _0807D17E: pop {pc} .align 2, 0 - thumb_func_start sub_0807D184 -sub_0807D184: @ 0x0807D184 - push {r4, r5, lr} - adds r4, r0, #0 - adds r5, r1, #0 - movs r2, #8 - bl sub_0807D20C - cmp r0, #0 - bne _0807D1A0 - adds r0, r4, #0 - adds r0, #8 - adds r1, r5, #0 - movs r2, #8 - bl sub_0807D20C -_0807D1A0: - pop {r4, r5, pc} - .align 2, 0 - diff --git a/src/code_0807CC3C.c b/src/code_0807CC3C.c index 47233f43..c3b71781 100644 --- a/src/code_0807CC3C.c +++ b/src/code_0807CC3C.c @@ -26,6 +26,12 @@ extern u16 sub_080B18DC(u16, const char*); void sub_0807DB88(ScriptExecutionContext* context, u32 unk1); void sub_0807DAF0(Entity* entity, ScriptExecutionContext* context, u32 unk1); +void sub_0807D184(u32 param_1, const char* param_2) { + if (sub_0807D20C(param_1, param_2, 8) == 0) { + sub_0807D20C(param_1 + 8, param_2, 8); + } +} + u16 sub_0807D1A4(u16* unk_1, u32 unk_2) { u32 uVar1;