From 6721fba17afde966d88eb0094a23316914ab3895 Mon Sep 17 00:00:00 2001 From: Mittenz Date: Tue, 18 Aug 2020 22:49:16 -0500 Subject: [PATCH] c: func_80078170 --- asm/non_matchings/unknown_078050/func_80078170.s | 10 ---------- src/unknown_078050.c | 14 +++++++++++++- 2 files changed, 13 insertions(+), 11 deletions(-) delete mode 100644 asm/non_matchings/unknown_078050/func_80078170.s diff --git a/asm/non_matchings/unknown_078050/func_80078170.s b/asm/non_matchings/unknown_078050/func_80078170.s deleted file mode 100644 index 2b53abd7..00000000 --- a/asm/non_matchings/unknown_078050/func_80078170.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80078170 -/* 078D70 80078170 3C01800E */ lui $at, %hi(D_800DE4C4) # $at, 0x800e -/* 078D74 80078174 AC24E4C4 */ sw $a0, %lo(D_800DE4C4)($at) -/* 078D78 80078178 3C01800E */ lui $at, %hi(D_800DE4C8) # $at, 0x800e -/* 078D7C 8007817C AC25E4C8 */ sw $a1, %lo(D_800DE4C8)($at) -/* 078D80 80078180 3C01800E */ lui $at, 0x800e -/* 078D84 80078184 00067080 */ sll $t6, $a2, 2 -/* 078D88 80078188 03E00008 */ jr $ra -/* 078D8C 8007818C AC2EE4C0 */ sw $t6, -0x1b40($at) - diff --git a/src/unknown_078050.c b/src/unknown_078050.c index 02d7c885..bc46e550 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -4,6 +4,11 @@ #include "types.h" #include "macros.h" + +extern u32 D_800DE4C0; +extern u32 D_800DE4C4; +extern u32 D_800DE4C8; + extern u32 D_800DE4D0; GLOBAL_ASM("asm/non_matchings/unknown_078050/setupOSTasks.s") @@ -14,7 +19,14 @@ GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80077B9C.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80078054.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_800780DC.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80078100.s") -GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80078170.s") + +void func_80078170(u32 arg0, u32 arg1, u32 arg2){ + D_800DE4C4 = arg0; + D_800DE4C8 = arg1; + D_800DE4C0 = arg2 << 2; +} + + GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80078190.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_800787FC.s")