From 2bc133ef08c922f5792a86d6d24955740b63d74d Mon Sep 17 00:00:00 2001 From: Anghelo Date: Wed, 27 Jan 2021 19:51:21 -0300 Subject: [PATCH] three more Signed-off-by: Anghelo --- .../actors/ovl_Demo_Gj/func_8097A07C.s | 29 -------------- .../actors/ovl_Demo_Gj/func_8097A2B4.s | 30 --------------- .../actors/ovl_Demo_Gj/func_8097AC30.s | 30 --------------- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 38 ++++++++----------- 4 files changed, 15 insertions(+), 112 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s deleted file mode 100644 index 538318c37b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_8097A07C -/* 0174C 8097A07C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01750 8097A080 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01754 8097A084 AFA5001C */ sw $a1, 0x001C($sp) -/* 01758 8097A088 8C8E017C */ lw $t6, 0x017C($a0) ## 0000017C -/* 0175C 8097A08C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01760 8097A090 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01764 8097A094 15C0000F */ bne $t6, $zero, .L8097A0D4 -/* 01768 8097A098 00451021 */ addu $v0, $v0, $a1 -/* 0176C 8097A09C 8C421DE4 */ lw $v0, 0x1DE4($v0) ## 00011DE4 -/* 01770 8097A0A0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01774 8097A0A4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01778 8097A0A8 0041001B */ divu $zero, $v0, $at -/* 0177C 8097A0AC 00001810 */ mfhi $v1 -/* 01780 8097A0B0 3C058098 */ lui $a1, %hi(D_8097BE88) ## $a1 = 80980000 -/* 01784 8097A0B4 14600005 */ bne $v1, $zero, .L8097A0CC -/* 01788 8097A0B8 24A5BE88 */ addiu $a1, $a1, %lo(D_8097BE88) ## $a1 = 8097BE88 -/* 0178C 8097A0BC 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 -/* 01790 8097A0C0 0C25E2BF */ jal func_80978AFC -/* 01794 8097A0C4 AFA70018 */ sw $a3, 0x0018($sp) -/* 01798 8097A0C8 8FA70018 */ lw $a3, 0x0018($sp) -.L8097A0CC: -/* 0179C 8097A0CC 0C25E7E7 */ jal func_80979F9C -/* 017A0 8097A0D0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L8097A0D4: -/* 017A4 8097A0D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 017A8 8097A0D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 017AC 8097A0DC 03E00008 */ jr $ra -/* 017B0 8097A0E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s deleted file mode 100644 index 823215db2f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8097A2B4 -/* 01984 8097A2B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01988 8097A2B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0198C 8097A2BC AFA5001C */ sw $a1, 0x001C($sp) -/* 01990 8097A2C0 8C8E017C */ lw $t6, 0x017C($a0) ## 0000017C -/* 01994 8097A2C4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 01998 8097A2C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0199C 8097A2CC 15C00010 */ bne $t6, $zero, .L8097A310 -/* 019A0 8097A2D0 00451021 */ addu $v0, $v0, $a1 -/* 019A4 8097A2D4 8C421DE4 */ lw $v0, 0x1DE4($v0) ## 00011DE4 -/* 019A8 8097A2D8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 019AC 8097A2DC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 019B0 8097A2E0 0041001B */ divu $zero, $v0, $at -/* 019B4 8097A2E4 00001810 */ mfhi $v1 -/* 019B8 8097A2E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 019BC 8097A2EC 14610006 */ bne $v1, $at, .L8097A308 -/* 019C0 8097A2F0 3C058098 */ lui $a1, %hi(D_8097BE94) ## $a1 = 80980000 -/* 019C4 8097A2F4 24A5BE94 */ addiu $a1, $a1, %lo(D_8097BE94) ## $a1 = 8097BE94 -/* 019C8 8097A2F8 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 -/* 019CC 8097A2FC 0C25E2BF */ jal func_80978AFC -/* 019D0 8097A300 AFA70018 */ sw $a3, 0x0018($sp) -/* 019D4 8097A304 8FA70018 */ lw $a3, 0x0018($sp) -.L8097A308: -/* 019D8 8097A308 0C25E7E7 */ jal func_80979F9C -/* 019DC 8097A30C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L8097A310: -/* 019E0 8097A310 8FBF0014 */ lw $ra, 0x0014($sp) -/* 019E4 8097A314 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 019E8 8097A318 03E00008 */ jr $ra -/* 019EC 8097A31C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s deleted file mode 100644 index 1a1bcf5fe2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8097AC30 -/* 02300 8097AC30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02304 8097AC34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02308 8097AC38 AFA5001C */ sw $a1, 0x001C($sp) -/* 0230C 8097AC3C 8C8E017C */ lw $t6, 0x017C($a0) ## 0000017C -/* 02310 8097AC40 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 02314 8097AC44 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02318 8097AC48 15C00010 */ bne $t6, $zero, .L8097AC8C -/* 0231C 8097AC4C 00451021 */ addu $v0, $v0, $a1 -/* 02320 8097AC50 8C421DE4 */ lw $v0, 0x1DE4($v0) ## 00011DE4 -/* 02324 8097AC54 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02328 8097AC58 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0232C 8097AC5C 0041001B */ divu $zero, $v0, $at -/* 02330 8097AC60 00001810 */ mfhi $v1 -/* 02334 8097AC64 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02338 8097AC68 14610006 */ bne $v1, $at, .L8097AC84 -/* 0233C 8097AC6C 3C058098 */ lui $a1, %hi(D_8097BEA0) ## $a1 = 80980000 -/* 02340 8097AC70 24A5BEA0 */ addiu $a1, $a1, %lo(D_8097BEA0) ## $a1 = 8097BEA0 -/* 02344 8097AC74 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 -/* 02348 8097AC78 0C25E2BF */ jal func_80978AFC -/* 0234C 8097AC7C AFA70018 */ sw $a3, 0x0018($sp) -/* 02350 8097AC80 8FA70018 */ lw $a3, 0x0018($sp) -.L8097AC84: -/* 02354 8097AC84 0C25E7E7 */ jal func_80979F9C -/* 02358 8097AC88 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L8097AC8C: -/* 0235C 8097AC8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02360 8097AC90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02364 8097AC94 03E00008 */ jr $ra -/* 02368 8097AC98 00000000 */ nop diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 3011031c14..ce482a2188 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -324,6 +324,7 @@ void func_80978AC4(DemoGj* this, GlobalContext* globalCtx) { } void func_80978AFC(GlobalContext *globalCtx, Vec3f *pos, f32 arg2) { + f32 temp = arg2 * 0.2f; if (1) func_800283D4( globalCtx, @@ -332,7 +333,7 @@ void func_80978AFC(GlobalContext *globalCtx, Vec3f *pos, f32 arg2) { &D_8097BE70, &D_8097BE7C, &D_8097BE80, - Rand_ZeroOne() * (arg2 * 0.2f) + arg2, + temp * Rand_ZeroOne() + arg2, 0xF, 0x5A ); @@ -809,24 +810,21 @@ void func_8097A000(DemoGj *this, GlobalContext *globalCtx) { func_8097923C(this, globalCtx); } -void func_8097A07C(DemoGj* this, GlobalContext* globalCtx); -#ifdef NON_MATCHING void func_8097A07C(DemoGj *this, GlobalContext *globalCtx) { u32 gameplayFrames; if (this->unk_17C == 0) { - gameplayFrames = globalCtx->gameplayFrames; + gameplayFrames = globalCtx->gameplayFrames % 3; - if ((gameplayFrames % 3) == 0) { + if (1) { } + if (gameplayFrames == 0) { + if (!globalCtx->gameplayFrames) { } func_80978AFC(globalCtx, &D_8097BE88, 300.0f); } func_80979F9C(this); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A07C.s") -#endif void func_8097A0E4(DemoGj *this, GlobalContext *globalCtx) { if (func_80979818(this, globalCtx) != 0) { @@ -874,24 +872,21 @@ void func_8097A238(DemoGj *this, GlobalContext *globalCtx) { func_8097923C(this, globalCtx); } -void func_8097A2B4(DemoGj *this, GlobalContext* globalCtx); -#ifdef NON_MATCHING void func_8097A2B4(DemoGj *this, GlobalContext *globalCtx) { u32 gameplayFrames; if (this->unk_17C == 0) { - gameplayFrames = globalCtx->gameplayFrames; - - if ((gameplayFrames % 3) == 1) { + gameplayFrames = globalCtx->gameplayFrames % 3; + + if (1) { } + if ((gameplayFrames ) == 1) { + if (!globalCtx->gameplayFrames) { } func_80978AFC(globalCtx, &D_8097BE94, 300.0f); } func_80979F9C(this); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s") -#endif void func_8097A320(DemoGj* this, GlobalContext* globalCtx) { if (func_80979818(this, globalCtx) != 0) { @@ -1123,24 +1118,21 @@ void func_8097ABB4(DemoGj *this, GlobalContext *globalCtx) { func_8097923C(this, globalCtx); } -void func_8097AC30(DemoGj *this, GlobalContext *globalCtx); -#ifdef NON_MATCHING void func_8097AC30(DemoGj *this, GlobalContext *globalCtx) { u32 gameplayFrames; if (this->unk_17C == 0) { - gameplayFrames = globalCtx->gameplayFrames; + gameplayFrames = globalCtx->gameplayFrames % 3; - if ((gameplayFrames % 3) == 2) { + if (1) { } + if (gameplayFrames == 2) { + if (!globalCtx->gameplayFrames) { } func_80978AFC(globalCtx, &D_8097BEA0, 300.0f); } func_80979F9C(this); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s") -#endif void func_8097AC9C(DemoGj *this, GlobalContext *globalCtx) { if (func_80979818(this, globalCtx) != 0) {