diff --git a/asm/non_matchings/unknown_001050/func_80001C5C.s b/asm/non_matchings/unknown_001050/func_80001C5C.s deleted file mode 100644 index b9177b56..00000000 --- a/asm/non_matchings/unknown_001050/func_80001C5C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80001C5C -/* 00285C 80001C5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 002860 80001C60 AFB1001C */ sw $s1, 0x1c($sp) -/* 002864 80001C64 00048A00 */ sll $s1, $a0, 8 -/* 002868 80001C68 AFB20020 */ sw $s2, 0x20($sp) -/* 00286C 80001C6C AFB00018 */ sw $s0, 0x18($sp) -/* 002870 80001C70 322FFFFF */ andi $t7, $s1, 0xffff -/* 002874 80001C74 AFBF0024 */ sw $ra, 0x24($sp) -/* 002878 80001C78 AFA40028 */ sw $a0, 0x28($sp) -/* 00287C 80001C7C 01E08825 */ move $s1, $t7 -/* 002880 80001C80 00008025 */ move $s0, $zero -/* 002884 80001C84 24120040 */ li $s2, 64 -/* 002888 80001C88 320400FF */ andi $a0, $s0, 0xff -.L80001C8C: -/* 00288C 80001C8C 0C001298 */ jal func_80004A60 -/* 002890 80001C90 3225FFFF */ andi $a1, $s1, 0xffff -/* 002894 80001C94 26100001 */ addiu $s0, $s0, 1 -/* 002898 80001C98 1612FFFC */ bne $s0, $s2, .L80001C8C -/* 00289C 80001C9C 320400FF */ andi $a0, $s0, 0xff -/* 0028A0 80001CA0 8FBF0024 */ lw $ra, 0x24($sp) -/* 0028A4 80001CA4 8FB00018 */ lw $s0, 0x18($sp) -/* 0028A8 80001CA8 8FB1001C */ lw $s1, 0x1c($sp) -/* 0028AC 80001CAC 8FB20020 */ lw $s2, 0x20($sp) -/* 0028B0 80001CB0 03E00008 */ jr $ra -/* 0028B4 80001CB4 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 7d37d6f3..ef419be4 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -387,7 +387,22 @@ void func_80001844(void){ return; } +#if 1 GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001878.s") +#else +void func_80001878(u8 arg0){ + if(arg0 != D_800DC640){ + D_800DC640 = arg0; + if(arg0 != 0){ + func_80000B34(D_80115D04); + } + else{ + func_80001844(); + } + } + return; +} +#endif u8 func_800018D0(void){ return D_800DC640; @@ -459,16 +474,13 @@ u32 func_80001C08(void){ return 0; } -#if 1 -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001C5C.s") -#else -void func_80001C5C(u32 arg0){ +void func_80001C5C(u16 arg0){ u32 s0; for(s0 = 0; s0<64; s0++){ func_80004A60(s0, arg0 << 8); } } -#endif + u16 func_80001CB8(u16 arg0) { if (D_80115D20 < arg0) {