diff --git a/asm/non_matchings/unknown_071730/func_80070B30.s b/asm/non_matchings/unknown_071730/func_80070B30.s deleted file mode 100644 index fcdf1ab4..00000000 --- a/asm/non_matchings/unknown_071730/func_80070B30.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80070B30 -/* 071730 80070B30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 071734 80070B34 3C048013 */ lui $a0, %hi(D_8012D3F0) # $a0, 0x8013 -/* 071738 80070B38 AFBF0014 */ sw $ra, 0x14($sp) -/* 07173C 80070B3C 240EFFFF */ li $t6, -1 -/* 071740 80070B40 3C018012 */ lui $at, %hi(D_801235C0) # $at, 0x8012 -/* 071744 80070B44 2484D3F0 */ addiu $a0, %lo(D_8012D3F0) # addiu $a0, $a0, -0x2c10 -/* 071748 80070B48 3C0F8040 */ lui $t7, 0x8040 -/* 07174C 80070B4C AC2E35C0 */ sw $t6, %lo(D_801235C0)($at) -/* 071750 80070B50 01E42823 */ subu $a1, $t7, $a0 -/* 071754 80070B54 0C01C2F9 */ jal func_80070BE4 -/* 071758 80070B58 24060640 */ li $a2, 1600 -/* 07175C 80070B5C 0C01C42C */ jal func_800710B0 -/* 071760 80070B60 24040002 */ li $a0, 2 -/* 071764 80070B64 8FBF0014 */ lw $ra, 0x14($sp) -/* 071768 80070B68 3C018012 */ lui $at, %hi(D_80123DC8) # $at, 0x8012 -/* 07176C 80070B6C AC203DC8 */ sw $zero, %lo(D_80123DC8)($at) -/* 071770 80070B70 03E00008 */ jr $ra -/* 071774 80070B74 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/src/unknown_071730.c b/src/unknown_071730.c index a5efa410..21bc1146 100644 --- a/src/unknown_071730.c +++ b/src/unknown_071730.c @@ -68,17 +68,16 @@ void func_8006F53C(s32*); void func_80071440(s32 arg0); -#if 1 -GLOBAL_ASM("asm/non_matchings/unknown_071730/func_80070B30.s") -#else + void func_80070B30(void) { - D_801235C0 = -1; - // Issue with a0 - func_80070BE4(&D_8012D3F0, 0x80400000 - (s32)(&D_8012D3F0), 1600); + s32 tmp = -1; + D_801235C0 = tmp; + if(1){ + func_80070BE4(&D_8012D3F0, 0x80400000 - (s32)(&D_8012D3F0), 1600); + } func_800710B0(2); D_80123DC8 = 0; } -#endif s32 *func_80070B78(s32 arg0, s32 arg1) { s32 temp3;