From bbe725fbedf4a646abcd3e414ba1aa52aeb054a9 Mon Sep 17 00:00:00 2001 From: Mittenz Date: Tue, 18 Aug 2020 22:56:39 -0500 Subject: [PATCH] func_80078100 --- .../unknown_078050/func_80078100.s | 30 ------------------- src/unknown_078050.c | 19 +++++++++++- 2 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 asm/non_matchings/unknown_078050/func_80078100.s diff --git a/asm/non_matchings/unknown_078050/func_80078100.s b/asm/non_matchings/unknown_078050/func_80078100.s deleted file mode 100644 index 463aa2a3..00000000 --- a/asm/non_matchings/unknown_078050/func_80078100.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80078100 -/* 078D00 80078100 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 078D04 80078104 AFBF0014 */ sw $ra, 0x14($sp) -/* 078D08 80078108 0C01E55F */ jal func_8007957C -/* 078D0C 8007810C 00000000 */ nop -/* 078D10 80078110 3C018012 */ lui $at, %hi(D_80126100) # $at, 0x8012 -/* 078D14 80078114 3C048012 */ lui $a0, %hi(D_80125EA0) # $a0, 0x8012 -/* 078D18 80078118 3C058012 */ lui $a1, %hi(D_80125EB8) # $a1, 0x8012 -/* 078D1C 8007811C AC226100 */ sw $v0, %lo(D_80126100)($at) -/* 078D20 80078120 24A55EB8 */ addiu $a1, %lo(D_80125EB8) # addiu $a1, $a1, 0x5eb8 -/* 078D24 80078124 24845EA0 */ addiu $a0, %lo(D_80125EA0) # addiu $a0, $a0, 0x5ea0 -/* 078D28 80078128 0C032208 */ jal osCreateMesgQueue -/* 078D2C 8007812C 24060001 */ li $a2, 1 -/* 078D30 80078130 3C048012 */ lui $a0, %hi(D_80125EC0) # $a0, 0x8012 -/* 078D34 80078134 3C058012 */ lui $a1, %hi(D_80125EF0) # $a1, 0x8012 -/* 078D38 80078138 24A55EF0 */ addiu $a1, %lo(D_80125EF0) # addiu $a1, $a1, 0x5ef0 -/* 078D3C 8007813C 24845EC0 */ addiu $a0, %lo(D_80125EC0) # addiu $a0, $a0, 0x5ec0 -/* 078D40 80078140 0C032208 */ jal osCreateMesgQueue -/* 078D44 80078144 24060008 */ li $a2, 8 -/* 078D48 80078148 3C048012 */ lui $a0, %hi(D_80125ED8) # $a0, 0x8012 -/* 078D4C 8007814C 3C058012 */ lui $a1, %hi(D_80125F10) # $a1, 0x8012 -/* 078D50 80078150 24A55F10 */ addiu $a1, %lo(D_80125F10) # addiu $a1, $a1, 0x5f10 -/* 078D54 80078154 24845ED8 */ addiu $a0, %lo(D_80125ED8) # addiu $a0, $a0, 0x5ed8 -/* 078D58 80078158 0C032208 */ jal osCreateMesgQueue -/* 078D5C 8007815C 24060008 */ li $a2, 8 -/* 078D60 80078160 8FBF0014 */ lw $ra, 0x14($sp) -/* 078D64 80078164 27BD0018 */ addiu $sp, $sp, 0x18 -/* 078D68 80078168 03E00008 */ jr $ra -/* 078D6C 8007816C 00000000 */ nop - diff --git a/src/unknown_078050.c b/src/unknown_078050.c index bc46e550..e899cf5b 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -3,6 +3,7 @@ #include "types.h" #include "macros.h" +#include "libultra_internal.h" extern u32 D_800DE4C0; @@ -11,6 +12,15 @@ extern u32 D_800DE4C8; extern u32 D_800DE4D0; +extern OSMesgQueue D_80125EA0; +extern OSMesg D_80125EB8; +extern OSMesgQueue D_80125EC0; +extern OSMesgQueue D_80125ED8; +extern OSMesg D_80125EF0; +extern OSMesg D_80125F10; + +extern u32 D_80126100; + GLOBAL_ASM("asm/non_matchings/unknown_078050/setupOSTasks.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80077A54.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80077B34.s") @@ -18,7 +28,14 @@ GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80077B5C.s") 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") + +void func_80078100(void){ + D_80126100 = func_8007957C(); + osCreateMesgQueue(&D_80125EA0, &D_80125EB8,1); + osCreateMesgQueue(&D_80125EC0, &D_80125EF0,8); + osCreateMesgQueue(&D_80125ED8, &D_80125F10,8); + +} void func_80078170(u32 arg0, u32 arg1, u32 arg2){ D_800DE4C4 = arg0;