Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-23 04:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove static for file globals because they don't show up in the mapfile

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-08-27 16:05:47 -03:00
parent bda6712db3
commit 643757c308
20 changed files with 361 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/audio/audio_context.c
View File

@ -104,39 +104,39 @@ volatile u32 gAudioResetTimer;
u64 gAudioContextEnd[2];
static ReverbSettings D_800C74D0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x4000, 0xD000, 0x3000 } };
static ReverbSettings D_800C74E0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x38, 0x6400, 0x1000, 0x1000 } };
static ReverbSettings D_800C74F0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x4000, 0, 0 } };
static ReverbSettings D_800C7500[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x5000, 0, 0 } };
static ReverbSettings D_800C7510[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x6000, 0, 0 } };
static ReverbSettings D_800C7520[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7530[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x5800, 0, 0 } };
static ReverbSettings D_800C7540[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x5000, 0, 0 } };
static ReverbSettings D_800C7550[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7560[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x6000, 0, 0 } };
static ReverbSettings D_800C7570[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7580[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x4000, 0, 0 } };
static ReverbSettings D_800C7590[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 2, 0x28, 0x5800, 0, 0 } };
static ReverbSettings D_800C75A0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C75B0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x38, 0x5000, 0, 0 } };
static ReverbSettings D_800C75C0[3] = {
ReverbSettings D_800C74D0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x4000, 0xD000, 0x3000 } };
ReverbSettings D_800C74E0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x38, 0x6400, 0x1000, 0x1000 } };
ReverbSettings D_800C74F0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x4000, 0, 0 } };
ReverbSettings D_800C7500[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x5000, 0, 0 } };
ReverbSettings D_800C7510[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x6000, 0, 0 } };
ReverbSettings D_800C7520[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7530[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x5800, 0, 0 } };
ReverbSettings D_800C7540[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x5000, 0, 0 } };
ReverbSettings D_800C7550[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7560[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x6000, 0, 0 } };
ReverbSettings D_800C7570[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7580[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x40, 0x4000, 0, 0 } };
ReverbSettings D_800C7590[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 2, 0x28, 0x5800, 0, 0 } };
ReverbSettings D_800C75A0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C75B0[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x38, 0x5000, 0, 0 } };
ReverbSettings D_800C75C0[3] = {
{ 1, 0x30, 0x3000, 0, 0 },
{ 1, 0x38, 0x3000, 0, 0 },
{ 2, 0x48, 0x6000, 0xC000, 0x4000 },
};
static ReverbSettings D_800C75D8[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C75E8[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C75F8[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7608[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7618[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7628[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7638[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x6800, 0, 0 } };
static ReverbSettings D_800C7648[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x18, 0x3000, 0, 0 } };
static ReverbSettings D_800C7658[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 2, 0x18, 0x3000, 0, 0 } };
static ReverbSettings D_800C7668[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x18, 0x3000, 0, 0 } };
static ReverbSettings D_800C7678[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C7688[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
static ReverbSettings D_800C76A8[] = {
ReverbSettings D_800C75D8[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C75E8[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C75F8[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7608[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7618[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7628[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7638[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x6800, 0, 0 } };
ReverbSettings D_800C7648[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x18, 0x3000, 0, 0 } };
ReverbSettings D_800C7658[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 2, 0x18, 0x3000, 0, 0 } };
ReverbSettings D_800C7668[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x18, 0x3000, 0, 0 } };
ReverbSettings D_800C7678[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C7688[2] = { { 1, 0x30, 0x3000, 0, 0 }, { 1, 0x30, 0x3000, 0, 0 } };
ReverbSettings D_800C76A8[] = {
// unused?
{ 1, 0x40, 0x4FFF, 0, 0 },
{ 1, 0x30, 0x4FFF, 0, 0 },

16
src/engine/fox_360.c
View File

@ -364,15 +364,15 @@ void ActorAllRange_SetShadowData(Actor* this) {
}
}
static Vec3f sTeamSpawnPos[4] = {
Vec3f sTeamSpawnPos[4] = {
{ 0.0f, 20000.0f, 0.0f },
{ 0.0f, 700.0f, 6500.0f },
{ -300.0f, 800.0f, 6800.0f },
{ 300.0f, 900.0f, 7200.0f },
};
static AllRangeAi sTeamAi[4] = { AI360_FOX, AI360_FALCO, AI360_SLIPPY, AI360_PEPPY };
static s32 sTeamSpawnTargets[4] = { -1, AI360_ENEMY, AI360_ENEMY + 1, AI360_ENEMY + 2 };
static s32 sTeamSpawnTargetsKA[4] = { -1, AI360_ENEMY + 11, AI360_ENEMY + 13, AI360_ENEMY + 15 };
AllRangeAi sTeamAi[4] = { AI360_FOX, AI360_FALCO, AI360_SLIPPY, AI360_PEPPY };
s32 sTeamSpawnTargets[4] = { -1, AI360_ENEMY, AI360_ENEMY + 1, AI360_ENEMY + 2 };
s32 sTeamSpawnTargetsKA[4] = { -1, AI360_ENEMY + 11, AI360_ENEMY + 13, AI360_ENEMY + 15 };
void ActorAllRange_SpawnTeam(void) {
ActorAllRange* actor;
@ -430,14 +430,14 @@ void ActorAllRange_SpawnTeam(void) {
}
}
static Vec3f sStarWolfSpawnPos[4] = {
Vec3f sStarWolfSpawnPos[4] = {
{ 9500.0f, 5000.0f, 9500.0f },
{ 10000.0f, 5000.0f, 10000.0f },
{ 10000.0f, 5000.0f, 9500.0f },
{ 9500.0f, 5000.0f, 10000.0f },
};
static s32 sStarWolfSpawnTargets[4] = { AI360_FOX, AI360_FALCO, AI360_PEPPY, AI360_SLIPPY };
static f32 sStarWolfVE2SpawnRot[4] = { 330.0f, 90.0f, 280.0f, 70.0f };
s32 sStarWolfSpawnTargets[4] = { AI360_FOX, AI360_FALCO, AI360_PEPPY, AI360_SLIPPY };
f32 sStarWolfVE2SpawnRot[4] = { 330.0f, 90.0f, 280.0f, 70.0f };
s32 gAllRangeSpawnEvent = 96 * 30;
void ActorAllRange_SpawnStarWolf(void) {
@ -1275,7 +1275,7 @@ bool func_360_80031900(ActorAllRange* this) {
}
}
static Vec3f sSectorZRetreatPath[6] = {
Vec3f sSectorZRetreatPath[6] = {
{ 8000.0f, 500.0f, 0.0f }, { 5000.0f, 400.0f, 0.0f }, { 2000.0f, 300.0f, 0.0f },
{ -500.0f, 250.0f, 0.0f }, { 0.0f, 250.0f, 0.0f }, { 0.0f, 250.0f, 0.0f },
};

13
src/engine/fox_beam.c
View File

@ -4,7 +4,7 @@
#include "assets/ast_great_fox.h"
#include "assets/ast_versus.h"
static Vec3f sShotViewPos;
Vec3f sShotViewPos;
void PlayerShot_SetupEffect351(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
Effect_Initialize(effect);
@ -1222,10 +1222,10 @@ void PlayerShot_DrawLaser(PlayerShot* shot) {
}
}
static f32 D_800C9BD8[10] = { 100.0f, 100.0f, 0.0f, 0.0f, 0.0f, 50.0f, 0.0f, 40.0f, 30.0f, 100.0f };
static u8 D_800C9C00[4] = { 255, 255, 32, 32 };
static u8 D_800C9C04[4] = { 255, 32, 255, 32 };
static u8 D_800C9C08[4] = { 32, 32, 32, 255 };
f32 D_800C9BD8[10] = { 100.0f, 100.0f, 0.0f, 0.0f, 0.0f, 50.0f, 0.0f, 40.0f, 30.0f, 100.0f };
u8 D_800C9C00[4] = { 255, 255, 32, 32 };
u8 D_800C9C04[4] = { 255, 32, 255, 32 };
u8 D_800C9C08[4] = { 32, 32, 32, 255 };
void PlayerShot_DrawShot(PlayerShot* shot) {
Vec3f sp11C = { 0.0f, 0.0f, 0.0f };
s32 pad[4];
@ -2083,7 +2083,8 @@ void PlayerShot_UpdateBomb(PlayerShot* shot) {
}
}
static Vec3f sLockOnPos = { 0.0f, 0.0f, 0.0f };
Vec3f sLockOnPos = { 0.0f, 0.0f, 0.0f };
void PlayerShot_UpdateLockOnShot(PlayerShot* shot) {
s32 i;
s32 var_a3;

8
src/engine/fox_colheaders.c
View File

@ -12,23 +12,23 @@
#include "assets/ast_versus.h"
#include "assets/ast_zoness.h"
static Vec3f D_800D2920[16] = {
Vec3f D_800D2920[16] = {
{ 1075.0f, 0.0f, 0.0f }, { 746.0f, 0.0f, -746.0f }, { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
{ 291.0f, 558.0f, 0.0f }, { 0.0f, 354.0f, -291.0f }, { 202.0f, 594.0f, 202.0f }, { 772.0f, 0.0f, 622.0f },
{ 0.0f, 473.0f, 291.0f }, { 144.0f, 0.0f, 1075.0f }, { -202.0f, 461.0f, 202.0f }, { -515.0f, 0.0f, 746.0f },
{ -291.0f, 453.0f, 0.0f }, { -372.0f, 390.0f, -281.0f }, { -951.0f, 0.0f, 0.0f }, { -746.0f, 0.0f, -746.0f },
};
static Triangle D_800D29E0[22] = {
Triangle D_800D29E0[22] = {
{ 0, 1, 2 }, { 2, 1, 3 }, { 4, 2, 5 }, { 3, 5, 2 }, { 2, 4, 0 }, { 4, 6, 7 },
{ 7, 0, 4 }, { 6, 4, 5 }, { 7, 6, 8 }, { 8, 9, 7 }, { 8, 10, 11 }, { 10, 8, 6 },
{ 11, 9, 8 }, { 12, 10, 6 }, { 6, 13, 12 }, { 14, 12, 13 }, { 10, 12, 14 }, { 14, 11, 10 },
{ 5, 13, 6 }, { 5, 3, 15 }, { 15, 13, 5 }, { 13, 15, 14 },
};
static Triangle D_800D2A64[13] = {
Triangle D_800D2A64[13] = {
{ 0, 1, 2 }, { 2, 3, 4 }, { 2, 5, 0 }, { 4, 5, 2 }, { 4, 3, 6 }, { 4, 7, 5 }, { 8, 7, 4 },
{ 4, 6, 8 }, { 7, 8, 9 }, { 0, 7, 9 }, { 5, 7, 0 }, { 9, 10, 0 }, { 10, 1, 0 },
};
static Vec3f D_800D2AB4[11] = {
Vec3f D_800D2AB4[11] = {
{ -218.0f, 131.0f, 0.0f }, { -435.0f, 0.0f, 0.0f }, { -336.0f, 0.0f, 218.0f }, { 0.0f, 0.0f, 435.0f },
{ 0.0f, 160.0f, 218.0f }, { -168.0f, 131.0f, 109.0f }, { 336.0f, 0.0f, 218.0f }, { 0.0f, 174.0f, 0.0f },
{ 435.0f, 0.0f, -204.0f }, { 0.0f, 0.0f, -435.0f }, { -318.0f, 0.0f, -218.0f },

58
src/engine/fox_demo.c
View File

@ -71,13 +71,13 @@ void func_demo_80048AC0(TeamId teamId) {
}
}
static Vec3f D_demo_800C9F60[] = {
Vec3f D_demo_800C9F60[] = {
{ 2000.0f, 2000.0f, 2000.0f },
{ -2000.0f, 2000.0f, 2000.0f },
{ 0.0f, -3000.0f, 3000.0f },
{ 5000.0f, -3000.0f, -3000.0f },
};
static f32 D_demo_800C9F90[] = { 75.0f, -80.0f, 85.0f, 0.0f };
f32 D_demo_800C9F90[] = { 75.0f, -80.0f, 85.0f, 0.0f };
void func_demo_80048CC4(ActorCutscene* this, s32 index) {
Actor_Initialize(this);
@ -260,7 +260,7 @@ void Cutscene_WarpZoneComplete(Player* player) {
player->rockAngle = SIN_DEG(player->rockPhase);
}
static Vec3f D_demo_800C9FA0[] = {
Vec3f D_demo_800C9FA0[] = {
{ 200.0f, -10.0f, 200.0f },
{ -200.0f, 20.0f, 200.0f },
{ 0.0f, 50.0f, 400.0f },
@ -324,14 +324,14 @@ void func_demo_8004990C(Player* player) {
player->bankAngle = player->rot.z + player->zRotBank + player->zRotBarrelRoll;
}
static f32 D_demo_800C9FD0[] = { -1200.0f, 1200.0f, 0.0f, 0.0f };
static f32 D_demo_800C9FE0[] = { 0.0f, 0.0f, 600.0f, 2000.0f };
static f32 D_demo_800C9FF0[] = { -100.0f, 0.0f, 100.0f, 500.0f };
static f32 D_demo_800CA000[] = { -150.0f, 150.0f, 0.0f, 0.0f };
static f32 D_demo_800CA010[] = { 0.0f, 0.0f, 80.0f, 1000.0f };
static f32 D_demo_800CA020[] = { 45.0f, -45.0f, 10.0f, 0.0f };
static s32 D_demo_800CA030[] = { 0, 0, 0, 1 };
static s32 D_demo_800CA040[] = { 0, 0, 0, 0 };
f32 D_demo_800C9FD0[] = { -1200.0f, 1200.0f, 0.0f, 0.0f };
f32 D_demo_800C9FE0[] = { 0.0f, 0.0f, 600.0f, 2000.0f };
f32 D_demo_800C9FF0[] = { -100.0f, 0.0f, 100.0f, 500.0f };
f32 D_demo_800CA000[] = { -150.0f, 150.0f, 0.0f, 0.0f };
f32 D_demo_800CA010[] = { 0.0f, 0.0f, 80.0f, 1000.0f };
f32 D_demo_800CA020[] = { 45.0f, -45.0f, 10.0f, 0.0f };
s32 D_demo_800CA030[] = { 0, 0, 0, 1 };
s32 D_demo_800CA040[] = { 0, 0, 0, 0 };
void func_demo_80049968(ActorCutscene* this, s32 index) {
Actor_Initialize(this);
@ -662,10 +662,10 @@ void Cutscene_LevelStart(Player* player) {
}
}
static f32 D_demo_800CA050[] = { 210.0f, -210.0f, 0.0f };
static f32 D_demo_800CA05C[] = { -60.0f, -60.0f, -120.0f };
static f32 D_demo_800CA068[] = { -150.0f, -150.0f, -300.0f };
static f32 D_demo_800CA074[] = { 360.0f, -360.0f, 0.0f };
f32 D_demo_800CA050[] = { 210.0f, -210.0f, 0.0f };
f32 D_demo_800CA05C[] = { -60.0f, -60.0f, -120.0f };
f32 D_demo_800CA068[] = { -150.0f, -150.0f, -300.0f };
f32 D_demo_800CA074[] = { 360.0f, -360.0f, 0.0f };
void func_demo_8004A700(ActorCutscene* this, s32 index) {
Actor_Initialize(this);
@ -744,8 +744,8 @@ void func_demo_8004AA84(void) {
}
}
static f32 D_demo_800CA080[] = { -400.0f, 0.0f, 400.0f };
static f32 D_demo_800CA08C[] = { 0.0f, 200.0f, 0.0f };
f32 D_demo_800CA080[] = { -400.0f, 0.0f, 400.0f };
f32 D_demo_800CA08C[] = { 0.0f, 200.0f, 0.0f };
void Cutscene_AllRangeMode(Player* player) {
s32 pad;
@ -1877,9 +1877,9 @@ void Cutscene_PlayerDown(Player* player) {
}
}
static f32 D_demo_800CA098[] = { 1.0f, -0.9f, 0.7f };
static f32 D_demo_800CA0A4[] = { 150.0f, 100.0f, 200.0f };
static f32 D_demo_800CA0B0[] = { 200.0f, 300.0f, 500.0f };
f32 D_demo_800CA098[] = { 1.0f, -0.9f, 0.7f };
f32 D_demo_800CA0A4[] = { 150.0f, 100.0f, 200.0f };
f32 D_demo_800CA0B0[] = { 200.0f, 300.0f, 500.0f };
void func_demo_8004E4D4(ActorCutscene* this) {
Vec3f sp54;
@ -2440,36 +2440,36 @@ void ActorCutscene_Update(ActorCutscene* this) {
}
}
static Vec3f D_demo_800CA0BC[] = {
Vec3f D_demo_800CA0BC[] = {
{ -1373.0, 484.0, -374.0 },
{ 1373.0, 484.0, -374.0 },
{ -1373.0, -704.0, -374.0 },
{ 1373.0, -704.0, -374.0 },
};
static Vec3f D_demo_800CA0EC[] = {
Vec3f D_demo_800CA0EC[] = {
{ 0.0, 40.0, -2278.0 },
{ 295.0, -92.0, -1301.0 },
{ -295.0, -92.0, -1301.0 },
};
static Vec3f D_demo_800CA110[8] = {
Vec3f D_demo_800CA110[8] = {
{ 170.0f, -35.0f, -380.0f }, { -170.0f, -40.0f, -380.0f }, { 170.0f, -130.0f, -380.0f },
{ -170.0f, -140.0f, -380.0f }, { 140.0f, 40.0f, -250.0f }, { -150.0f, 40.0f, -250.0f },
{ 140.0f, 0.0f, -250.0f }, { -150.0f, 0.0f, -250.0f },
};
static f32 D_demo_800CA170[] = {
f32 D_demo_800CA170[] = {
0.15f, 0.45f, 0.75f, 1.3f, 0.75f, 0.45f, 0.15f, 0.0f,
};
static f32 D_demo_800CA190[] = { 5.0f, 5.2f };
static f32 D_demo_800CA198[] = {
f32 D_demo_800CA190[] = { 5.0f, 5.2f };
f32 D_demo_800CA198[] = {
0.5f, 1.5f, 2.5f, 1.5f, 0.5f, 0.2f, 0.2f,
};
static f32 D_demo_800CA1B4[] = {
f32 D_demo_800CA1B4[] = {
-30.0f, -60.0f, -90.0f, -120.0f, -150.0f, -180.0f, -200.0, -210.0,
};
static f32 D_demo_800CA1D4[] = {
f32 D_demo_800CA1D4[] = {
1.5f, 0.87f, 0.83f, 0.75f, 0.7f, 0.6f, 0.4f, 0.1f,
};
static Animation* D_demo_800CA1F4[] = {
Animation* D_demo_800CA1F4[] = {
&D_SY_60265B4, &D_SY_602B8DC, &D_SY_60034C4, &D_SY_602A2CC, &D_SY_602CEB4, &D_SY_602B778, &D_SY_601F3B8,
};

26
src/engine/fox_effect.c
View File

@ -65,14 +65,14 @@ void BonusText_Update(void) {
}
}
static Gfx* sLargeBonusDLs[4][2] = {
Gfx* sLargeBonusDLs[4][2] = {
{ D_1016410, D_1003130 },
{ D_10162A0, D_1003130 },
{ D_1016130, D_1003130 },
{ D_1015FC0, D_1003130 },
};
static Gfx* sSmallBonusDLs[10] = {
Gfx* sSmallBonusDLs[10] = {
D_1015810, D_1016410, D_10162A0, D_1016130, D_1015FC0, D_1015E50, D_10156A0, D_1015CE0, D_1015B70, D_1015320,
};
@ -303,7 +303,7 @@ void Effect_Effect385_Draw(Effect385* this) {
}
// Possibly the little sparks of electricity that come off the arwing and landmaster when low on health
static f32 D_800D1534[][10] = {
f32 D_800D1534[][10] = {
{ 38.45957f, -65.08043f, 8.068213f, 87.01006f, -86.956184f, -71.82677f, 37.854507f, 46.845963f, 23.723173f,
84.2551f },
{ -77.50479f, 86.4889f, -8.664565f, -74.90449f, -42.23121f, 49.20716f, -18.885563f, -47.375793f, -58.059227f,
@ -422,7 +422,7 @@ void Effect_Effect345_Draw(Effect345* this) {
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
}
static s32 D_800D173C[] = { 255, 255, 255, 0, 0, 0, 255, 0, 255, 0, 0, 0, 255, 255, 0, 0, 0, 255, 0, 0 };
s32 D_800D173C[] = { 255, 255, 255, 0, 0, 0, 255, 0, 255, 0, 0, 0, 255, 255, 0, 0, 0, 255, 0, 0 };
void Effect_Effect346_Draw(Effect346* this) {
s32 temp_ft3;
@ -1049,7 +1049,7 @@ void Effect_Effect359_Update(Effect359* this) {
this->unk_4A++;
}
static Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TI_6003760 };
Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TI_6003760 };
void Effect_Effect359_Draw(Effect359* this) {
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
@ -2043,7 +2043,7 @@ void Effect_Effect339_Update(EffectFireSmoke* this) {
Math_SmoothStepToF(&this->scale1, 0.0f, 1.0f, 0.05f, 0.0f);
}
static Gfx* D_800D17A4[] = {
Gfx* D_800D17A4[] = {
D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200A5A0,
D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0, D_BG_PLANET_2006360, D_BG_PLANET_200C6C0,
D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0, D_BG_PLANET_2002120, D_BG_PLANET_2001090,
@ -2051,12 +2051,12 @@ static Gfx* D_800D17A4[] = {
D_BG_PLANET_200E7F0,
};
static f32 D_800D17F8[] = {
f32 D_800D17F8[] = {
1.0f, 1.1f, 1.1f, 1.2f, 1.2f, 1.3f, 1.3f, 1.4f, 1.4f, 1.5f, 1.5f,
1.6f, 1.6f, 1.7f, 1.7f, 1.8f, 1.8f, 1.9f, 1.9f, 2.0f, 2.0f,
};
static Color_RGBA32 D_800D184C[] = {
Color_RGBA32 D_800D184C[] = {
{ 255, 255, 255, 255 }, { 255, 0, 0, 255 }, { 255, 40, 40, 255 }, { 255, 80, 80, 255 },
{ 255, 120, 120, 255 }, { 255, 160, 160, 255 }, { 255, 200, 200, 255 }, { 255, 240, 240, 255 },
{ 255, 255, 255, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 }, { 255, 255, 255, 255 },
@ -2065,7 +2065,7 @@ static Color_RGBA32 D_800D184C[] = {
{ 0, 0, 0, 50 },
};
static Gfx* D_800D18A0[] = {
Gfx* D_800D18A0[] = {
D_BG_SPACE_20066C0, D_BG_SPACE_20066C0, D_BG_SPACE_2005E30, D_BG_SPACE_20055A0, D_BG_SPACE_2004D10,
D_BG_SPACE_2004480, D_BG_SPACE_2003BF0, D_BG_SPACE_2003360, D_BG_SPACE_2002AD0, D_BG_SPACE_2002240,
D_BG_SPACE_20019B0, D_BG_SPACE_2001120, D_BG_SPACE_2000890, D_BG_SPACE_2000000,
@ -3481,8 +3481,8 @@ void func_effect_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4) {
}
}
static f32 D_800D18E8 = 0.0f;
static f32 D_800D18EC = 0.0f;
f32 D_800D18E8 = 0.0f;
f32 D_800D18EC = 0.0f;
void Effect_Effect395_Update(Effect395* this) {
f32 sp84;
@ -4212,10 +4212,10 @@ void Effect_Effect399_Update(Effect399* this) {
}
// RGB Values. Used like an array of [8][3], but only matches this way.
static s32 D_800D18F0[] = { 32, 32, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 255, 0, 255, 0 };
s32 D_800D18F0[] = { 32, 32, 255, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 255, 0, 255, 0 };
// Alpha values
static s32 D_800D1950[] = { 255, 210, 180, 120, 70, 30, 0, 0 };
s32 D_800D1950[] = { 255, 210, 180, 120, 70, 30, 0, 0 };
void Effect_Effect399_Draw(Effect399* this) {
s32 tmp;

8
src/engine/fox_enmy.c
View File

@ -31,7 +31,7 @@ ObjectInit* gLevelObjectInits[] = {
D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_6014D94,
D_versus_302DE3C,
};
static s32 D_enmy_800CFDF4[] = {
s32 D_enmy_800CFDF4[] = {
/* 0 */ OBJ_SCENERY_CO_STONE_ARCH,
/* 1 */ OBJ_ITEM_SILVER_RING,
/* 2 */ OBJ_ITEM_SILVER_RING,
@ -59,15 +59,15 @@ static s32 D_enmy_800CFDF4[] = {
/* 24 */ OBJ_SCENERY_CO_STONE_ARCH,
/* 25 */ OBJ_ITEM_SILVER_STAR,
};
static f32 D_enmy_800CFE5C[] = {
f32 D_enmy_800CFE5C[] = {
0.0f, 1.0f, 0.5f, 0.33f, 0.25f, 1.0f, 0.5f, 0.33f, 0.25f, 1.0f, 0.5f, 0.33f, 0.25f,
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, -1.0f, -1.0f, -1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f,
};
static Vec3f D_enmy_800CFEC4[] = {
Vec3f D_enmy_800CFEC4[] = {
{ 0.0f, 0.0f, 50.0f }, { -50.0f, 0.0f, 0.0f }, { 50.0f, 0.0f, 0.0f },
{ 0.0f, 50.0f, 0.0f }, { 0.0f, 0.0f, -50.0f }, { 0.0f, -50.0f, 0.0f },
};
static Vec3f D_enmy_800CFF0C[] = {
Vec3f D_enmy_800CFF0C[] = {
{ 0.0f, 0.0f, 0.0f }, { 0.0f, -90.0f, 0.0f }, { 0.0f, 90.0f, 0.0f },
{ -90.0f, 0.0f, 0.0f }, { 0.0f, 180.0f, 0.0f }, { 90.0f, 0.0f, 0.0f },
};

26
src/engine/fox_enmy2.c
View File

@ -237,14 +237,14 @@ void MeHopBot_Update(MeHopBot* this) {
void MeMora_Update(MeMora* this) {
}
static s16 D_800CFF94[16] = {
s16 D_800CFF94[16] = {
0, 98, 96, 94, 92, 90, 88, 86, 84, 82, 80, 78, 76, 74, 72, 70,
};
static u8 gMeMoraPartIdx[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 };
static f32 gMeMoraScale[16] = {
u8 gMeMoraPartIdx[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 };
f32 gMeMoraScale[16] = {
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f,
};
static Gfx* gMemoraPartDL[3] = { aEnmySpMeMora1DL, aEnmySpMeMora2DL, aEnmySpMeMora3DL };
Gfx* gMemoraPartDL[3] = { aEnmySpMeMora1DL, aEnmySpMeMora2DL, aEnmySpMeMora3DL };
void MeMora_Dying(MeMora* this) {
Vec3f sp34;
@ -539,7 +539,8 @@ typedef enum DebrisType {
DEBRIS_70 = 70,
} DebrisType;
static Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function
Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function
void ActorDebris_Update(ActorDebris* this) {
f32 sp4C;
f32 sp48;
@ -945,7 +946,7 @@ typedef struct {
// clang-format off
static EventActorInfo sEventActorInfo[108] = {
EventActorInfo sEventActorInfo[108] = {
/* EVID_VENOM_FIGHTER_1 */ { aVenomFighter1DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
/* EVID_VENOM_FIGHTER_2 */ { aVenomFighter2DL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
/* EVID_VENOM_FIGHTER_2 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 },
@ -1058,7 +1059,7 @@ static EventActorInfo sEventActorInfo[108] = {
// clang-format on
static Color_RGBA32 sEventTexLineColors[6] = {
Color_RGBA32 sEventTexLineColors[6] = {
// could be in-function
{ 255, 255, 255, 255 }, { 160, 160, 255, 255 }, { 80, 80, 255, 255 },
{ 80, 255, 80, 255 }, { 255, 80, 80, 255 }, { 255, 255, 80, 255 },
@ -2824,7 +2825,7 @@ void ActorEvent_ProcessTriggers(ActorEvent* this) {
}
// could be in-function, but probably weren't
static Vec3f D_800D0DD4[56] = {
Vec3f D_800D0DD4[56] = {
{ 158.0f, 256.0f, 1513.0f }, { 384.0f, 42.0f, 1187.0f }, { 284.0f, 129.0f, 769.0f },
{ 482.0f, 19.0f, 769.0f }, { 386.0f, 105.0f, 253.0f }, { 221.0f, 209.0f, 33.0f },
{ 78.0f, 263.0f, 637.0f }, { 78.0f, 263.0f, 76.0f }, { 18.0f, 263.0f, 1683.0f },
@ -2845,7 +2846,7 @@ static Vec3f D_800D0DD4[56] = {
{ -73.0f, 337.0f, -426.0f }, { -73.0f, 548.0f, -411.0f }, { -65.0f, 391.0f, -1237.0f },
{ -193.0f, 250.0f, -1026.0f }, { -292.0f, 271.0f, -587.0f },
};
static Vec3f D_800D1074[24] = {
Vec3f D_800D1074[24] = {
{ 100.0f, 55.0f, 450.0f }, { 117.0f, 57.0f, 738.0f }, { 14.0f, 31.0f, 894.0f },
{ 204.0f, 0.0f, -72.0f }, { 204.0f, 33.0f, -253.0f }, { 344.0f, 0.0f, -295.0f },
{ 344.0f, -51.0f, -457.0f }, { 87.0f, 124.0f, -699.0f }, { 169.0f, -40.0f, -564.0f },
@ -2855,7 +2856,7 @@ static Vec3f D_800D1074[24] = {
{ -344.0f, -51.0f, -457.0f }, { -87.0f, 124.0f, -699.0f }, { -169.0f, -40.0f, -564.0f },
{ -113.0f, -147.0f, -367.0f }, { -112.0f, -146.0f, -13.0f }, { -69.0f, -118.0f, 158.0f },
};
static Vec3f D_800D1194[21] = {
Vec3f D_800D1194[21] = {
{ 764.0f, 13.0f, 71.0f }, { 390.0f, 13.0f, 67.0f }, { 390.0f, 332.0f, 67.0f }, { 504.0f, 508.0f, 67.0f },
{ 251.0f, 508.0f, 67.0f }, { -35.0f, 341.0f, 67.0f }, { -35.0f, 673.0f, 67.0f }, { -354.0f, 594.0f, 67.0f },
{ -354.0f, 273.0f, 67.0f }, { -695.0f, 97.0f, 67.0f }, { -378.0f, -57.0f, 67.0f }, { -378.0f, -266.0f, 67.0f },
@ -3021,7 +3022,8 @@ void ActorEvent_80072474(ActorEvent* this) {
Math_SmoothStepToAngle(&this->fwork[15], this->fwork[16], 0.5f, 8.0f, 0.0f);
}
static Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function
Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function
void ActorEvent_Update(ActorEvent* this) {
s32 spFC;
f32 var_fv0;
@ -3799,7 +3801,7 @@ void ActorEvent_Update(ActorEvent* this) {
}
}
static UNK_TYPE D_800D129C[140] = { 0 }; // unused
UNK_TYPE D_800D129C[140] = { 0 }; // unused
bool ActorEvent_OverrideLimbDraw1(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
Actor* this = thisx;

10
src/engine/fox_game.c
View File

@ -22,11 +22,11 @@ f32 gProjectFar;
bool gShowReticles[4] = { true, true, true, true };
bool D_game_800D2870 = false;
static s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
static s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
static s32 sVsCameraULy[] = { 0, 0, SCREEN_HEIGHT / 2, SCREEN_HEIGHT / 2 };
static s32 sVsCameraLRy[] = { SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT - 1, SCREEN_HEIGHT - 1 };
static s32 sLevelSceneIds[] = {
s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
s32 sVsCameraULy[] = { 0, 0, SCREEN_HEIGHT / 2, SCREEN_HEIGHT / 2 };
s32 sVsCameraLRy[] = { SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT / 2 - 1, SCREEN_HEIGHT - 1, SCREEN_HEIGHT - 1 };
s32 sLevelSceneIds[] = {
/* LEVEL_CORNERIA */ SCENE_CORNERIA,
/* LEVEL_METEO */ SCENE_METEO,
/* LEVEL_SECTOR_X */ SCENE_SECTOR_X,

24
src/engine/fox_tank.c
View File

@ -10,18 +10,18 @@ void func_tank_800481F4(Player* player);
s32 func_tank_80046E40(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot,
f32 zRot, f32 arg9, f32 argA, f32 argB);
static u8 D_800C9F00 = 0;
static u8 D_800C9F04 = 0;
static u8 D_800C9F08 = 0;
static s32 D_800C9F0C = 0; // unused.
static f32 D_800C9F10 = 0.0f;
static s32 D_800C9F14 = 0;
static s32 D_800C9F18[2] = { 0, 0 }; // unused.
static f32 D_800C9F20 = 0.0f;
static f32 D_800C9F24 = 0.0f;
static f32 D_800C9F28 = 0.0f;
u8 D_800C9F00 = 0;
u8 D_800C9F04 = 0;
u8 D_800C9F08 = 0;
s32 D_800C9F0C = 0; // unused.
f32 D_800C9F10 = 0.0f;
s32 D_800C9F14 = 0;
s32 D_800C9F18[2] = { 0, 0 }; // unused.
f32 D_800C9F20 = 0.0f;
f32 D_800C9F24 = 0.0f;
f32 D_800C9F28 = 0.0f;
Vec3f D_tank_800C9F2C = { 0.0f, 0.0f, 0.0f };
static s32 D_800C9F38 = 0; // unused
s32 D_800C9F38 = 0; // unused
void func_tank_80043280(u16* text0, u16* text1, f32 zRot) {
s32 py;
@ -873,7 +873,7 @@ void func_tank_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4,
}
}
static f32 D_800C9F4C[5] = { 0.0f, -1.0f, 1.0f, 0.5f, -0.5f };
f32 D_800C9F4C[5] = { 0.0f, -1.0f, 1.0f, 0.5f, -0.5f };
void func_tank_80046704(Player* player) {
s32 pad[7];

81
src/overlays/ovl_i1/fox_co.c
View File

@ -1706,31 +1706,31 @@ void Corneria_CoCarrier_WaterSplash(CoCarrier* this) {
Effect_Effect372_Spawn2(this->obj.pos.x, gGroundHeight, this->obj.pos.z, 1.0f, 10.0f);
}
static Vec3f D_i1_801998CC = { 442.0f, 5.0f, 360.0f };
static Vec3f D_i1_801998D8 = { -439.0f, 180.0f, 323.0f };
static Vec3f D_i1_801998E4 = { -439.0f, -180.0f, 323.0f };
static Vec3f D_i1_801998F0[2] = {
Vec3f D_i1_801998CC = { 442.0f, 5.0f, 360.0f };
Vec3f D_i1_801998D8 = { -439.0f, 180.0f, 323.0f };
Vec3f D_i1_801998E4 = { -439.0f, -180.0f, 323.0f };
Vec3f D_i1_801998F0[2] = {
{ 0.0f, 50.0f, 473.0f },
{ 300.0f, 70.0f, 200.0f },
};
static Vec3f D_i1_80199908 = { 230.0f, 30.0f, -200.0f };
static Vec3f D_i1_80199914[2] = {
Vec3f D_i1_80199908 = { 230.0f, 30.0f, -200.0f };
Vec3f D_i1_80199914[2] = {
{ 434.0f, -74.0f, -580.0f },
{ -438.0f, -277.0f, -750.0f },
};
static Vec3f D_i1_8019992C = { -438.0f, 275.0f, -750.0f };
static Vec3f D_i1_80199938 = { -426.0f, 147.0f, 2.0f };
static Vec3f D_i1_80199944 = { -437.0f, -135.0f, 2.0f };
static Vec3f D_i1_80199950 = { -250.0f, 30.0f, -200.0f };
static Vec3f D_i1_8019995C[20] = {
{ 67.0f, 44.0f, 377.0f }, { -146.0f, 24.0f, 376.0f }, { -88.0f, 85.0f, -15.0f }, { 105.0f, 89.0f, -169.0f },
{ -107.0f, -36.0f, 367.0f }, { 110.0f, -39.0f, 286.0f }, { -126.0f, -93.0f, 221.0f }, { 88.0f, -94.0f, 155.0f },
{ 126.0f, -179.0f, -101.0f }, { -94.0f, -151.0f, 29.0f }, { 105.0f, -140.0f, 2.0f }, { -18.0f, -101.0f, 77.0f },
{ -60.0f, -151.0f, 29.0f }, { -132.0f, 9.0f, 430.0f }, { 52.0f, 29.0f, 431.0f }, { -23.0f, 68.0f, 325.0f },
{ 116.0f, 34.0f, 368.0f }, { -49.0f, -53.0f, 366.0f }, { 113.0f, -62.0f, 255.0f }, { -114.0f, -88.0f, 182.0f }
};
static s32 D_i1_80199A4C[4] = { 150, 200, 150, 200 };
static f32 D_i1_80199A5C[4] = { -225.0f, 0.0f, 225.0f, 0.0f };
Vec3f D_i1_8019992C = { -438.0f, 275.0f, -750.0f };
Vec3f D_i1_80199938 = { -426.0f, 147.0f, 2.0f };
Vec3f D_i1_80199944 = { -437.0f, -135.0f, 2.0f };
Vec3f D_i1_80199950 = { -250.0f, 30.0f, -200.0f };
Vec3f D_i1_8019995C[20] = { { 67.0f, 44.0f, 377.0f }, { -146.0f, 24.0f, 376.0f }, { -88.0f, 85.0f, -15.0f },
{ 105.0f, 89.0f, -169.0f }, { -107.0f, -36.0f, 367.0f }, { 110.0f, -39.0f, 286.0f },
{ -126.0f, -93.0f, 221.0f }, { 88.0f, -94.0f, 155.0f }, { 126.0f, -179.0f, -101.0f },
{ -94.0f, -151.0f, 29.0f }, { 105.0f, -140.0f, 2.0f }, { -18.0f, -101.0f, 77.0f },
{ -60.0f, -151.0f, 29.0f }, { -132.0f, 9.0f, 430.0f }, { 52.0f, 29.0f, 431.0f },
{ -23.0f, 68.0f, 325.0f }, { 116.0f, 34.0f, 368.0f }, { -49.0f, -53.0f, 366.0f },
{ 113.0f, -62.0f, 255.0f }, { -114.0f, -88.0f, 182.0f } };
s32 D_i1_80199A4C[4] = { 150, 200, 150, 200 };
f32 D_i1_80199A5C[4] = { -225.0f, 0.0f, 225.0f, 0.0f };
void Corneria_CoCarrier_Update(CoCarrier* this) {
Vec3f sp84[33];
@ -2302,8 +2302,8 @@ void Corneria_CoCarrier_Update(CoCarrier* this) {
}
}
static Vec3f D_i1_80199A6C = { -270.0f, 0.0f, 200.0f };
static Vec3f D_i1_80199A78 = { 440.0f, 0.0f, 0.0f };
Vec3f D_i1_80199A6C = { -270.0f, 0.0f, 200.0f };
Vec3f D_i1_80199A78 = { 440.0f, 0.0f, 0.0f };
void Corneria_CarrierLeft_Update(CoCarrierLeft* this) {
Vec3f sp4C;
@ -2405,8 +2405,8 @@ void Corneria_CarrierLeft_Update(CoCarrierLeft* this) {
}
}
static Vec3f D_i1_80199A84 = { 20.0f, -90.0f, 0.0f };
static Vec3f D_i1_80199A90 = { -440.0f, 210.0f, 0.0f };
Vec3f D_i1_80199A84 = { 20.0f, -90.0f, 0.0f };
Vec3f D_i1_80199A90 = { -440.0f, 210.0f, 0.0f };
void Corneria_CarrierUpper_Update(CoCarrierUpper* this) {
Vec3f sp4C;
@ -2513,8 +2513,8 @@ void Corneria_CarrierUpper_Update(CoCarrierUpper* this) {
}
}
static Vec3f D_i1_80199A9C = { 20.0f, 90.0f, 0.0f };
static Vec3f D_i1_80199AA8 = { -440.0f, -210.0f, 0.0f };
Vec3f D_i1_80199A9C = { 20.0f, 90.0f, 0.0f };
Vec3f D_i1_80199AA8 = { -440.0f, -210.0f, 0.0f };
void Corneria_CarrierBottom_Update(CoCarrierBottom* this) {
Vec3f sp4C;
@ -2825,13 +2825,10 @@ void Corneria_SpawnClouds(void) {
}
}
static f32 sCoLevelStartTeamXpos[3] = { 180.0f, -180.0f, 0.0f };
static f32 sCoLevelStartTeamYpos[3] = { 200.0f, 140.0f, 200.0f };
static f32 sCoLevelStartTeamZpos[3] = { 160.0f, 160.0f, 320.0f };
static f32 sCoLevelStartTeamZrot[3] = { -60.0f, 60.0f, -45.0f };
f32 sCoLevelStartTeamXpos[3] = { 180.0f, -180.0f, 0.0f };
f32 sCoLevelStartTeamYpos[3] = { 200.0f, 140.0f, 200.0f };
f32 sCoLevelStartTeamZpos[3] = { 160.0f, 160.0f, 320.0f };
f32 sCoLevelStartTeamZrot[3] = { -60.0f, 60.0f, -45.0f };
void Corneria_CsTeamSetup(ActorCutscene* this, s32 teamIdx) {
Actor_Initialize(this);
@ -3380,19 +3377,13 @@ void Corneria_LevelStart(Player* player) {
slippy->obj.pos.y -= 3.0f;
}
static f32 D_i1_80199AE4[3] = { -1500.0f, 700.0f, 0.0f };
static f32 D_i1_80199AF0[3] = { -300.0f, 400.0f, 500.0f };
static f32 D_i1_80199AFC[3] = { 500.0f, 800.0f, 1200.0f };
static f32 D_i1_80199B08[3] = { -150.0f, 150.0f, 0.0f };
static f32 D_i1_80199B14[3] = { 0.0f, 0.0f, 0.0f };
static f32 D_i1_80199B20[3] = { 200.0f, 200.0f, 400.0f };
static f32 D_i1_80199B2C[3] = { 180.0f, -120.0f, 180.0f };
f32 D_i1_80199AE4[3] = { -1500.0f, 700.0f, 0.0f };
f32 D_i1_80199AF0[3] = { -300.0f, 400.0f, 500.0f };
f32 D_i1_80199AFC[3] = { 500.0f, 800.0f, 1200.0f };
f32 D_i1_80199B08[3] = { -150.0f, 150.0f, 0.0f };
f32 D_i1_80199B14[3] = { 0.0f, 0.0f, 0.0f };
f32 D_i1_80199B20[3] = { 200.0f, 200.0f, 400.0f };
f32 D_i1_80199B2C[3] = { 180.0f, -120.0f, 180.0f };
void Corneria_CsLevelComplete1_TeamSetup(ActorCutscene* this, s32 index) {
Vec3f sp5C;

2
src/overlays/ovl_i1/fox_i1.c
View File

@ -1,6 +1,6 @@
#include "global.h"
static s32 D_i1_801997D0 = 0;
s32 D_i1_801997D0 = 0;
s32 D_i1_8019B6C0;

4
src/overlays/ovl_i3/fox_i3.c
View File

@ -1,7 +1,7 @@
#include "global.h"
static s32 D_i3_801BECA0 = 0;
static s32 D_i3_801C2240;
s32 D_i3_801BECA0 = 0;
s32 D_i3_801C2240;
void OvlI3_CallFunction(s32 mode, void* ptr) {
}

83
src/overlays/ovl_i5/fox_ma.c
View File

@ -60,7 +60,7 @@ Vec3f D_i5_801BE6A0[6];
Vec3f D_i5_801BE6E8[6];
s32 D_i5_801BE734[4];
static UnkStruct_D_i5_801B8E50 D_i5_801B8E50[156] = {
UnkStruct_D_i5_801B8E50 D_i5_801B8E50[156] = {
{ 5174.4f, -2141.0f, 0.0f, 350.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
{ 3401.4f, -1828.0f, 0.0f, 350.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
{ 1627.8999f, -1515.0f, 0.0f, 350.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
@ -218,7 +218,7 @@ static UnkStruct_D_i5_801B8E50 D_i5_801B8E50[156] = {
{ -507035.0f, -319.0f, 0.0f, 0.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
};
static UnkStruct_D_i5_801B8E50 D_i5_801B9A80[86] = {
UnkStruct_D_i5_801B8E50 D_i5_801B9A80[86] = {
{ 5174.4f, -2141.0f, 0.0f, 350.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
{ 3401.4f, -1828.0f, 0.0f, 350.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
{ 1627.8999f, -1515.0f, 0.0f, 350.0f, OBJ_SCENERY_MA_TRAIN_TRACK_3 },
@ -306,21 +306,21 @@ static UnkStruct_D_i5_801B8E50 D_i5_801B9A80[86] = {
{ -507035.0f, -489.0f, 0.0f, 0.0f, OBJ_SCENERY_MA_TRAIN_TRACK_6 },
};
static UnkStruct_D_i5_801B8E50 D_i5_801BA138[8] = {
UnkStruct_D_i5_801B8E50 D_i5_801BA138[8] = {
{ -43605.8f, -1095.0f, 450.0f, -350.0f, 105 }, { -44786.7f, -884.0f, 450.0f, -350.0f, 105 },
{ -50739.8f, -519.0f, 450.0f, -340.0f, 105 }, { -51871.2f, -110.0f, 450.0f, -340.0f, 105 },
{ -84502.5f, 356.0f, 200.0f, -0.0f, 105 }, { -86080.9f, 352.0f, 200.0f, -0.0f, 105 },
{ -87278.9f, 347.0f, 200.0f, -0.0f, 105 }, { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
};
static u8 D_i5_801BA1D8 = 0;
u8 D_i5_801BA1D8 = 0;
static f32 sMaTrainSpeedTarget = 0.0f;
static f32 D_i5_801BA1E0 = 10000000.0f;
static u8 D_i5_801BA1E4 = 0;
f32 sMaTrainSpeedTarget = 0.0f;
f32 D_i5_801BA1E0 = 10000000.0f;
u8 D_i5_801BA1E4 = 0;
u8 D_MA_801BA1E8 = 0;
static UnkStruct_D_i5_801BA1EC D_i5_801BA1EC[45] = {
UnkStruct_D_i5_801BA1EC D_i5_801BA1EC[45] = {
{ -0.0f, 16, -2000.0f, -3500.0f, 0 }, { -3500.0f, 16, -2000.0f, -5500.0f, 0 },
{ -6500.0f, 16, -3500.0f, -5500.0f, 0 }, { -7300.0f, 16, -3500.0f, -5500.0f, 0 },
{ -9000.0f, 16, -3000.0f, -5500.0f, 0 }, { -12000.0f, 16, -3000.0f, -4000.0f, 0 },
@ -346,7 +346,7 @@ static UnkStruct_D_i5_801BA1EC D_i5_801BA1EC[45] = {
{ -1.0f, -1, -1.0f, -1.0f, -1 },
};
static f32 D_i5_801BA570[5][10] = {
f32 D_i5_801BA570[5][10] = {
{ 450.0f, 350.0f, 250.0f, 150.0f, 50.0f, -50.0f, -150.0f, -250.0f, -350.0f, -450.0f },
{ 50.0f, -50.0f, 150.0f, -150.0f, 250.0f, -250.0f, 350.0f, -350.0f, 450.0f, -450.0f },
{ 50.0f, -50.0f, 250.0f, -250.0f, 150.0f, -150.0f, 350.0f, -350.0f, 450.0f, -450.0f },
@ -354,7 +354,7 @@ static f32 D_i5_801BA570[5][10] = {
{ -200.0f, -100.0f, 0.0f, 100.0f, 200.0f, 400.0f, 300.0f, 200.0f, 100.0f, 0.0f },
};
static f32 D_i5_801BA638[5][10] = {
f32 D_i5_801BA638[5][10] = {
{ 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1000.0f },
{ 700.0f, 700.0f, 850.0f, 850.0f, 1000.0f, 1000.0f, 1150.0f, 1150.0f, 1300.0f, 1300.0f },
{ 1000.0f, 1000.0f, 1000.0f, 1000.0f, 1500.0f, 1500.0f, 1500.0f, 1500.0f, 1500.0f, 1500.0f },
@ -362,7 +362,7 @@ static f32 D_i5_801BA638[5][10] = {
{ 700.0f, 850.0f, 1000.0f, 1150.0f, 1300.0f, 1800.0f, 1950.0f, 2100.0f, 2250.0f, 2400.0f },
};
static f32 D_i5_801BA700[] = { 610.0f, 0.0f }; // unused?
f32 D_i5_801BA700[] = { 610.0f, 0.0f }; // unused?
void Macbeth_InitLevel(void) {
s16 i;
@ -4205,8 +4205,8 @@ void Macbeth_Actor207_Init(Actor207* this) {
gBossFrameCount = 0;
}
static Vec3f D_i5_801BA744 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_i5_801BA750 = { 0.0f, 0.0f, 30.0f };
Vec3f D_i5_801BA744 = { 0.0f, 0.0f, 0.0f };
Vec3f D_i5_801BA750 = { 0.0f, 0.0f, 30.0f };
void Macbeth_Actor207_Update(Actor207* this) {
s32 pad;
@ -5512,7 +5512,7 @@ void Macbeth_801AC6B4(ActorCutscene* this) {
this->animFrame = 1;
}
static f32 D_i5_801BA768 = 0.0f;
f32 D_i5_801BA768 = 0.0f;
void Macbeth_LevelStart(Player* player) {
f32 sp4C;
@ -6030,7 +6030,7 @@ void Macbeth_MaSpear_Update(MaSpear* this) {
this->dmgType = DMG_NONE;
}
static Vec3f D_i5_801BA784[8] = {
Vec3f D_i5_801BA784[8] = {
{ 40.0f, 10.0f, 30.0f }, { 41.0f, 10.0f, 10.0f }, { 43.0f, 10.0f, -10.0f }, { 45.0f, 10.0f, -30.0f },
{ -40.0f, 10.0f, 30.0f }, { -41.0f, 10.0f, 10.0f }, { -43.0f, 10.0f, -10.0f }, { -45.0f, 10.0f, -30.0f },
}; // unused?
@ -6320,13 +6320,10 @@ void Macbeth_MaShockBox_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel,
}
}
static f32 D_i5_801BA7E4[5] = { 0.0f, 0.0f, 1180.0f, 200.0f, 1000.0f };
static f32 D_i5_801BA7F8[5] = { 600.0f, 200.0f, 400.0f, 2000.0f, 1200.0f };
static f32 D_i5_801BA80C[5] = { 500.0f, 600.0f, 200.0f, 4500.0f, 2300.0f };
static f32 D_i5_801BA820[5] = { 90.0f, -90.0f, 25.0f, 0.0f, 225.0f };
f32 D_i5_801BA7E4[5] = { 0.0f, 0.0f, 1180.0f, 200.0f, 1000.0f };
f32 D_i5_801BA7F8[5] = { 600.0f, 200.0f, 400.0f, 2000.0f, 1200.0f };
f32 D_i5_801BA80C[5] = { 500.0f, 600.0f, 200.0f, 4500.0f, 2300.0f };
f32 D_i5_801BA820[5] = { 90.0f, -90.0f, 25.0f, 0.0f, 225.0f };
void Macbeth_801AF27C(ActorCutscene* this, s32 arg1) {
Player* player = &gPlayer[0];
@ -6402,12 +6399,12 @@ void Macbeth_801AF44C(void) {
AUDIO_PLAY_SFX(NA_SE_ARWING_ENGINE_FG, actor->sfxSource, 4);
}
static Vec3f D_i5_801BA834[2] = {
Vec3f D_i5_801BA834[2] = {
{ 2000.0f, 300.0f, 500.0f },
{ 2500.0f, 300.0f, -3300.0f },
};
static f32 D_i5_801BA84C[2] = { 0.0f, 60.0f };
f32 D_i5_801BA84C[2] = { 0.0f, 60.0f };
// Unused
void Macbeth_801AF628(ActorCutscene* this, s32 index) {
@ -6458,19 +6455,18 @@ void Macbeth_Effect357_Spawn2(f32 xPos, f32 yPos, f32 zPos, f32 arg3) {
}
}
static f32 D_i5_801BA854[4] = { 1.5f, -1.0f, 0.7f, 0.0f };
static f32 D_i5_801BA864 = 0.9f;
static f32 D_i5_801BA868 = 0.7f; // unused?
static f32 D_i5_801BA86C = -1.0f;
static f32 D_i5_801BA870 = 1.5f; // unused?
static f32 D_i5_801BA874[4] = { 200.0f, 300.0f, 400.0f, 0.0f };
static f32 D_i5_801BA884 = 500.0f;
static f32 D_i5_801BA888 = 100.0f;
static f32 D_i5_801BA88C = 120.0f;
static f32 D_i5_801BA890 = 100.0f; // unused?
static f32 D_i5_801BA894[5] = { 200.0f, 250.0f, 220.0f, 0.0f, 200.0f };
static f32 D_i5_801BA8A8[3] = { 230.0f, 220.0f, 350.0f }; // unused?
f32 D_i5_801BA854[4] = { 1.5f, -1.0f, 0.7f, 0.0f };
f32 D_i5_801BA864 = 0.9f;
f32 D_i5_801BA868 = 0.7f; // unused?
f32 D_i5_801BA86C = -1.0f;
f32 D_i5_801BA870 = 1.5f; // unused?
f32 D_i5_801BA874[4] = { 200.0f, 300.0f, 400.0f, 0.0f };
f32 D_i5_801BA884 = 500.0f;
f32 D_i5_801BA888 = 100.0f;
f32 D_i5_801BA88C = 120.0f;
f32 D_i5_801BA890 = 100.0f; // unused?
f32 D_i5_801BA894[5] = { 200.0f, 250.0f, 220.0f, 0.0f, 200.0f };
f32 D_i5_801BA8A8[3] = { 230.0f, 220.0f, 350.0f }; // unused?
void Macbeth_LevelComplete2(Player* player) {
s32 i;
@ -7434,13 +7430,10 @@ void Macbeth_801B28BC(ActorCutscene* this) {
this->vel.z = sp50.z;
}
static f32 D_i5_801BA8B4[5] = { -100.0f, 380.0f, -450.0f, 0.0f, -340.0f };
static f32 D_i5_801BA8C8[5] = { 500.0f, 400.0f, 850.0f, 650.0f, 950.0f };
static f32 D_i5_801BA8DC[5] = { 500.0f, 500.0f, 600.0f, 2500.0f, 590.0f };
static f32 D_i5_801BA8F0[4] = { 90.0f, -90.0f, 0.0f, 0.0f };
f32 D_i5_801BA8B4[5] = { -100.0f, 380.0f, -450.0f, 0.0f, -340.0f };
f32 D_i5_801BA8C8[5] = { 500.0f, 400.0f, 850.0f, 650.0f, 950.0f };
f32 D_i5_801BA8DC[5] = { 500.0f, 500.0f, 600.0f, 2500.0f, 590.0f };
f32 D_i5_801BA8F0[4] = { 90.0f, -90.0f, 0.0f, 0.0f };
void Macbeth_LevelComplete1_TeamSetup(Actor* this, s32 teamIndex) {
Player* player = &gPlayer[0];
@ -7478,7 +7471,7 @@ void Macbeth_LevelComplete1_TeamSetup(Actor* this, s32 teamIndex) {
this->fwork[9] = 20.0f;
}
static f32 D_i5_801BA900 = 90.0f;
f32 D_i5_801BA900 = 90.0f;
void Macbeth_801B3718(void) {
ActorCutscene* actor = &gActors[8];

106
src/overlays/ovl_i5/fox_ti.c
View File

@ -49,7 +49,7 @@ UnkStruct_i5_801BD738 D_i5_801BD738[3][9];
PosRot D_i5_801BDA30[10];
f32 D_i5_801BDB20[3][151];
static f32 D_i5_801B7360[25][4] = {
f32 D_i5_801B7360[25][4] = {
{ 165.0f, 120.0f, 0.0f, 90.0f }, { 127.5f, 7.5f, 0.0f, 90.0f }, { 7.5f, -112.5f, 0.0f, 90.0f },
{ 255.0f, 285.0f, -60.0f, 60.0f }, { 255.0f, 285.0f, 60.0f, 60.0f }, { 247.5f, 120.0f, -90.0f, 75.0f },
{ 247.5f, 120.0f, 90.0f, 75.0f }, { 217.5f, -75.0f, -135.0f, 90.0f }, { 217.5f, -75.0f, 135.0f, 90.0f },
@ -61,14 +61,14 @@ static f32 D_i5_801B7360[25][4] = {
{ 117.0f, -3.0f, 18.0f, 45.0f }
};
static u8 D_i5_801B74F0[9][3] = {
u8 D_i5_801B74F0[9][3] = {
{ 13, 0, 11 }, { 1, 11, 2 }, { 2, 13, 1 }, { 3, 14, 2 }, { 4, 16, 1 },
{ 5, 17, 3 }, { 6, 20, 1 }, { 7, 21, 3 }, { 8, 24, 1 },
};
static bool D_i5_801B750C[3] = { false, false, false };
bool D_i5_801B750C[3] = { false, false, false };
static f32 D_i5_801B7518[2] = { 20.0f, 60.0f };
f32 D_i5_801B7518[2] = { 20.0f, 60.0f };
void Titania_80188F30(void) {
s32 i;
@ -126,7 +126,7 @@ void Titania_TiTerrain_Update(TiTerrain* this) {
Ground_801B49D0(this);
}
static Vec3f D_i5_801B7520 = { -150.0f, 0.0f, 0.0f };
Vec3f D_i5_801B7520 = { -150.0f, 0.0f, 0.0f };
void Titania_TiDesertRover_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* data) {
TiDesertRover* this = (TiDesertRover*) data;
@ -214,8 +214,8 @@ void Titania_80189380(TiDesertRover* this) {
func_effect_8007EE68(OBJ_EFFECT_ENEMY_LASER_1, &sp80, &sp74, &sp68, &sp5C, 1.0f);
}
static Vec3f D_i5_801B752C = { -50.0f, 0.0f, -20.0f };
static Vec3f D_i5_801B7538 = { 50.0f, 0.0f, -20.0f };
Vec3f D_i5_801B752C = { -50.0f, 0.0f, -20.0f };
Vec3f D_i5_801B7538 = { 50.0f, 0.0f, -20.0f };
void Titania_TiDesertRover_Update(TiDesertRover* this) {
Vec3f sp54;
@ -328,7 +328,7 @@ void Titania_TiDesertRover_Draw(TiDesertRover* this) {
&gIdentityMatrix);
}
static Vec3f D_i5_801B7544 = { 0.0f, -50.0f, 178.0f };
Vec3f D_i5_801B7544 = { 0.0f, -50.0f, 178.0f };
void Titania_TiFekuda_Init(TiFekuda* this) {
f32 sp2C;
@ -440,7 +440,7 @@ void Titania_TiFekuda_Draw(TiFekuda* this) {
}
}
static f32 sTiBoulderHitbox[7] = { 1.0f, 0.0f, 25.0f, 0.0f, 12.0f, 0.0f, 12.0f };
f32 sTiBoulderHitbox[7] = { 1.0f, 0.0f, 25.0f, 0.0f, 12.0f, 0.0f, 12.0f };
Gfx* D_TI_801B7584[10] = {
D_TI1_700DDF0, D_TI1_700D9B0, D_TI1_700DF70, D_TI1_700DC50, D_TI1_700DED0,
@ -656,8 +656,8 @@ void Titania_TiLandmine_Update(TiLandmine* this) {
this->dmgType = DMG_NONE;
}
static Vec3f D_i5_801B75AC = { -70.0f, 50.0f, 212.0f };
static Vec3f D_i5_801B75B8 = { 70.0f, 50.0f, 212.0f };
Vec3f D_i5_801B75AC = { -70.0f, 50.0f, 212.0f };
Vec3f D_i5_801B75B8 = { 70.0f, 50.0f, 212.0f };
void Titania_TiRasco_Init(TiRasco* this) {
Vec3f sp68[2];
@ -736,7 +736,7 @@ bool Titania_TiRasco_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Ve
}
}
static Vec3f D_i5_801B75C4 = { 110.0f, 0.0f, 0.0f };
Vec3f D_i5_801B75C4 = { 110.0f, 0.0f, 0.0f };
void Titania_TiRasco_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
TiRasco* this = (TiRasco*) thisx;
@ -751,7 +751,7 @@ void Titania_TiRasco_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
}
}
static s16 D_i5_801B75D0[] = {
s16 D_i5_801B75D0[] = {
1, 2, 3, 4, 5, 6, 7, 10, 12, 13,
};
@ -1039,7 +1039,7 @@ void Titania_TiBomb_Update(TiBomb* this) {
}
}
static s32 D_i5_801B75E4[3][3] = {
s32 D_i5_801B75E4[3][3] = {
{ 15, 255, 255 },
{ 0, 255, 0 },
{ 0, 0, 0 },
@ -1101,7 +1101,7 @@ bool Titania_8018C118(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
return false;
}
static s16 D_i5_801B7630[9][2] = {
s16 D_i5_801B7630[9][2] = {
{ 1, 0 }, { 2, 1 }, { 3, 0 }, { 4, 1 }, { 5, 1 }, { 6, 0 }, { 7, 1 }, { 8, 0 }, { 13, 1 },
};
@ -1150,8 +1150,8 @@ void Titania_TiDesertCrawler_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx
}
}
static Vec3f D_i5_801B7654 = { 387.0f, 0.0f, 0.0f };
static Vec3f D_i5_801B7660 = { 199.5f, 0.0f, 0.0f };
Vec3f D_i5_801B7654 = { 387.0f, 0.0f, 0.0f };
Vec3f D_i5_801B7660 = { 199.5f, 0.0f, 0.0f };
void Titania_8018C3D8(s32 limbIndex, Vec3f* rot, void* thisx) {
s32 i;
@ -1268,7 +1268,7 @@ void Titania_8018C72C(TiDesertCrawler* this) {
this->iwork[8] = 0;
}
static Vec3f D_i5_801B766C = { 0.0f, 0.0f, 15.0f };
Vec3f D_i5_801B766C = { 0.0f, 0.0f, 15.0f };
void Titania_TiDesertCrawler_Update(TiDesertCrawler* this) {
s32 i;
@ -1712,8 +1712,8 @@ void Titania_8018E3B0(TiDesertCrawler* this) {
D_i5_801B750C[this->iwork[0]] = false;
}
static Vec3f D_i5_801B7678 = { 0.0f, 388.0f, 103.0f };
static Vec3f D_i5_801B7684 = { 0.0f, 0.0f, 0.0f }; // unused
Vec3f D_i5_801B7678 = { 0.0f, 388.0f, 103.0f };
Vec3f D_i5_801B7684 = { 0.0f, 0.0f, 0.0f }; // unused
void Titania_TiDelphor_Init(TiDelphor* this) {
Actor* delphorHead;
@ -2051,7 +2051,7 @@ void Titania_TiPillar_Init(TiPillar* this) {
this->vel.z = this->obj.pos.x;
}
static Vec3f D_i5_801B7690 = { 0.0f, 460.0f, 0.0f };
Vec3f D_i5_801B7690 = { 0.0f, 460.0f, 0.0f };
Gfx* D_TI_801B769C[39] = {
D_TI2_7009700, D_TI2_7004E80, D_TI2_70049C0, D_TI2_70045D0, D_TI_A001FA0, D_TI_900FE80, D_TI_80018D0, D_TI_9005450,
@ -2349,10 +2349,10 @@ bool Titania_8018FC70(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
return true;
}
static f32 D_i5_801B7738[14] = { -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f,
871.0f, 580.0f, 637.0f, 637.0f, 1000.0f, 380.0f, 1400.0f };
f32 D_i5_801B7738[14] = { -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f, -1.0f,
871.0f, 580.0f, 637.0f, 637.0f, 1000.0f, 380.0f, 1400.0f };
static u8 D_i5_801B7770[][6] = {
u8 D_i5_801B7770[][6] = {
{ 1, 0, 0, 0, 0, 4 }, { 2, 0, 0, 0, 0, 5 }, { 3, 0, 0, 0, 0, 3 }, { 4, 0, 0, 0, 0, 6 },
{ 5, 0, 0, 0, 0, 7 }, { 7, 0, 2, 0, 2, 10 }, { 8, 0, 2, 0, 2, 10 }, { 9, 0, 2, 0, 2, 10 },
{ 10, 0, 3, 0, 3, 9 }, { 11, 0, 3, 17, 3, 37 }, { 12, 1, 3, 27, 3, 2 }, { 13, 1, 3, 27, 3, 2 },
@ -2372,14 +2372,14 @@ static u8 D_i5_801B7770[][6] = {
{ 88, 0, 0, 19, 0, 35 }, { 89, 0, 0, 20, 0, 36 }, { 90, 0, 0, 5, 0, 38 },
};
static u8 D_i5_801B7904[92] = {
u8 D_i5_801B7904[92] = {
29, 30, 31, 32, 33, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4,
5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 28, 8, 8, 8, 8, 8, 9, 9,
9, 10, 10, 10, 11, 11, 12, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17,
18, 19, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 22, 22, 23, 24, 25, 26, 27,
};
static s16 D_i5_801B7960[][4] = {
s16 D_i5_801B7960[][4] = {
{ 3, 7, 12, 90 }, { 1, 9, 12, 90 }, { 1, 9, 12, 90 }, { 1, 7, 12, 90 }, { 1, 7, 12, 90 }, { 1, 7, 12, 90 },
{ 2, 14, 30, 90 }, { 2, 14, 12, 90 }, { 2, 14, 12, 90 }, { 2, 7, 6, 90 }, { 2, 7, 6, 90 }, { 1, 7, 6, 90 },
{ 1, 7, 6, 90 }, { 0, 7, 6, 90 }, { 1, 7, 6, 90 }, { 1, 7, 6, 90 }, { 2, 14, 12, 90 }, { 2, 14, 12, 90 },
@ -2388,7 +2388,7 @@ static s16 D_i5_801B7960[][4] = {
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 },
};
static f32 D_i5_801B7A70[86][4] = {
f32 D_i5_801B7A70[86][4] = {
{ 99.0f, 9.0f, 0.0f, 0.0f }, { 99.0f, 9.0f, 0.0f, 0.0f }, { 45.0f, 26.0f, 0.0f, 0.0f },
{ 45.0f, 26.0f, 0.0f, 0.0f }, { 21.0f, 42.0f, 0.0f, 0.0f }, { 50.0f, -3.0f, 0.0f, 24.0f },
{ 103.0f, 2.0f, 0.0f, 24.0f }, { 143.0f, -1.0f, 0.0f, 12.0f }, { 173.0f, 0.0f, 0.0f, 15.0f },
@ -2420,7 +2420,7 @@ static f32 D_i5_801B7A70[86][4] = {
{ 78.0f, 40.0f, -25.0f, 0.0f }, { 21.0f, 42.0f, 0.0f, 40.0f },
};
static s16 D_i5_801B7FD0[45][4] = {
s16 D_i5_801B7FD0[45][4] = {
{ 61, 1, 1, 44 }, { 55, 2, 1, 39 }, { 10, 3, 1, 8 }, { 16, 4, 1, 14 }, { 51, 0, 1, 38 }, { 28, 5, 4, 26 },
{ 29, 9, 1, 27 }, { 30, 10, 1, 28 }, { 31, 11, 1, 29 }, { 32, 12, 1, 30 }, { 34, 13, 3, 32 }, { 37, 16, 3, 35 },
{ 39, 19, 2, 37 }, { 90, 21, 2, 66 }, { 36, 23, 2, 34 }, { 1, 25, 1, 0 }, { 2, 26, 1, 1 }, { 4, 27, 1, 3 },
@ -2431,15 +2431,15 @@ static s16 D_i5_801B7FD0[45][4] = {
{ 26, 77, 6, 24 }, { 86, 83, 2, 62 }, { 51, 85, 1, 38 },
};
static s16 D_i5_801B8138[9] = { 12, 15, 18, 45, 48, 51, 78, 84, 102 };
s16 D_i5_801B8138[9] = { 12, 15, 18, 45, 48, 51, 78, 84, 102 };
static s16 D_i5_801B814C[9] = { 21, 24, 27, 54, 57, 60, 81, 87, 105 };
s16 D_i5_801B814C[9] = { 21, 24, 27, 54, 57, 60, 81, 87, 105 };
static s32 D_i5_801B8160[14] = {
s32 D_i5_801B8160[14] = {
28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 89, 90,
};
static UnkStruct_i5_801B8198 D_i5_801B8198[33] = {
UnkStruct_i5_801B8198 D_i5_801B8198[33] = {
{ 61, 0, NULL, 0 }, { 22, 30, NULL, 0 }, { 21, 30, NULL, 0 }, { 20, 30, NULL, 0 }, { 44, 25, NULL, 0 },
{ 45, 20, NULL, 0 }, { 46, 15, NULL, 0 }, { 47, 10, NULL, 0 }, { 48, 5, NULL, 0 }, { 57, 0, NULL, 0 },
{ 5, 30, NULL, 0 }, { 6, 30, NULL, 0 }, { 7, 30, NULL, 0 }, { 39, 25, NULL, 0 }, { 40, 20, NULL, 0 },
@ -2480,43 +2480,43 @@ f32 aTiGorasHitbox[517] = {
0.0f, 0.0f, 0.0f, 0.0f
};
static f32 D_i5_801B8BBC[5][4] = { { 36.0f, -40.0f, 0.0f, 20.0f },
{ 99.0f, 9.0f, 0.0f, 0.0f },
{ 99.0f, 9.0f, 0.0f, 35.0f },
{ 23.0f, 6.0f, 0.0f, 30.0f },
{ 180.0f, 28.0f, -11.0f, 32.0f } };
f32 D_i5_801B8BBC[5][4] = { { 36.0f, -40.0f, 0.0f, 20.0f },
{ 99.0f, 9.0f, 0.0f, 0.0f },
{ 99.0f, 9.0f, 0.0f, 35.0f },
{ 23.0f, 6.0f, 0.0f, 30.0f },
{ 180.0f, 28.0f, -11.0f, 32.0f } };
static u8 D_i5_801B8C0C[21] = {
u8 D_i5_801B8C0C[21] = {
0, 0, 0, 0, 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2,
};
static s32 D_i5_801B8C24[4][4] = {
s32 D_i5_801B8C24[4][4] = {
{ 1, 0, 1, 0 },
{ 2, 0, 1, 1 },
{ 3, 0, 1, 2 },
{ 7, 1, 4, 3 },
};
static f32 D_i5_801B8C64[7][4] = {
f32 D_i5_801B8C64[7][4] = {
{ 45.0f, 26.0f, 0.0f, 0.0f }, { 120.0f, 16.0f, 0.0f, 25.0f }, { 85.0f, 26.0f, 0.0f, 30.0f },
{ 45.0f, 26.0f, 0.0f, 35.0f }, { -25.0f, 11.0f, 0.0f, 35.0f }, { 94.0f, 0.0f, 0.0f, 30.0f },
{ 34.0f, 1.0f, 0.0f, 35.0f },
};
static s32 D_i5_801B8CD4[2][4] = {
s32 D_i5_801B8CD4[2][4] = {
{ 1, 0, 5, 0 },
{ 2, 4, 2, 5 },
};
static s32 D_i5_801B8CF4[3] = { 0, 7, 14 };
s32 D_i5_801B8CF4[3] = { 0, 7, 14 };
static Vec3f D_i5_801B8D00 = { 104.0f, 23.0f, 0.0f };
static Vec3f D_i5_801B8D0C = { 5.0f, 0.0f, 0.0f };
static Vec3f D_i5_801B8D18 = { 0.0f, 0.0f, 30.0f };
static Vec3f D_i5_801B8D24 = { 54.0f, 0.0f, 0.0f };
static Vec3f D_i5_801B8D30 = { 47.0f, 0.0f, 0.0f };
static Vec3f D_i5_801B8D3C = { 158.0f, 4.0f, 0.0f };
static Vec3f D_i5_801B8D48 = { 0.0f, 0.0f, 60.0f };
Vec3f D_i5_801B8D00 = { 104.0f, 23.0f, 0.0f };
Vec3f D_i5_801B8D0C = { 5.0f, 0.0f, 0.0f };
Vec3f D_i5_801B8D18 = { 0.0f, 0.0f, 30.0f };
Vec3f D_i5_801B8D24 = { 54.0f, 0.0f, 0.0f };
Vec3f D_i5_801B8D30 = { 47.0f, 0.0f, 0.0f };
Vec3f D_i5_801B8D3C = { 158.0f, 4.0f, 0.0f };
Vec3f D_i5_801B8D48 = { 0.0f, 0.0f, 60.0f };
void Titania_8019002C(s32 limbIndex, Vec3f* rot, void* thisx) {
TiGoras* this = (TiGoras*) thisx;
@ -4980,7 +4980,7 @@ void Titania_80193DF0(TiGoras* this) {
void Titania_80193DF0(Boss*);
#endif
static s16 D_i5_801B8D54[4] = { 30, 35, 60, 70 };
s16 D_i5_801B8D54[4] = { 30, 35, 60, 70 };
void Titania_TiGoras_Update(Boss* boss) {
Vec3f sp3C;
@ -5187,14 +5187,14 @@ void Titania_TiGoras_Update(Boss* boss) {
boss->swork[31]++;
}
static f32 D_i5_801B8D5C[50] = {
f32 D_i5_801B8D5C[50] = {
0.0f, 0.03f, 0.06f, 0.12f, 0.18f, 0.25f, 0.425f, 0.6f, 0.775f, 0.95f, 1.125f, 1.3f, 1.475f,
1.65f, 1.825f, 2.0f, 1.8f, 1.6f, 1.4f, 1.2f, 1.0f, 0.8f, 0.6f, 0.4f, 0.2f, 0.0f,
0.8f, 1.6f, 2.4f, 3.2f, 4.0f, 3.4f, 3.2f, 3.0f, 2.8f, 2.4f, 2.2f, 2.0f, 1.8f,
1.6f, 1.4f, 1.2f, 1.0f, 0.8f, 0.6f, 0.4f, 0.2f, 0.0f, 0.0f, 0.0f,
};
static f32 D_i5_801B8E24[4][2] = {
f32 D_i5_801B8E24[4][2] = {
{ -1.0f, 1.0f },
{ 1.0f, 1.0f },
{ -1.0f, -1.0f },
@ -5470,7 +5470,7 @@ void Titania_TiGoras_Draw(TiGoras* boss) {
}
}
static Vec3f D_i5_801B8E44 = { 3.0f, 0.0f, 0.0f };
Vec3f D_i5_801B8E44 = { 3.0f, 0.0f, 0.0f };
void Titania_801990DC(TiGoras* this) {
s32 i;

26
src/overlays/ovl_i6/fox_andross.c
View File

@ -22,7 +22,7 @@ f32 D_Andross_801A7F68;
f32 D_Andross_801A7F70;
f32 D_Andross_801A7F78;
static f32* D_i6_801A6760[12] = {
f32* D_i6_801A6760[12] = {
D_ANDROSS_C037FCC, D_ANDROSS_C0380C0, D_ANDROSS_C0381B4, D_ANDROSS_C0382A8, D_ANDROSS_C03839C, D_ANDROSS_C038490,
D_ANDROSS_C038584, D_ANDROSS_C038678, D_ANDROSS_C03876C, D_ANDROSS_C038860, D_ANDROSS_C038954, D_ANDROSS_C038954,
};
@ -1652,7 +1652,7 @@ void Andross_Effect396_Update(Effect396* this) {
}
}
static Gfx* D_i6_801A6790[10] = {
Gfx* D_i6_801A6790[10] = {
D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880,
D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_arwing_3016660, D_arwing_3015D80,
};
@ -1903,7 +1903,7 @@ void Andross_8018DA94(AndAndross* this, Vec3f* arg1) {
AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4);
}
static f32 D_i6_801A67B8[] = { 0.0f, 0.0f, 0.0f };
f32 D_i6_801A67B8[] = { 0.0f, 0.0f, 0.0f };
void Andross_AndAndross_Update(AndAndross* this) {
s32 i;
@ -3128,15 +3128,15 @@ void Andross_AndAndross_Update(AndAndross* this) {
}
}
static Vec3f D_i6_801A67C4 = { 40.0f, 0.0f, -10.0f };
static f32 D_i6_801A67D0 = 180.0f;
static f32 D_i6_801A67D4 = 0.0f;
static f32 D_i6_801A67D8 = 0.0f;
static Vec3f D_i6_801A67DC = { 40.0f, 0.0f, 10.0f };
static f32 D_i6_801A67E8 = 0.0f;
static f32 D_i6_801A67EC = 0.0f;
static f32 D_i6_801A67F0 = 0.0f;
static Vec3f D_i6_801A67F4 = { 0.0f, 0.0f, 0.0f };
Vec3f D_i6_801A67C4 = { 40.0f, 0.0f, -10.0f };
f32 D_i6_801A67D0 = 180.0f;
f32 D_i6_801A67D4 = 0.0f;
f32 D_i6_801A67D8 = 0.0f;
Vec3f D_i6_801A67DC = { 40.0f, 0.0f, 10.0f };
f32 D_i6_801A67E8 = 0.0f;
f32 D_i6_801A67EC = 0.0f;
f32 D_i6_801A67F0 = 0.0f;
Vec3f D_i6_801A67F4 = { 0.0f, 0.0f, 0.0f };
bool Andross_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
Vec3f sp94;
@ -3801,7 +3801,7 @@ void Andross_801939A0(s32 actorIndex) {
AUDIO_PLAY_SFX(NA_SE_ARWING_BOOST, actor->sfxSource, 0);
}
static Vec3f D_i6_801A6878[4] = {
Vec3f D_i6_801A6878[4] = {
{ 1500.0f, 15000.0f, 0.0f },
{ 0.0f, 15000.0f, -600.0f },
{ -400.0f, 14950.0f, 0.0f },

28
src/overlays/ovl_i6/fox_sy.c
View File

@ -1387,7 +1387,7 @@ void SectorY_8019C194(SyShogun* this, f32 zSpeed, f32 xSpeed) {
}
}
static BossFuncs D_i6_801A6910[] = {
BossFuncs D_i6_801A6910[] = {
SectorY_80197F84, SectorY_80198238, SectorY_80198238, SectorY_801983E4, SectorY_80198CE4, SectorY_80199438,
SectorY_80199DAC, SectorY_8019A520, SectorY_8019A66C, SectorY_8019A898, SectorY_8019AAF0, SectorY_8019AEEC,
};
@ -1895,8 +1895,8 @@ void SectorY_SyShogun_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
}
}
static f32 D_i6_801A69AC[20] = { 0.3f, 0.7f, 1.3f, 0.7f, 0.3f, 0.0f, 10.0f, 20.0f, 300.0f, 100.0f,
200.0f, 100.0f, 60.0f, -260.0f, 80.0f, 100.0f, 80.0f, 262.0f, 285.0f, 252.0f };
f32 D_i6_801A69AC[20] = { 0.3f, 0.7f, 1.3f, 0.7f, 0.3f, 0.0f, 10.0f, 20.0f, 300.0f, 100.0f,
200.0f, 100.0f, 60.0f, -260.0f, 80.0f, 100.0f, 80.0f, 262.0f, 285.0f, 252.0f };
void SectorY_SyShogun_Draw(SyShogun* this) {
f32 sp9C;
@ -2014,7 +2014,7 @@ void SectorY_SyShogun_Draw(SyShogun* this) {
}
}
static Vec3f D_i6_801A69FC[10] = {
Vec3f D_i6_801A69FC[10] = {
{ 0.0f, -80.0f, 800.0f }, { -500.0f, -100.0f, 400.0f }, { 500.0f, -140.0f, 400.0f },
{ 3250.0f, 600.0f, 3500.0f }, { -2000.0f, 400.0f, 5000.0f }, { 2500.0f, 400.0f, 5000.0f },
{ -1000.0f, 400.0f, 6000.0f }, { 250.0f, 400.0f, 2500.0f }, { -2000.0f, 0.0f, 4000.0f },
@ -2509,11 +2509,11 @@ void SectorY_8019FF00(ActorCutscene* this) {
}
}
static Vec3f D_i6_801A6A74[10] = { { -10100.0f, -300.0f, -600.0f }, { -10300.0f, 1200.0f, -1070.0f },
{ -10500.0f, 300.0f, 900.0f }, { 9000.0f, 0.0f, 1500.0f },
{ 5000.0f, -100.0f, -100.0f }, { 1150.0f, -1100.0f, -7500.0f },
{ -200.0f, -2400.0f, -12650.0f }, { 0.0f, 4000.0f, -600.0f },
{ -10800.0f, 900.0f, -600.0f }, { -2750.0f, 900.0f, -9150.0f } };
Vec3f D_i6_801A6A74[10] = { { -10100.0f, -300.0f, -600.0f }, { -10300.0f, 1200.0f, -1070.0f },
{ -10500.0f, 300.0f, 900.0f }, { 9000.0f, 0.0f, 1500.0f },
{ 5000.0f, -100.0f, -100.0f }, { 1150.0f, -1100.0f, -7500.0f },
{ -200.0f, -2400.0f, -12650.0f }, { 0.0f, 4000.0f, -600.0f },
{ -10800.0f, 900.0f, -600.0f }, { -2750.0f, 900.0f, -9150.0f } };
void SectorY_801A0510(ActorCutscene* this, s32 arg1) {
Actor_Initialize(this);
@ -2572,7 +2572,7 @@ void SectorY_801A0510(ActorCutscene* this, s32 arg1) {
}
}
static Vec3f D_i6_801A6AEC[5] = {
Vec3f D_i6_801A6AEC[5] = {
{ 100.0f, 50.0f, -200.0f }, { 100.0f, -100.0f, 200.0f }, { 200.0f, -100.0f, 0.0f },
{ 0.0f, 345.0f, 350.0f }, { 90.0f, 87.0f, 93.0f },
};
@ -3798,9 +3798,9 @@ void SectorY_SyRobot_Update(SyRobot* this) {
}
}
static s32 D_i6_801A6B28[3] = { 255, 150, 150 };
static s32 D_i6_801A6B34[3] = { 150, 255, 150 };
static s32 D_i6_801A6B40[6] = { 150, 150, 255 };
s32 D_i6_801A6B28[3] = { 255, 150, 150 };
s32 D_i6_801A6B34[3] = { 150, 255, 150 };
s32 D_i6_801A6B40[6] = { 150, 150, 255 };
bool SectorY_SyRobot_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
SyRobot* actor = (SyRobot*) thisx;
@ -3852,7 +3852,7 @@ void SectorY_SyRobot_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
}
}
static f32 D_i6_801A6B64[5] = {
f32 D_i6_801A6B64[5] = {
0.3f, 0.7f, 1.3f, 0.7f, 0.3f,
};

4
src/overlays/ovl_i6/fox_ve2.c
View File

@ -30,12 +30,12 @@ void Venom2_UpdateStarWolfEvents(ActorAllRange* this) {
ActorAllRange_UpdateStarWolfEvents(this);
}
static Vec3f sTeamInitPos[6] = {
Vec3f sTeamInitPos[6] = {
{ 0.0f, 4030.0f, 18000.0f }, { -500.0f, 3820.0f, 17200.0f }, { 550.0f, 3750.0f, 17000.0f },
{ 1000.0f, 300.0f, 0.0f }, { -1000.0f, 300.0f, 0.0f }, { 0.0f, 500.0f, 0.0f },
};
static f32 sTeamInitRot[3] = { 300.0f, 70.0f, 280.0f };
f32 sTeamInitRot[3] = { 300.0f, 70.0f, 280.0f };
void Venom2_UpdateEvents(ActorAllRange* this) {
ActorAllRange* team;

140
src/overlays/ovl_menu/fox_option.c
View File

@ -156,20 +156,20 @@ struct BssPad1 {
// struct BssPad4 {int x;};
extern s32 BSS_PAD_2;
static f32 sOptionCardPosY[] = { 60.0f, 36.0f, 12.0f, -12.0f, -36.0f, -60.0f };
static f32 sOptionCardTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f };
static f32 sOptionCardTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f };
static f32 sOptionCardCurTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f };
static f32 sOptionCardCurTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f };
static f32 D_menu_801AE5E8[] = { 124.0f, 125.0f };
static f32 D_menu_801AE5F0[] = { 54.0f, 55.0f };
static f32 D_menu_801AE5F8[] = { 133.0f, 125.0f };
static f32 D_menu_801AE600[] = { 151.0f, 151.0f };
static f32 D_menu_801AE608[] = { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f };
static f32 D_menu_801AE620[] = { 1.9f, 2.4f, 0.9f, 1.9f, 1.8f, 2.4f };
f32 sOptionCardPosY[] = { 60.0f, 36.0f, 12.0f, -12.0f, -36.0f, -60.0f };
f32 sOptionCardTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f };
f32 sOptionCardTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f };
f32 sOptionCardCurTextPosX[] = { 124.0f, 118.0f, 145.0f, 125.0f, 133.0f, 118.0f };
f32 sOptionCardCurTextPosY[] = { 54.0f, 78.0f, 103.0f, 126.0f, 151.0f, 175.0f };
f32 D_menu_801AE5E8[] = { 124.0f, 125.0f };
f32 D_menu_801AE5F0[] = { 54.0f, 55.0f };
f32 D_menu_801AE5F8[] = { 133.0f, 125.0f };
f32 D_menu_801AE600[] = { 151.0f, 151.0f };
f32 D_menu_801AE608[] = { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, 8.0f };
f32 D_menu_801AE620[] = { 1.9f, 2.4f, 0.9f, 1.9f, 1.8f, 2.4f };
// D_menu_801AE638
static OptionEntry sOptionCardList[] = {
OptionEntry sOptionCardList[] = {
{
{ 0, 0, D_OPT_8003B50, 0, 72, 12, 126.0f, 46.0f, 1.0f, 1.0f, 20, 0, 75, 255 },
{ 0.0f, 30.0f, -130.0f, 0.2f, 0.11f },
@ -215,7 +215,7 @@ static OptionEntry sOptionCardList[] = {
};
// D_menu_801AE878
static OptionEntry sOptionVSCardList[] = {
OptionEntry sOptionVSCardList[] = {
{
{ 0, 0, D_OPT_8005010, 0, 96, 13, 110.0f, 91.0f, 1.0f, 1.0f, 20, 0, 75, 255 },
{ 0.0f, 11.0f, -130.0f, 0.2f, 0.11f },
@ -238,80 +238,80 @@ static OptionEntry sOptionVSCardList[] = {
1,
},
};
static u8 D_menu_801AE998[] = { SOUNDMODE_STEREO, SOUNDMODE_MONO, SOUNDMODE_HEADSET };
u8 D_menu_801AE998[] = { SOUNDMODE_STEREO, SOUNDMODE_MONO, SOUNDMODE_HEADSET };
static u8 D_menu_801AE99C[] = { 0, 1, 2 };
u8 D_menu_801AE99C[] = { 0, 1, 2 };
static f32 D_menu_801AE9A0[4] = { 62.0f, 222.0f, 75.0f, 235.0f };
f32 D_menu_801AE9A0[4] = { 62.0f, 222.0f, 75.0f, 235.0f };
static f32 D_menu_801AE9B0[4] = { 43.0f, 43.0f, 46.0f, 46.0f };
f32 D_menu_801AE9B0[4] = { 43.0f, 43.0f, 46.0f, 46.0f };
static OptionTexture D_menu_801AE9C0[4] = {
OptionTexture D_menu_801AE9C0[4] = {
{ 2, 0, D_OPT_80143B0, D_OPT_80147B0, 32, 32, 56.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
{ 2, 0, D_OPT_80143B0, D_OPT_80147B0, 32, 32, 216.0f, 175.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
{ 1, 0, D_OPT_80039D0, D_OPT_8003A50, 16, 16, 69.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
{ 1, 0, D_OPT_80039D0, D_OPT_8003A50, 16, 16, 229.0f, 178.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
};
static OptionTexture D_menu_801AEAA0[3] = {
OptionTexture D_menu_801AEAA0[3] = {
{ 3, 0, D_OPT_8013990, 0, 104, 10, 151.0f, 135.0f, 1.05f, 1.0f, 255, 255, 255, 255 },
{ 3, 0, D_OPT_8013990, 0, 104, 10, 151.0f, 161.0f, 1.05f, 1.0f, 255, 255, 255, 255 },
{ 3, 0, D_OPT_8013990, 0, 104, 10, 151.0f, 188.0f, 1.05f, 1.0f, 255, 255, 255, 255 },
};
static OptionTexture D_menu_801AEB48[3] = {
OptionTexture D_menu_801AEB48[3] = {
{ 3, 0, D_OPT_80141B0, 0, 16, 16, 245.0f, 132.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
{ 3, 0, D_OPT_80141B0, 0, 16, 16, 245.0f, 158.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
{ 3, 0, D_OPT_80141B0, 0, 16, 16, 245.0f, 185.0f, 1.0f, 1.0f, 255, 255, 255, 255 },
};
static Vtx D_menu_801AEBF0[] = {
Vtx D_menu_801AEBF0[] = {
{ 1, 1, 0, 0, 0, 0, 255, 255, 255, 255 },
{ -1, 1, 0, 0, 0, 0, 255, 255, 255, 255 },
{ -1, 0, 0, 0, 0, 0, 255, 255, 255, 255 },
{ 1, 0, 0, 0, 0, 0, 255, 255, 255, 255 },
};
static Gfx D_menu_801AEC30[] = {
Gfx D_menu_801AEC30[] = {
gsSPVertex(D_menu_801AEBF0, 4, 0),
gsSP1Quadrangle(1, 2, 3, 0, 0),
gsSPEndDisplayList(),
};
static Vtx D_menu_801AEC48[] = {
Vtx D_menu_801AEC48[] = {
{ 1, 0, 0, 0, 0, 0, 255, 255, 255, 255 },
{ -1, 0, 0, 0, 0, 0, 255, 255, 255, 255 },
{ -1, -1, 0, 0, 0, 0, 255, 255, 255, 255 },
{ 1, -1, 0, 0, 0, 0, 255, 255, 255, 255 },
};
static Gfx D_menu_801AEC88[] = {
Gfx D_menu_801AEC88[] = {
gsSPVertex(D_menu_801AEC48, 4, 0),
gsSP1Quadrangle(1, 2, 3, 0, 0),
gsSPEndDisplayList(),
};
static Vtx D_menu_801AECA0[] = {
Vtx D_menu_801AECA0[] = {
{ 1, 1, 0, 0, 0, 0, 255, 255, 255, 255 },
{ -1, 1, 0, 0, 0, 0, 255, 255, 255, 255 },
{ -1, -1, 0, 0, 0, 0, 255, 255, 255, 255 },
{ 1, -1, 0, 0, 0, 0, 255, 255, 255, 255 },
};
static Gfx D_menu_801AECE0[] = {
Gfx D_menu_801AECE0[] = {
gsSPVertex(D_menu_801AECA0, 4, 0),
gsSP1Quadrangle(1, 2, 3, 0, 0),
gsSPEndDisplayList(),
};
static u8* D_menu_801AECF8[10] = {
u8* D_menu_801AECF8[10] = {
aLargeText_0, aLargeText_1, aLargeText_2, aLargeText_3, aLargeText_4,
aLargeText_5, aLargeText_6, aLargeText_7, aLargeText_8, aLargeText_9,
};
static f32 D_menu_801AED20[2] = { 255.0f, 255.0f };
f32 D_menu_801AED20[2] = { 255.0f, 255.0f };
// TF is this? seems unused
static s32 D_menu_801AED28[] = {
s32 D_menu_801AED28[] = {
/* EE73E8 801AED28 00000038 */ 56,
/* EE73EC 801AED2C 00000043 */ 67,
/* EE73F0 801AED30 0000004E */ 78,
@ -319,47 +319,47 @@ static s32 D_menu_801AED28[] = {
/* EE73F8 801AED38 0000005B */ 91,
};
static s32 D_menu_801AED3C[4] = { 0, 0, 0, 0 };
s32 D_menu_801AED3C[4] = { 0, 0, 0, 0 };
static UnkStruct_D_menu_801AED4C D_menu_801AED4C[24] = {
UnkStruct_D_menu_801AED4C D_menu_801AED4C[24] = {
{ 9, 0, 0 }, { 0, 12, 0 }, { 12, 4, 0 }, { 4, 10, 0 }, { 10, 2, 0 }, { 6, 4, 0 }, { 7, 2, 0 }, { 3, 2, 0 },
{ 2, 14, 0 }, { 5, 6, 1 }, { 6, 13, 1 }, { 13, 7, 1 }, { 4, 7, 1 }, { 12, 13, 1 }, { 8, 7, 1 }, { 9, 5, 2 },
{ 5, 11, 2 }, { 11, 8, 2 }, { 8, 3, 2 }, { 3, 1, 2 }, { 7, 1, 2 }, { 1, 14, 2 }, { 0, 6, 3 }, { 4, 3, 4 },
};
static Gfx* D_menu_801AEE6C[16] = {
Gfx* D_menu_801AEE6C[16] = {
D_MAP_6060610, D_MAP_601DE80, D_MAP_604B750, D_MAP_601F6B0, D_MAP_601C0D0, D_MAP_601C960,
D_menu_801B5E78, D_menu_801B61E0, D_menu_801B6548, D_menu_801B4D70, D_menu_801B5B10, D_menu_801B5440,
D_menu_801B50D8, D_MAP_604DB10, D_menu_801B57A8, D_menu_801B57A8,
};
static char* D_menu_801AEEAC[] = {
char* D_menu_801AEEAC[] = {
"ME", "A6", "BO", "SZ", "SX", "SY", "KA", "MA", "ZO", "CO", "TI", "AQ", "FO", "SO", "VE", "VE",
};
static s32 PAD_menu_801AEEEC = 0;
s32 PAD_menu_801AEEEC = 0;
static Vtx D_menu_801AEEF0[] = {
Vtx D_menu_801AEEF0[] = {
{ -11, -11, 0, 0, 0, 255, 0, 0, 0, 0 },
{ 11, -11, 0, 0, 255, 255, 0, 0, 0, 0 },
{ 11, 11, 0, 0, 255, 0, 0, 0, 0, 0 },
{ -11, 11, 0, 0, 0, 0, 0, 0, 0, 0 },
};
static Gfx D_menu_801AEF30[] = {
Gfx D_menu_801AEF30[] = {
gsSPVertex(D_menu_801AEEF0, 4, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(0, 2, 3, 0),
gsSPEndDisplayList(),
};
static s32 PAD_menu_801AEF50[] = { 0, 0, 0 };
s32 PAD_menu_801AEF50[] = { 0, 0, 0 };
static char D_menu_801AEF5C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.";
char D_menu_801AEF5C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.";
static f32 D_menu_801AEF84[] = { 24.0f, 0.0f, -24.0f };
static f32 D_menu_801AEF90[] = { 111.0f, 112.0f, 121.0f };
static f32 D_menu_801AEF9C[] = { 89.0f, 115.0f, 139.0f };
f32 D_menu_801AEF84[] = { 24.0f, 0.0f, -24.0f };
f32 D_menu_801AEF90[] = { 111.0f, 112.0f, 121.0f };
f32 D_menu_801AEF9C[] = { 89.0f, 115.0f, 139.0f };
void Option_Setup(void) {
bool enableExpertModes;
@ -2025,10 +2025,10 @@ void Option_DataDraw(void) {
Option_8019B7D4();
}
static char* D_menu_801AF0C4[3] = { "P", "S", "F" };
static s32 D_menu_801AF0D0[3] = { 255, 0, 30 };
static s32 D_menu_801AF0DC[3] = { 30, 179, 30 };
static s32 D_menu_801AF0E8[3] = { 0, 67, 255 };
char* D_menu_801AF0C4[3] = { "P", "S", "F" };
s32 D_menu_801AF0D0[3] = { 255, 0, 30 };
s32 D_menu_801AF0DC[3] = { 30, 179, 30 };
s32 D_menu_801AF0E8[3] = { 0, 67, 255 };
void Option_RankingInit(void) {
Title_80188010();
@ -2216,8 +2216,8 @@ void Option_8019752C(void) {
TextureRect_IA8_MirY(&gMasterDisp, D_OPT_800D070, 16, 16, 150.0f, 200.0f, 1.0f, 1.0f);
}
static Vec3f D_menu_801AF100[2] = { { 0.0f, 167.0f, 0.0f }, { 0.0f, -167.0f, 0.0f } };
static Vec3f D_menu_801AF118[2] = { { 25.0f, 3.6f, 0.0f }, { 25.0f, 3.6f, 0.0f } };
Vec3f D_menu_801AF100[2] = { { 0.0f, 167.0f, 0.0f }, { 0.0f, -167.0f, 0.0f } };
Vec3f D_menu_801AF118[2] = { { 25.0f, 3.6f, 0.0f }, { 25.0f, 3.6f, 0.0f } };
void Option_80197914(void) {
Vec3f* vec1;
@ -2585,9 +2585,9 @@ void Option_8019896C(s32 arg0, f32 y, s32 arg2) {
Lib_InitPerspective(&gMasterDisp);
}
static f32 D_menu_801AF13C = 0.7f;
static f32 D_menu_801AF140 = 11.0f;
static f32 D_menu_801AF144 = 2.7f;
f32 D_menu_801AF13C = 0.7f;
f32 D_menu_801AF140 = 11.0f;
f32 D_menu_801AF144 = 2.7f;
void Option_80199198(f32 arg0, f32 arg1, f32 arg2) {
RCP_SetupDL(&gMasterDisp, SETUPDL_53);
@ -2723,26 +2723,26 @@ void Option_VersusMenuDraw(void) {
}
}
static f32 D_menu_801AF148[4] = { 30.0f, 214.0f, 30.0f, 215.0f };
static f32 D_menu_801AF158[4] = { 18.0f, 18.0f, 151.0f, 151.0f };
static s32 D_menu_801AF168[4] = { 56, 48, 56, 48 };
static s32 D_menu_801AF178[4] = { 8, 10, 10, 8 };
static f32 D_menu_801AF188[4] = { 12.0f, 16.0f, 12.0f, 18.0f };
static f32 D_menu_801AF198 = -1.0f;
static f32 D_menu_801AF19C[4] = { 46.0f, 41.0f, 41.0f, 41.0f };
static f32 D_menu_801AF1AC = 24.0f;
static f32 D_menu_801AF1B0 = 1.4f;
static f32 D_menu_801AF1B4 = 5.0f;
static f32 D_menu_801AF1B8 = 11.0f;
static f32 D_menu_801AF1BC = 8.0f;
static f32 D_menu_801AF1C0 = 45.0f;
static f32 D_menu_801AF1C4 = 20.0f;
static f32 D_menu_801AF1C8 = 55.0f;
static f32 D_menu_801AF1CC = 37.0f;
static f32 D_menu_801AF1D0 = 11.0f;
static f32 D_menu_801AF1D4 = 7.0f;
static f32 D_menu_801AF1D8 = 59.0f;
static f32 D_menu_801AF1DC = 58.0f;
f32 D_menu_801AF148[4] = { 30.0f, 214.0f, 30.0f, 215.0f };
f32 D_menu_801AF158[4] = { 18.0f, 18.0f, 151.0f, 151.0f };
s32 D_menu_801AF168[4] = { 56, 48, 56, 48 };
s32 D_menu_801AF178[4] = { 8, 10, 10, 8 };
f32 D_menu_801AF188[4] = { 12.0f, 16.0f, 12.0f, 18.0f };
f32 D_menu_801AF198 = -1.0f;
f32 D_menu_801AF19C[4] = { 46.0f, 41.0f, 41.0f, 41.0f };
f32 D_menu_801AF1AC = 24.0f;
f32 D_menu_801AF1B0 = 1.4f;
f32 D_menu_801AF1B4 = 5.0f;
f32 D_menu_801AF1B8 = 11.0f;
f32 D_menu_801AF1BC = 8.0f;
f32 D_menu_801AF1C0 = 45.0f;
f32 D_menu_801AF1C4 = 20.0f;
f32 D_menu_801AF1C8 = 55.0f;
f32 D_menu_801AF1CC = 37.0f;
f32 D_menu_801AF1D0 = 11.0f;
f32 D_menu_801AF1D4 = 7.0f;
f32 D_menu_801AF1D8 = 59.0f;
f32 D_menu_801AF1DC = 58.0f;
void Option_80199820(s32 arg0) {
s32 var_v0;

14
src/overlays/ovl_menu/fox_title.c
View File

@ -1284,7 +1284,7 @@ void Title_8018A338(void) {
D_menu_801B86AC);
}
static CameraPoint D_menu_801ADA94[50] = {
CameraPoint D_menu_801ADA94[50] = {
{ 70.68093f, 95.06561f, -146.52567f, 9.829767f, 121.2336f, -642.1186f },
{ 205.506f, 142.9332f, -268.0091f, 168.6235f, 176.76671f, -765.49774f },
{ 247.74275f, 218.72449f, -519.0222f, 186.81432f, 211.56888f, -1015.24445f },
@ -1991,7 +1991,7 @@ void Title_8018C1C0(void) {
D_menu_801B86AC);
}
static CameraPoint D_menu_801ADF84[50] = {
CameraPoint D_menu_801ADF84[50] = {
{ -223.5775f, -61.156242f, -26.375984f, -53.867554f, -42.139626f, 44.77107f },
{ -160.05501f, -67.74775f, 85.750084f, -61.486446f, -44.164986f, 29.322315f },
{ -22.228004f, -79.54139f, 121.01903f, -15.555059f, -64.843475f, 85.51631f },
@ -2944,24 +2944,24 @@ void Title_8018FD08(void) {
}
}
static Gfx* D_menu_801AE48C[12] = {
Gfx* D_menu_801AE48C[12] = {
D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036B30, D_TITLE_6036290,
D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036B30, D_TITLE_6036290,
};
static f32 D_menu_801AE4BC[12] = {
f32 D_menu_801AE4BC[12] = {
0.0f, 0.0f, 0.0f, 0.0f, 10.0f, 13.0f, 20.0f, 35.0f, 40.0f, 50.0f, 50.0f, 70.0f,
};
static f32 D_menu_801AE4EC[] = {
f32 D_menu_801AE4EC[] = {
20.0f, 22.0f, 24.0f, 28.0f, 30.0f, 14.0f, 16.0f, 18.0f, 27.0f, 28.0f, 70.0f, 40.0f,
};
static u8 D_menu_801AE51C[] = {
u8 D_menu_801AE51C[] = {
0xC0, 0x80, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
};
static s32 D_menu_801AE528[] = {
s32 D_menu_801AE528[] = {
80, 64, 48, 32, 12, 32, 44, 32, 42, 36, 12, 38,
};