summaryrefslogtreecommitdiff
path: root/src/code_80057C60.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code_80057C60.c')
-rw-r--r--src/code_80057C60.c320
1 files changed, 64 insertions, 256 deletions
diff --git a/src/code_80057C60.c b/src/code_80057C60.c
index a930afaec..a37282983 100644
--- a/src/code_80057C60.c
+++ b/src/code_80057C60.c
@@ -18,6 +18,7 @@
#include "code_80071F00.h"
#include "code_80086E70.h"
#include "code_8008C1D0.h"
+#include "src/data/data_800E8700.h"
#include "skybox_and_splitscreen.h"
#include "common_textures.h"
#include "audio/external.h"
@@ -4782,218 +4783,60 @@ void func_80065AB0(Player *player, s8 arg1, s16 arg2, s8 arg3) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065AB0.s")
#endif
-#ifdef MIPS_TO_C
-//generated by m2c commit 08138748803d75e73e4a94bb0c619a273754ee9c on Oct-09-2023
-extern ? D_05FF8DB8;
-extern ? D_800E47DC;
-extern ? D_800E480C;
-extern ? D_800E8C00;
-
-void func_80065F0C(Player *player, s32 arg1, s16 arg2, s8 arg3) {
- f32 spE4;
- f32 spE0;
- f32 spDC;
- s16 spD8;
- s16 spD6;
- s16 spD4;
- s16 spCC;
- s16 spCA;
- s16 spC8;
- s16 spC6;
- void *sp44;
- Gfx *temp_s0;
- Gfx *temp_s0_10;
- Gfx *temp_s0_11;
- Gfx *temp_s0_12;
- Gfx *temp_s0_13;
- Gfx *temp_s0_14;
- Gfx *temp_s0_15;
- Gfx *temp_s0_16;
- Gfx *temp_s0_17;
- Gfx *temp_s0_18;
- Gfx *temp_s0_19;
- Gfx *temp_s0_20;
- Gfx *temp_s0_21;
- Gfx *temp_s0_22;
- Gfx *temp_s0_23;
- Gfx *temp_s0_24;
- Gfx *temp_s0_25;
- Gfx *temp_s0_26;
- Gfx *temp_s0_27;
- Gfx *temp_s0_28;
- Gfx *temp_s0_29;
- Gfx *temp_s0_2;
- Gfx *temp_s0_30;
- Gfx *temp_s0_31;
- Gfx *temp_s0_3;
- Gfx *temp_s0_4;
- Gfx *temp_s0_5;
- Gfx *temp_s0_6;
- Gfx *temp_s0_7;
- Gfx *temp_s0_8;
- Gfx *temp_s0_9;
- s16 temp_a0;
- s16 temp_ra;
- s16 temp_s2;
- s16 temp_s3;
- s32 temp_a2;
- s32 temp_t6;
- s32 temp_v1;
- void *temp_v0;
-
- temp_v0 = player + (arg2 * 0x48);
- if ((temp_v0->unk544 == 1) && (temp_v0->unk546 != 0)) {
- spDC = temp_v0->unk528;
- spE0 = temp_v0->unk52C;
- spD4 = 0;
- spE4 = temp_v0->unk530;
- spD8 = 0;
- spD6 = player->unk_048[arg3];
- sp44 = temp_v0;
- func_800652D4(&spDC, &spD4, temp_v0->unk534 * player->size);
- if ((s32) sp44->unk53C != 8) {
- temp_a0 = sp44->unk562;
- temp_t6 = sp44->unk560 * 4;
- temp_v1 = *(&D_800E47DC + temp_t6);
- temp_ra = ((temp_v1 >> 0x10) & 0xFF) - temp_a0;
- temp_a2 = *(&D_800E480C + temp_t6);
- temp_s2 = ((temp_v1 >> 8) & 0xFF) - temp_a0;
- temp_s3 = (temp_v1 & 0xFF) - temp_a0;
- spCA = ((temp_a2 >> 0x10) & 0xFF) - temp_a0;
- spC8 = ((temp_a2 >> 8) & 0xFF) - temp_a0;
- spC6 = (temp_a2 & 0xFF) - temp_a0;
- spCC = sp44->unk566;
- if (sp44->unk568 == 0) {
- temp_s0 = gDisplayListHead;
- gDisplayListHead = temp_s0 + 8;
- temp_s0->words.w1 = (u32) D_0D008DB8;
- temp_s0->words.w0 = 0x06000000;
- temp_s0_2 = gDisplayListHead;
- gDisplayListHead = temp_s0_2 + 8;
- temp_s0_2->words.w0 = 0xFD900000;
- temp_s0_2->words.w1 = (u32) D_8018D494;
- temp_s0_3 = gDisplayListHead;
- gDisplayListHead = temp_s0_3 + 8;
- temp_s0_3->words.w1 = 0x07000000;
- temp_s0_3->words.w0 = 0xF5900000;
- temp_s0_4 = gDisplayListHead;
- gDisplayListHead = temp_s0_4 + 8;
- temp_s0_4->words.w1 = 0;
- temp_s0_4->words.w0 = 0xE6000000;
- temp_s0_5 = gDisplayListHead;
- gDisplayListHead = temp_s0_5 + 8;
- temp_s0_5->words.w1 = 0x071FF200;
- temp_s0_5->words.w0 = 0xF3000000;
- temp_s0_6 = gDisplayListHead;
- gDisplayListHead = temp_s0_6 + 8;
- temp_s0_6->words.w1 = 0;
- temp_s0_6->words.w0 = 0xE7000000;
- temp_s0_7 = gDisplayListHead;
- gDisplayListHead = temp_s0_7 + 8;
- temp_s0_7->words.w1 = 0;
- temp_s0_7->words.w0 = 0xF5880800;
- temp_s0_8 = gDisplayListHead;
- gDisplayListHead = temp_s0_8 + 8;
- temp_s0_8->words.w1 = 0x0007C07C;
- temp_s0_8->words.w0 = 0xF2000000;
- func_8004B72C((s32) temp_ra, (s32) temp_s2, (s32) temp_s3, (s32) spCA, (s32) spC8, (s32) spC6, (s32) spCC);
- temp_s0_9 = gDisplayListHead;
- gDisplayListHead = temp_s0_9 + 8;
- temp_s0_9->words.w0 = (u32) &D_05FF8DB8;
- temp_s0_9->words.w1 = (u32) D_0D008E48;
+#ifdef NON_MATCHING
+//https://decomp.me/scratch/KEz08
+// Something is very wrong with the handling of prim/evn colors, but I can't figuer out what.
+void func_80065F0C(Player *player, s8 arg1, s16 arg2, s8 arg3) {
+ Vec3f spDC;
+ Vec3s spD4;
+ s16 primRed;
+ s16 primGreen;
+ s16 primBlue;
+ s16 primAlpha;
+ u8 envRed;
+ s16 envGreen;
+ s16 envBlue;
+
+ if ((player->unk_258[10 + arg2].unk_01C == 1) && (player->unk_258[10 + arg2].unk_01E != 0)) {
+ spDC[0] = player->unk_258[10 + arg2].unk_000[0];
+ spDC[1] = player->unk_258[10 + arg2].unk_000[1];
+ spDC[2] = player->unk_258[10 + arg2].unk_000[2];
+ spD4[0] = 0;
+ spD4[1] = player->unk_048[arg3];
+ spD4[2] = 0;
+ func_800652D4(&spDC, &spD4, player->unk_258[10 + arg2].unk_00C * player->size);
+ if ((s32)player->unk_258[10 + arg2].unk_014 != 8) {
+ primRed = ((D_800E47DC[player->unk_258[10 + arg2].unk_038] >> 0x10) & 0xFF) - player->unk_258[10 + arg2].unk_03A;
+ primGreen = ((D_800E47DC[player->unk_258[10 + arg2].unk_038] >> 0x08) & 0xFF) - player->unk_258[10 + arg2].unk_03A;
+ primBlue = ((D_800E47DC[player->unk_258[10 + arg2].unk_038] >> 0x00) & 0xFF) - player->unk_258[10 + arg2].unk_03A;
+ envRed = ((D_800E480C[player->unk_258[10 + arg2].unk_038] >> 0x10) & 0xFF) - player->unk_258[10 + arg2].unk_03A;
+ envGreen = ((D_800E480C[player->unk_258[10 + arg2].unk_038] >> 0x08) & 0xFF) - player->unk_258[10 + arg2].unk_03A;
+ envBlue = ((D_800E480C[player->unk_258[10 + arg2].unk_038] >> 0x00) & 0xFF) - player->unk_258[10 + arg2].unk_03A;
+ primAlpha = player->unk_258[10 + arg2].unk_03E;
+ if (player->unk_258[10 + arg2].unk_040 == 0) {
+ gSPDisplayList(gDisplayListHead++, D_0D008DB8);
+ gDPLoadTextureBlock(gDisplayListHead++, D_8018D494, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+ func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha);
+ gSPDisplayList(gDisplayListHead++, D_0D008E48);
} else {
- temp_s0_10 = gDisplayListHead;
- gDisplayListHead = temp_s0_10 + 8;
- temp_s0_10->words.w1 = 0x0D010000;
- temp_s0_10->words.w0 = 0x06000000;
- temp_s0_11 = gDisplayListHead;
- gDisplayListHead = temp_s0_11 + 8;
- temp_s0_11->words.w0 = 0xFD900000;
- temp_s0_11->words.w1 = (u32) D_8018D494;
- temp_s0_12 = gDisplayListHead;
- gDisplayListHead = temp_s0_12 + 8;
- temp_s0_12->words.w1 = 0x07000000;
- temp_s0_12->words.w0 = 0xF5900000;
- temp_s0_13 = gDisplayListHead;
- gDisplayListHead = temp_s0_13 + 8;
- temp_s0_13->words.w1 = 0;
- temp_s0_13->words.w0 = 0xE6000000;
- temp_s0_14 = gDisplayListHead;
- gDisplayListHead = temp_s0_14 + 8;
- temp_s0_14->words.w1 = 0x071FF200;
- temp_s0_14->words.w0 = 0xF3000000;
- temp_s0_15 = gDisplayListHead;
- gDisplayListHead = temp_s0_15 + 8;
- temp_s0_15->words.w1 = 0;
- temp_s0_15->words.w0 = 0xE7000000;
- temp_s0_16 = gDisplayListHead;
- gDisplayListHead = temp_s0_16 + 8;
- temp_s0_16->words.w1 = 0;
- temp_s0_16->words.w0 = 0xF5880800;
- temp_s0_17 = gDisplayListHead;
- gDisplayListHead = temp_s0_17 + 8;
- temp_s0_17->words.w1 = 0x0007C07C;
- temp_s0_17->words.w0 = 0xF2000000;
- func_8004B72C((s32) temp_ra, (s32) temp_s2, (s32) temp_s3, (s32) spCA, (s32) spC8, (s32) spC6, (s32) spCC);
- temp_s0_18 = gDisplayListHead;
- gDisplayListHead = temp_s0_18 + 8;
- temp_s0_18->words.w1 = 3;
- temp_s0_18->words.w0 = 0xB9000002;
- temp_s0_19 = gDisplayListHead;
- gDisplayListHead = temp_s0_19 + 8;
- temp_s0_19->words.w0 = 0x06000000;
- temp_s0_19->words.w1 = (u32) D_0D008E48;
+ gSPDisplayList(gDisplayListHead++, D_0D008DB8);
+ gDPLoadTextureBlock(gDisplayListHead++, D_8018D494, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+ func_8004B72C(primRed, primGreen, primBlue, envRed, envGreen, envBlue, primAlpha);
+ gDPSetAlphaCompare(gDisplayListHead++, G_AC_DITHER);
+ gSPDisplayList(gDisplayListHead++, D_0D008E48);
}
} else {
- temp_s0_20 = gDisplayListHead;
- gDisplayListHead = temp_s0_20 + 8;
- temp_s0_20->words.w1 = (u32) D_0D008C90;
- temp_s0_20->words.w0 = 0x06000000;
- temp_s0_21 = gDisplayListHead;
- gDisplayListHead = temp_s0_21 + 8;
- temp_s0_21->words.w1 = 0;
- temp_s0_21->words.w0 = 0xBA000E02;
- temp_s0_22 = gDisplayListHead;
- gDisplayListHead = temp_s0_22 + 8;
- temp_s0_22->words.w0 = 0xFD100000;
- temp_s0_22->words.w1 = (u32) D_8018D498;
- temp_s0_23 = gDisplayListHead;
- gDisplayListHead = temp_s0_23 + 8;
- temp_s0_23->words.w1 = 0x07080200;
- temp_s0_23->words.w0 = 0xF5100000;
- temp_s0_24 = gDisplayListHead;
- gDisplayListHead = temp_s0_24 + 8;
- temp_s0_24->words.w1 = 0;
- temp_s0_24->words.w0 = 0xE6000000;
- temp_s0_25 = gDisplayListHead;
- gDisplayListHead = temp_s0_25 + 8;
- temp_s0_25->words.w1 = 0x077FF100;
- temp_s0_25->words.w0 = 0xF3000000;
- temp_s0_26 = gDisplayListHead;
- gDisplayListHead = temp_s0_26 + 8;
- temp_s0_26->words.w1 = 0;
- temp_s0_26->words.w0 = 0xE7000000;
- temp_s0_27 = gDisplayListHead;
- gDisplayListHead = temp_s0_27 + 8;
- temp_s0_27->words.w0 = 0xF5101000;
- temp_s0_27->words.w1 = 0x00080200;
- temp_s0_28 = gDisplayListHead;
- gDisplayListHead = temp_s0_28 + 8;
- temp_s0_28->words.w0 = 0xF2000000;
- temp_s0_28->words.w1 = 0x0007C0FC;
- func_8004B35C((s32) sp44->unk560, (s32) sp44->unk562, (s32) sp44->unk564, 0x000000FF);
- temp_s0_29 = gDisplayListHead;
- gDisplayListHead = temp_s0_29 + 8;
- temp_s0_29->words.w0 = 0xB900031D;
- temp_s0_29->words.w1 = 0x00553078;
- temp_s0_30 = gDisplayListHead;
- gDisplayListHead = temp_s0_30 + 8;
- temp_s0_30->words.w1 = (u32) &D_800E8C00;
- temp_s0_30->words.w0 = 0x0400103F;
- temp_s0_31 = gDisplayListHead;
- gDisplayListHead = temp_s0_31 + 8;
- temp_s0_31->words.w0 = 0x06000000;
- temp_s0_31->words.w1 = (u32) D_0D008DA0;
+ primRed = player->unk_258[10 + arg2].unk_038;
+ primGreen = player->unk_258[10 + arg2].unk_03A;
+ primBlue = player->unk_258[10 + arg2].unk_03C;
+ gSPDisplayList(gDisplayListHead++, D_0D008C90);
+ gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
+ gDPLoadTextureBlock(gDisplayListHead++, D_8018D498, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
+ func_8004B35C(primRed, primGreen, primBlue, 0x000000FF);
+ gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2);
+ gSPVertex(gDisplayListHead++, D_800E8C00, 4, 0);
+ gSPDisplayList(gDisplayListHead++, D_0D008DA0);
+
}
gMatrixEffectCount += 1;
}
@@ -5173,8 +5016,6 @@ void func_80067280(Player *player, s8 arg1, s16 arg2, s8 arg3) {
}
}
-#ifdef NON_MATCHING
-
void func_80067604(Player *player, s8 arg1, s16 arg2, s8 arg3) {
Vec3f sp8C;
Vec3s sp84;
@@ -5192,15 +5033,9 @@ void func_80067604(Player *player, s8 arg1, s16 arg2, s8 arg3) {
gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B72C(0x000000FF, 0x000000FF, 0x000000DF, 0x000000FF, 0x0000005F, 0, 0x00000060);
- // temp_v0_10 = gDisplayListHead;
- // gDisplayListHead = temp_v0_10 + 8;
- // temp_v0_10->words.w0 = (u32) &D_05FF8DB8;
- // temp_v0_10->words.w1 = (u32) D_0D008E70;
- // I have no idea what's going on here.
- // D_05FF8DB8 is clearly a fake variable, but there's not Gfx command
- // that matches w0 = 05FF8DB8, w1 = 0D008E70
+ gSPDisplayList(gDisplayListHead++, D_0D008E70);
} else {
- gSPDisplayList(gDisplayListHead++, 0x0D010000);
+ gSPDisplayList(gDisplayListHead++, D_0D008DB8);
gDPLoadTextureBlock(gDisplayListHead++, D_0D02AC58, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
func_8004B72C(0x000000FF, 0x000000FF, 0x000000DF, 0x000000FF, 0x0000005F, 0, 0x00000060);
gSPDisplayList(gDisplayListHead++, D_0D008E48);
@@ -5208,9 +5043,6 @@ void func_80067604(Player *player, s8 arg1, s16 arg2, s8 arg3) {
gMatrixEffectCount += 1;
}
}
-#else
-GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067604.s")
-#endif
// data/data_code_80071F00_2.s
extern u8 D_800E52D0[];
@@ -5625,7 +5457,7 @@ void func_8006A280(Player *player, s8 arg1, s16 arg2, s8 arg3) {
}
#ifdef MIPS_TO_C
-//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
+//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-14-2023
extern ? D_8018D4D0;
extern ? D_8018D530;
extern ? D_8018D590;
@@ -5640,7 +5472,6 @@ extern ? D_8018D800;
extern ? D_8018D830;
extern ? D_8018D860;
extern ? D_8018D890;
-extern ? gPlayerBalloonStatus;
void func_8006A50C(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg5) {
f32 sp44;
@@ -5654,7 +5485,7 @@ void func_8006A50C(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4, s16 arg
u16 *temp_t0;
temp_v0 = arg4 * 2;
- temp_t0 = (arg3 * 6) + temp_v0 + &gPlayerBalloonStatus;
+ temp_t0 = (arg3 * 6) + temp_v0 + gPlayerBalloonStatus;
*temp_t0 = 0;
temp_v1 = arg4 * 4;
*(&D_8018D650 + ((arg3 * 0xC) + temp_v1)) = 0.1f;
@@ -5682,7 +5513,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A50C.s")
#endif
#ifdef MIPS_TO_C
-//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
+//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-14-2023
extern ? D_8018D4D0;
extern ? D_8018D530;
extern ? D_8018D590;
@@ -5698,7 +5529,6 @@ extern ? D_8018D830;
extern ? D_8018D860;
extern ? D_8018D890;
extern ? D_8018D8D0;
-extern ? gPlayerBalloonStatus;
static ? D_800E4914; /* unable to generate initializer */
void func_8006A7C0(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) {
@@ -5726,7 +5556,6 @@ void func_8006A7C0(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) {
f32 var_f12;
f64 var_f0;
f64 var_f0_2;
- s16 *temp_a0;
s16 *temp_a2;
s16 *temp_v0;
s16 *var_a1;
@@ -5747,7 +5576,7 @@ void func_8006A7C0(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) {
sp80.unk1C = (s32) D_800E4914.unk1C;
var_f12 = player->unk_094;
var_t0 = arg4 * 2;
- temp_t7 = (arg3 * 6) + var_t0 + &gPlayerBalloonStatus;
+ temp_t7 = (arg3 * 6) + var_t0 + gPlayerBalloonStatus;
sp58 = temp_t7;
temp_t1 = arg4 * 4;
sp6C = (-(var_f12 / 18.0f) * 216.0f) / 10.0f;
@@ -5856,10 +5685,8 @@ void func_8006A7C0(Player *player, f32 arg1, f32 arg2, s8 arg3, s8 arg4) {
temp_v1_3 = (arg3 * 6) + sp5C + &D_8018D8D0;
*temp_v0_2 = (f32) ((f64) *temp_v0_2 + 0.2);
*temp_v1_3 = (s16) (*temp_v1_3 + 1);
- temp_a0 = (arg3 * 6) + sp5C + &D_8018D890;
sp60 = temp_v1_3;
- sp5C = sp5C;
- move_s16_towards(temp_a0, 0, 0.1f);
+ move_s16_towards((arg3 * 6) + sp5C + &D_8018D890, 0, 0.1f);
move_s16_towards((arg3 * 6) + sp5C + &D_8018D860, 0, 0.1f);
if (*temp_v1_3 >= 0x78) {
func_8006B974((s32) player, arg3, arg4);
@@ -5870,20 +5697,18 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A7C0.s")
#endif
#ifdef MIPS_TO_C
-//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b
-extern u32 D_8018D4BC;
-extern s32 D_8018D4C0;
+//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-14-2023
extern ? D_8018D4D0;
extern ? D_8018D530;
extern ? D_8018D590;
extern ? D_8018D7D0;
extern ? D_8018D860;
extern ? D_8018D890;
+static ? gBalloonVertexPlane1; /* unable to generate initializer */
+static ? gBalloonVertexPlane2; /* unable to generate initializer */
+static ? D_800E52D0; /* unable to generate initializer */
static ? D_800E4934; /* unable to generate initializer */
static ? D_800E4954; /* unable to generate initializer */
-static ? gBalloonVertexPlane1; /* unable to generate initializer */
-static ? gBalloonVertexPlane2; /* unable to generate initializer */
-static ? D_800E52D0; /* unable to generate initializer */
void func_8006AFD0(Player *player, s16 arg1, s8 arg2, s8 arg3) {
f32 sp13C;
@@ -5982,7 +5807,7 @@ void func_8006AFD0(Player *player, s16 arg1, s8 arg2, s8 arg3) {
temp_v0_2 = &cameras[arg3];
temp_f20 = player->pos[0] - temp_v0_2->pos[0];
temp_f0 = player->pos[2] - temp_v0_2->pos[2];
- if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
+ if (gActiveScreenMode != 3) {
sp11C = temp_t1;
var_f20 = sqrtf((temp_f20 * temp_f20) + (temp_f0 * temp_f0)) / 300.0f;
} else {
@@ -6037,8 +5862,6 @@ void func_8006AFD0(Player *player, s16 arg1, s8 arg2, s8 arg3) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006AFD0.s")
#endif
-extern void func_8006A50C(Player*, f32, f32, s8, s8, s16);
-
void func_8006B7E4(Player* player, s8 arg1) {
func_8006A50C(player, 0.0f, 0.0f, arg1, (s8) 0, (s16) 0);
func_8006A50C(player, 1.5f, 2.0f, arg1, (s8) 1, (s16) 0x1C70);
@@ -6547,21 +6370,6 @@ void func_8006D194(Player *player, s8 arg1, s8 arg2) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006D194.s")
#endif
-void func_8006538C(Player *, s8, s16, s8); /* extern */
-void func_80065AB0(Player *, s8, s16, s8); /* extern */
-void func_80065F0C(Player *, s8, s16, s8); /* extern */
-void func_800664E0(Player *, s8, s16, s8); /* extern */
-void func_80066BAC(Player *, s8, s16, s8); /* extern */
-void func_80067280(Player *, s8, s16, s8); /* extern */
-void func_80067604(Player *, s8, s16, s8); /* extern */
-void func_800691B8(Player *, s8, s16, s8); /* extern */
-void func_80069444(Player *, s8, s16, s8); /* extern */
-void func_800696CC(Player *, s8, s16, s8, f32); /* extern */
-void func_80069938(Player *, s8, s16, s8); /* extern */
-void func_80069BA8(Player *, s8, s16, s8); /* extern */
-void func_80069DB8(Player *, s8, s16, s8); /* extern */
-void func_8006A01C(Player *, s8, s16, s8); /* extern */
-
void func_8006D474(Player *player, s8 arg1, s8 arg2) {
s16 var_s2;
if ((player->unk_002 & (8 << (arg2 * 4))) == (8 << (arg2 * 4))) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 04:45:21 +0000