mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-06-20 00:08:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

finish export on segment 7, rename the versus assets (#187)

Browse Source 
* versus

* ending

* ending

* header

* vs names

* errant header
This commit is contained in:
petrie911
2024-03-29 18:19:29 -05:00
committed by GitHub
parent 576d42fabd
commit 4255ef5519
25 changed files with 1447 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/dmatable.c
+2 -2
View File
@@ -22,7 +22,7 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_blue_marine),
{ SEGMENT_ROM_START(ast_blue_marine), SEGMENT_ROM_END(ast_blue_marine) },
false },
{ SEGMENT_ROM_START(ast_vs_player), { SEGMENT_ROM_START(ast_vs_player), SEGMENT_ROM_END(ast_vs_player) }, false },
{ SEGMENT_ROM_START(ast_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, false },
{ SEGMENT_ROM_START(ast_enmy_planet),
{ SEGMENT_ROM_START(ast_enmy_planet), SEGMENT_ROM_END(ast_enmy_planet) },
false },
@@ -58,7 +58,7 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_title), { SEGMENT_ROM_START(ast_title), SEGMENT_ROM_END(ast_title) }, false },
{ SEGMENT_ROM_START(ast_map), { SEGMENT_ROM_START(ast_map), SEGMENT_ROM_END(ast_map) }, false },
{ SEGMENT_ROM_START(ast_option), { SEGMENT_ROM_START(ast_option), SEGMENT_ROM_END(ast_option) }, false },
{ SEGMENT_ROM_START(ast_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, false },
{ SEGMENT_ROM_START(ast_vs_menu), { SEGMENT_ROM_START(ast_vs_menu), SEGMENT_ROM_END(ast_vs_menu) }, false },
{ SEGMENT_ROM_START(ast_font), { SEGMENT_ROM_START(ast_font), SEGMENT_ROM_END(ast_font) }, false },
{ SEGMENT_ROM_START(ast_font_3d), { SEGMENT_ROM_START(ast_font_3d), SEGMENT_ROM_END(ast_font_3d) }, false },
{ SEGMENT_ROM_START(ast_andross), { SEGMENT_ROM_START(ast_andross), SEGMENT_ROM_END(ast_andross) }, false },
src/main/fox_360.c
+2 -2
View File
@@ -3,7 +3,7 @@
#include "assets.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_allies.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_sector_z.h"
@@ -2274,7 +2274,7 @@ void func_80035448(Actor* actor) {
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
Animation_DrawSkeleton(0, D_600C2AC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
} else if (gCurrentLevel == LEVEL_VERSUS) {
gSPDisplayList(gMasterDisp++, D_vs_player_3015740);
gSPDisplayList(gMasterDisp++, D_versus_3015740);
} else if (gCurrentLevel == LEVEL_TRAINING) {
if (actor->unk_0E6 == 0) {
gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200);
src/main/fox_A4290_colheaders.c
+9 -9
View File
@@ -7,7 +7,7 @@
#include "assets/ast_macbeth.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
static 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 },
@@ -137,22 +137,22 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -498.0f, -10.0f, -498.0f },
{ 498.0f, 705.0f, 498.0f },
4,
D_vs_player_302EEE8,
D_vs_player_302EF00,
D_versus_302EEE8,
D_versus_302EF00,
},
{
{ -1494.0f, -30.0f, -1494.0f },
{ 1494.0f, 2115.0f, 1494.0f },
4,
D_vs_player_302EF6C,
D_vs_player_302EF84,
D_versus_302EF6C,
D_versus_302EF84,
},
{
{ -623.0f, -10.0f, -623.0f },
{ 623.0f, 200.0f, 623.0f },
4,
D_vs_player_302EFF0,
D_vs_player_302F008,
D_versus_302EFF0,
D_versus_302F008,
},
{
{ -488.0f, 0.0f, -568.0f },
@@ -228,8 +228,8 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -2965.0f, -16.0f, -2965.0f },
{ 2965.0f, 544.0f, 2965.0f },
14,
D_vs_player_302F044,
D_vs_player_302F098,
D_versus_302F044,
D_versus_302F098,
},
{
{ -814.0f, 0.0f, -691.0f },
src/main/fox_beam.c
+10 -10
View File
@@ -2,7 +2,7 @@
#include "assets/ast_landmaster.h"
#include "assets/ast_aquas.h"
#include "assets/ast_great_fox.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
static Vec3f D_8015F950;
@@ -1189,12 +1189,12 @@ void func_80039210(PlayerShot* shot) {
if (gLaserStrength[shot->playerNum] != LASERS_SINGLE) {
Matrix_Translate(gGfxMatrix, 6.0f, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
gSPDisplayList(gMasterDisp++, D_versus_302D120);
Matrix_Translate(gGfxMatrix, -12.0f, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
gSPDisplayList(gMasterDisp++, D_versus_302D120);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
gSPDisplayList(gMasterDisp++, D_versus_302D120);
}
}
}
@@ -1324,13 +1324,13 @@ void func_80039A50(PlayerShot* shot) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
} else {
if (!(gGameFrameCount & 1)) {
var_fv1 = M_PI;
@@ -1341,7 +1341,7 @@ void func_80039A50(PlayerShot* shot) {
Matrix_RotateZ(gGfxMatrix, 30.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
gSPDisplayList(gMasterDisp++, D_versus_301AD60);
}
} else {
if (!(gGameFrameCount & 1)) {
@@ -1373,13 +1373,13 @@ void func_80039A50(PlayerShot* shot) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.f, 40.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
gSPDisplayList(gMasterDisp++, D_versus_301AEF0);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.f, -40.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
gSPDisplayList(gMasterDisp++, D_versus_301AEF0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
gSPDisplayList(gMasterDisp++, D_versus_301AEF0);
}
break;
case PLAYERSHOT_8:
src/main/fox_bg.c
+9 -9
View File
@@ -18,7 +18,7 @@ UNK_TYPE D_8015F988[0x683]; // Unused? Close to being [13][0x80]
f32 D_80161394; // can be static
#include "assets/ast_bg_planet.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
@@ -278,11 +278,11 @@ void func_8003E1E8(void) {
switch (gCurrentLevel) {
case LEVEL_VERSUS:
if (gVersusStage == VS_STAGE_CORNERIA) {
gSPDisplayList(gMasterDisp++, D_vs_player_302D4D0);
gSPDisplayList(gMasterDisp++, D_versus_302D4D0);
} else if (gVersusStage == VS_STAGE_KATINA) {
gSPDisplayList(gMasterDisp++, D_vs_player_30146B0);
gSPDisplayList(gMasterDisp++, D_versus_30146B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_3011E40);
gSPDisplayList(gMasterDisp++, D_versus_3011E40);
}
break;
case LEVEL_FORTUNA:
@@ -300,11 +300,11 @@ void func_8003E1E8(void) {
switch (gCurrentLevel) {
case LEVEL_VERSUS:
if (gVersusStage == VS_STAGE_CORNERIA) {
gSPDisplayList(gMasterDisp++, D_vs_player_302D4D0);
gSPDisplayList(gMasterDisp++, D_versus_302D4D0);
} else if (gVersusStage == VS_STAGE_KATINA) {
gSPDisplayList(gMasterDisp++, D_vs_player_30146B0);
gSPDisplayList(gMasterDisp++, D_versus_30146B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_3011E40);
gSPDisplayList(gMasterDisp++, D_versus_3011E40);
}
break;
case LEVEL_FORTUNA:
@@ -1081,9 +1081,9 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gVersusStage == VS_STAGE_CORNERIA) {
gSPDisplayList(gMasterDisp++, D_vs_player_3018800);
gSPDisplayList(gMasterDisp++, D_versus_3018800);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_30160A0);
gSPDisplayList(gMasterDisp++, D_versus_30160A0);
}
Matrix_Pop(&gGfxMatrix);
}
src/main/fox_display.c
+16 -16
View File
@@ -16,7 +16,7 @@ f32 D_801615B8[4];
#include "assets/ast_arwing.h"
#include "assets/ast_allies.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_sector_z.h"
s32 D_800CA220 = 0;
@@ -244,7 +244,7 @@ void func_80052584(Player* player) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_vs_player_302D240);
gSPDisplayList(gMasterDisp++, D_versus_302D240);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -255,19 +255,19 @@ void func_800526B8(Player* player) {
Matrix_Translate(gCalcMatrix, 0.0f, 35.0f, 0.0f, 1);
switch (player->num) {
case 0:
Animation_DrawSkeleton(5, D_vs_player_301D258, player->jointTable, func_800520FC, func_800523A8, player,
Animation_DrawSkeleton(5, D_versus_301D258, player->jointTable, func_800520FC, func_800523A8, player,
gCalcMatrix);
break;
case 1:
Animation_DrawSkeleton(5, D_vs_player_301DB94, player->jointTable, func_800520FC, func_80052420, player,
Animation_DrawSkeleton(5, D_versus_301DB94, player->jointTable, func_800520FC, func_80052420, player,
gCalcMatrix);
break;
case 2:
Animation_DrawSkeleton(5, D_vs_player_301E3E8, player->jointTable, func_800520FC, func_80052498, player,
Animation_DrawSkeleton(5, D_versus_301E3E8, player->jointTable, func_800520FC, func_80052498, player,
gCalcMatrix);
break;
case 3:
Animation_DrawSkeleton(5, D_vs_player_301C614, player->jointTable, func_800520FC, func_8005250C, player,
Animation_DrawSkeleton(5, D_versus_301C614, player->jointTable, func_800520FC, func_8005250C, player,
gCalcMatrix);
break;
}
@@ -287,7 +287,7 @@ void func_80052884(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_arwing_3000090);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_300FB80);
gSPDisplayList(gMasterDisp++, D_versus_300FB80);
}
Matrix_MultVec3f(gGfxMatrix, &sp40, &D_80161518[player->num]);
Matrix_Translate(gGfxMatrix, 0.0f, 51.0f, -10.0f, 1);
@@ -313,7 +313,7 @@ void func_80052884(Player* player) {
}
gSPDisplayList(gMasterDisp++, D_landmaster_3004680);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301F140);
gSPDisplayList(gMasterDisp++, D_versus_301F140);
}
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_80161548[player->num]);
Matrix_Pop(&gGfxMatrix);
@@ -338,7 +338,7 @@ void func_80052B80(Player* player) {
if (gVersusMode) {
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_vs_player_301FD20);
gSPDisplayList(gMasterDisp++, D_versus_301FD20);
} else {
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -383,7 +383,7 @@ void func_80052D48(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_30066B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301B6E0);
gSPDisplayList(gMasterDisp++, D_versus_301B6E0);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -406,7 +406,7 @@ void func_80052D48(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_30066B0);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301B6E0);
gSPDisplayList(gMasterDisp++, D_versus_301B6E0);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -635,15 +635,15 @@ void func_80053C38(Player* player, s32 arg1) {
} else {
if (gVersusMode) {
if ((player->wings.rightState == WINGSTATE_INTACT) && (player->wings.leftState == WINGSTATE_INTACT)) {
gSPDisplayList(gMasterDisp++, D_vs_player_300EE80);
gSPDisplayList(gMasterDisp++, D_versus_300EE80);
} else if ((player->wings.rightState <= WINGSTATE_BROKEN) &&
(player->wings.leftState == WINGSTATE_INTACT)) {
gSPDisplayList(gMasterDisp++, D_vs_player_3010A90);
gSPDisplayList(gMasterDisp++, D_versus_3010A90);
} else if ((player->wings.rightState == WINGSTATE_INTACT) &&
(player->wings.leftState <= WINGSTATE_BROKEN)) {
gSPDisplayList(gMasterDisp++, D_vs_player_3011470);
gSPDisplayList(gMasterDisp++, D_versus_3011470);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_300D550);
gSPDisplayList(gMasterDisp++, D_versus_300D550);
}
} else {
if ((gLevelType == LEVELTYPE_SPACE) || (gCurrentLevel == LEVEL_BOLSE)) {
@@ -741,7 +741,7 @@ void func_80054300(Player* player) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_landmaster_3008100);
} else {
gSPDisplayList(gMasterDisp++, D_vs_player_301E570);
gSPDisplayList(gMasterDisp++, D_versus_301E570);
}
Matrix_Pop(&gGfxMatrix);
break;
src/main/fox_edata_1C.c
+10 -10
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_arwing.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
@@ -224,15 +224,15 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_vs_player_3017600, 0, (ObjectFunc) NULL, D_vs_player_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_vs_player_3017600, 0, (ObjectFunc) NULL, D_vs_player_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_140 */ {(void*) D_vs_player_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_141 */ {(void*) D_vs_player_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_142 */ {(void*) D_vs_player_301B080, 0, (ObjectFunc) NULL, D_vs_player_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_143 */ {(void*) D_vs_player_3016B00, 0, (ObjectFunc) NULL, D_vs_player_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_144 */ {(void*) D_vs_player_3013780, 0, (ObjectFunc) NULL, D_vs_player_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_145 */ {(void*) D_vs_player_3013580, 0, (ObjectFunc) NULL, D_vs_player_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_146 */ {(void*) D_vs_player_3012ED0, 0, (ObjectFunc) NULL, D_vs_player_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_142 */ {(void*) D_versus_301B080, 0, (ObjectFunc) NULL, D_versus_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_143 */ {(void*) D_versus_3016B00, 0, (ObjectFunc) NULL, D_versus_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_144 */ {(void*) D_versus_3013780, 0, (ObjectFunc) NULL, D_versus_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_145 */ {(void*) D_versus_3013580, 0, (ObjectFunc) NULL, D_versus_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_146 */ {(void*) D_versus_3012ED0, 0, (ObjectFunc) NULL, D_versus_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_148 */ {(void*) D_60079B0, 0, (ObjectFunc) NULL, D_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_149 */ {(void*) D_6007D80, 0, (ObjectFunc) NULL, D_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+1 -1
View File
@@ -18,7 +18,7 @@ WingInfo D_80161630;
#include "assets/ast_star_wolf.h"
#include "assets/ast_arwing.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_enmy_space.h"
#include "assets/ast_enmy_planet.h"
#include "assets/ast_ve1_boss.h"
src/main/fox_enmy.c
+2 -2
View File
@@ -11,7 +11,7 @@
#include "assets/ast_andross.h"
#include "assets/ast_area_6.h"
#include "assets/ast_training.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
s32 D_Timer_80161670[4];
s32 D_80161680;
@@ -22,7 +22,7 @@ u8 D_80161684;
ObjectInit* D_800CFDA0[] = {
D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
D_SO_601F234, D_ZO_6026714, D_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_vs_player_302DE3C,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
src/main/fox_hud.c
+9 -9
View File
@@ -77,7 +77,7 @@ s32 D_80161900[20];
#include "assets/ast_arwing.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_font.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
@@ -300,7 +300,7 @@ void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_3000B20, 32, 5, arg0, arg1, arg2, arg3);
TextureRect_8bIA(&gMasterDisp, D_versus_3000B20, 32, 5, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bIA(&gMasterDisp, D_1000E80, 48, 9, arg0, arg1, arg2, arg3);
}
@@ -308,7 +308,7 @@ void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_300D3C0, D_vs_player_300D408, 24, 3, arg0, arg1, arg2, arg3);
TextureRect_8bCI(&gMasterDisp, D_versus_300D3C0, D_versus_300D408, 24, 3, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bCI(&gMasterDisp, D_10128C0, D_1012988, 40, 5, arg0, arg1, arg2, arg3);
}
@@ -316,7 +316,7 @@ void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
void func_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
if (gVersusMode) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_300D350, D_vs_player_300D398, 24, 3, arg0, arg1, arg2, arg3);
TextureRect_8bCI(&gMasterDisp, D_versus_300D350, D_versus_300D398, 24, 3, arg0, arg1, arg2, arg3);
} else {
TextureRect_8bCI(&gMasterDisp, D_10127D0, D_1012898, 40, 5, arg0, arg1, arg2, arg3);
}
@@ -2817,7 +2817,7 @@ s32 func_8008CB8C(void) {
}
void func_8008CB98(f32 arg0, f32 arg1, f32 arg2) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_30013E0, 8, 8, arg0, arg1, arg2, arg2);
TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, arg0, arg1, arg2, arg2);
}
void func_8008CBE4(void) {
@@ -2891,17 +2891,17 @@ void func_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
s32 i;
for (i = 0; i < 3; i++) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_3000BC0 + 2 * ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1,
arg2, arg3);
TextureRect_8bIA(&gMasterDisp, D_versus_3000BC0 + 2 * ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1, arg2,
arg3);
}
TextureRect_8bIA(&gMasterDisp, D_vs_player_3000BC0 + 2 * ((640 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
TextureRect_8bIA(&gMasterDisp, D_versus_3000BC0 + 2 * ((640 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
arg3);
}
void func_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
u32 var_t8 = 48.0f * arg4;
func_80084E78(&gMasterDisp, D_vs_player_300D440, D_vs_player_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
func_80084E78(&gMasterDisp, D_versus_300D440, D_versus_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
}
void func_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
src/main/fox_load_inits.c
+5 -5
View File
@@ -166,7 +166,7 @@ OverlayInit sOvlmenu_Option[1] = {
/* 0x4 */ NO_SEGMENT,
/* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ ROM_SEGMENT(ast_map),
/* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ ROM_SEGMENT(ast_option),
/* 0x9 */ ROM_SEGMENT(ast_font_3d),
/* 0xA */ NO_SEGMENT,
@@ -759,11 +759,11 @@ OverlayInit sOvli2_Versus[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_planet),
/* 0x3 */ ROM_SEGMENT(ast_vs_player),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_planet),
/* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
@@ -775,11 +775,11 @@ OverlayInit sOvli2_Versus[2] = {
{ OVERLAY_OFFSETS(ovl_i2),
{ /* 0x1 */ ROM_SEGMENT(ast_common),
/* 0x2 */ ROM_SEGMENT(ast_bg_space),
/* 0x3 */ ROM_SEGMENT(ast_vs_player),
/* 0x3 */ ROM_SEGMENT(ast_versus),
/* 0x4 */ ROM_SEGMENT(ast_enmy_space),
/* 0x5 */ ROM_SEGMENT(ast_font),
/* 0x6 */ NO_SEGMENT,
/* 0x7 */ ROM_SEGMENT(ast_versus),
/* 0x7 */ ROM_SEGMENT(ast_vs_menu),
/* 0x8 */ NO_SEGMENT,
/* 0x9 */ NO_SEGMENT,
/* 0xA */ NO_SEGMENT,
src/main/fox_play.c
+26 -26
View File
@@ -12,7 +12,7 @@
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
#include "assets/ast_area_6.h"
UNK_TYPE D_800D2F50 = 0;
@@ -276,16 +276,16 @@ void func_800A4F7C(void) {
switch (gVersusStage) {
case VS_STAGE_CORNERIA:
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302DE3C);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302DE3C);
break;
case VS_STAGE_KATINA:
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E0E4);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E0E4);
break;
case VS_STAGE_SECTOR_Z:
if (D_801778AC == 2) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E378);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E378);
} else {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E170);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_versus_302E170);
}
break;
}
@@ -468,20 +468,20 @@ void func_800A5844(void) {
EnvSettings* D_800D2F98[21] = {
&D_CO_6037160, &D_ME_6026C80, &D_SX_602A120, &D_A6_6023F20, &D_A6_6028760, &D_SY_602E4B0, &D_VE1_6007E30,
&D_SO_601F1F0, &D_ZO_60266D0, &D_C035110, &D_TR_6006A60, &D_MA_6030E30, &D_TI_6005000, &D_AQ_602E540,
&D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_vs_player_302DD70,
&D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_versus_302DD70,
};
void func_800A594C(void) {
if (gVersusMode) {
switch (gVersusStage) {
case 0:
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DD70);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DD70);
break;
case 1:
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DDB4);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DDB4);
break;
case 2:
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DDF8);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_versus_302DDF8);
break;
}
} else {
@@ -3923,7 +3923,7 @@ void func_800B0194(Player* player) {
if (player->unk_1D4 != 0) {
if (player->unk_0D0 > 1.0f) {
player->unk_00C += player->unk_008;
if ((s32) player->unk_00C >= Animation_GetFrameCount(&D_vs_player_301CFEC)) {
if ((s32) player->unk_00C >= Animation_GetFrameCount(&D_versus_301CFEC)) {
player->unk_00C = 0.0f;
}
player->unk_080 = 2.0f * SIN_DEG((player->unk_20C + 7) * 24.0f);
@@ -3934,16 +3934,16 @@ void func_800B0194(Player* player) {
player->unk_20C = player->unk_00C;
switch (gPlayerNum) {
case 0:
sp44 = Animation_GetFrameData(&D_vs_player_301CFEC, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301CFEC, player->unk_20C, sp78);
break;
case 1:
sp44 = Animation_GetFrameData(&D_vs_player_301D888, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301D888, player->unk_20C, sp78);
break;
case 2:
sp44 = Animation_GetFrameData(&D_vs_player_301E19C, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301E19C, player->unk_20C, sp78);
break;
case 3:
sp44 = Animation_GetFrameData(&D_vs_player_301C3A8, player->unk_20C, sp78);
sp44 = Animation_GetFrameData(&D_versus_301C3A8, player->unk_20C, sp78);
break;
}
Math_SmoothStepToVec3fArray(sp78, player->jointTable, 1, sp44, 1.0f, player->unk_010, 0.01f);
@@ -3965,16 +3965,16 @@ void func_800B0194(Player* player) {
}
switch (gPlayerNum) {
case 0:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E56C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E56C);
break;
case 1:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E830);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E830);
break;
case 2:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E74C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E74C);
break;
case 3:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E65C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E65C);
break;
}
Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 0x18, 0.2f, 10.0f, 0.01f);
@@ -3988,16 +3988,16 @@ void func_800B0194(Player* player) {
if (player->unk_1D4 == 0) {
switch (gPlayerNum) {
case 0:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E95C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302E95C);
break;
case 1:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EC20);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EC20);
break;
case 2:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EB3C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EB3C);
break;
case 3:
sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EA4C);
sp48 = SEGMENTED_TO_VIRTUAL(D_versus_302EA4C);
break;
}
Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 0x18, 0.2f, 10.0f, 0.01f);
@@ -4209,16 +4209,16 @@ void func_800B0F50(Player* playerx) {
player->unk_068 = 0;
switch (gPlayerNum) {
case 0:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E56C);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E56C);
break;
case 1:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E830);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E830);
break;
case 2:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E74C);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E74C);
break;
case 3:
sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E65C);
sp38 = SEGMENTED_TO_VIRTUAL(D_versus_302E65C);
break;
}
for (j = 0; j < 30; j++, sp38++) {
src/main/fox_versus.c
+30 -30
View File
@@ -2,7 +2,7 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "fox_option.h"
#include "assets/ast_versus.h"
#include "assets/ast_vs_menu.h"
s32 D_80178750;
s32 D_80178754;
@@ -42,7 +42,7 @@ OSTime D_80178860;
OSTime D_80178868;
#include "assets/ast_font.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_versus.h"
s32 D_800D4A90 = 0;
s32 D_800D4A94 = 0;
@@ -83,24 +83,24 @@ void func_800BC760(void) {
}
void func_800BC88C(f32 xPos, f32 yPos, f32 scale) {
TextureRect_8bIA(&gMasterDisp, D_VS_7003830, 64, 17, xPos, yPos, scale, scale);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003830, 64, 17, xPos, yPos, scale, scale);
}
void func_800BC8D8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 2; i++) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_300A470 + (i * 152 * 8), D_vs_player_300B218, 152, 8, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_300A470 + (i * 152 * 8), D_versus_300B218, 152, 8, xPos,
yPos + (8 * i * scale), scale, scale);
}
TextureRect_8bCI(&gMasterDisp, D_vs_player_300A470 + (152 * 8 * i), D_vs_player_300B218, 152, 7, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_300A470 + (152 * 8 * i), D_versus_300B218, 152, 7, xPos,
yPos + (8 * i * scale), scale, scale);
}
void func_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
u16* D_800D4AA4[] = { D_vs_player_3008DE0, D_vs_player_30098C0, D_vs_player_300A390 };
u8* D_800D4ABC[] = { D_vs_player_30087A0, D_vs_player_3008EC0, D_vs_player_3009990 };
u16* D_800D4AA4[] = { D_versus_3008DE0, D_versus_30098C0, D_versus_300A390 };
u8* D_800D4ABC[] = { D_versus_30087A0, D_versus_3008EC0, D_versus_3009990 };
s32 D_800D4AB0[] = { 40, 64, 64 };
s32 i;
@@ -114,16 +114,16 @@ void func_800BCB44(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 2; i++) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_3006C60 + (96 * 8 * i), D_vs_player_3007500, 96, 8, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 8, xPos,
yPos + (8 * i * scale), scale, scale);
}
TextureRect_8bCI(&gMasterDisp, D_vs_player_3006C60 + (96 * 8 * i), D_vs_player_3007500, 96, 7, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_3006C60 + (96 * 8 * i), D_versus_3007500, 96, 7, xPos,
yPos + (8 * i * scale), scale, scale);
}
void func_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) {
u16* D_800D4AC8[] = { D_vs_player_3006A68, D_vs_player_3008598, D_vs_player_300C458, D_vs_player_3005E38 };
u8* D_800D4AD8[] = { D_vs_player_3006040, D_vs_player_30076C0, D_vs_player_300B3F0, D_vs_player_3004F60 };
u16* D_800D4AC8[] = { D_versus_3006A68, D_versus_3008598, D_versus_300C458, D_versus_3005E38 };
u8* D_800D4AD8[] = { D_versus_3006040, D_versus_30076C0, D_versus_300B3F0, D_versus_3004F60 };
s32 D_800D4AE8[] = { 104, 152, 168, 152 };
s32 i;
@@ -139,7 +139,7 @@ void func_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
s32 i;
for (i = 0; i < 6; i++) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_3001420 + (256 * 7 * i), D_vs_player_3003E20, 256, 7, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_3001420 + (256 * 7 * i), D_versus_3003E20, 256, 7, xPos,
yPos + (7 * i * yScale), xScale, yScale);
}
}
@@ -148,10 +148,10 @@ void func_800BCEF8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
for (i = 0; i < 12; i++) {
TextureRect_8bCI(&gMasterDisp, D_vs_player_3004010 + (136 * 2 * i), D_vs_player_3004D58, 136, 2, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 2, xPos,
yPos + (2 * i * scale), scale, scale);
}
TextureRect_8bCI(&gMasterDisp, D_vs_player_3004010 + (136 * 2 * i), D_vs_player_3004D58, 136, 1, xPos,
TextureRect_8bCI(&gMasterDisp, D_versus_3004010 + (136 * 2 * i), D_versus_3004D58, 136, 1, xPos,
yPos + (2 * i * scale), scale, scale);
}
@@ -160,54 +160,54 @@ void func_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
}
void func_800BD05C(f32 xPos, f32 yPos, f32 scale) {
TextureRect_4bCI(&gMasterDisp, D_vs_player_30003A0, D_vs_player_30004E0, 64, 10, xPos, yPos, scale, scale);
TextureRect_4bCI(&gMasterDisp, D_versus_30003A0, D_versus_30004E0, 64, 10, xPos, yPos, scale, scale);
}
void func_800BD0B4(f32 xPos, f32 yPos, f32 scale) {
TextureRect_4bCI(&gMasterDisp, D_vs_player_3000510, D_vs_player_30006A0, 80, 10, xPos, yPos, scale, scale);
TextureRect_4bCI(&gMasterDisp, D_versus_3000510, D_versus_30006A0, 80, 10, xPos, yPos, scale, scale);
}
void func_800BD10C(f32 xPos, f32 yPos, f32 scale) {
TextureRect_4bCI(&gMasterDisp, D_vs_player_30006D0, D_vs_player_3000810, 64, 10, xPos, yPos, scale, scale);
TextureRect_4bCI(&gMasterDisp, D_versus_30006D0, D_versus_3000810, 64, 10, xPos, yPos, scale, scale);
}
void func_800BD164(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_VS_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003C70, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD1B0(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_VS_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003F10, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD1FC(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_VS_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003E10, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD248(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_7004050, D_VS_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_7004050, D_VS_MENU_7004150, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD2A0(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_70041F0, D_VS_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_70041F0, D_VS_MENU_70042F0, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD2F8(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_7004360, D_VS_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_7004360, D_VS_MENU_7004460, 16, 16, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD350(f32 xPos, f32 yPos) {
TextureRect_8bCI(&gMasterDisp, D_VS_70044D0, D_VS_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bCI(&gMasterDisp, D_VS_MENU_70044D0, D_VS_MENU_7004990, 64, 19, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD3A8(f32 xPos, f32 yPos) {
s32 i;
for (i = 0; i < 8; i++) {
TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + ((80 * 8 * i) / 2), D_VS_70123F8, 80, 8, xPos, yPos + (i * 8),
1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_VS_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 8, xPos,
yPos + (i * 8), 1.0f, 1.0f);
}
TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + ((80 * 8 * i) / 2), D_VS_70123F8, 80, 7, xPos, yPos + (i * 8), 1.0f,
1.0f);
TextureRect_4bCI(&gMasterDisp, D_VS_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 7, xPos,
yPos + (i * 8), 1.0f, 1.0f);
}
void func_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
@@ -232,11 +232,11 @@ void func_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
}
void func_800BD720(f32 xPos, f32 yPos) {
TextureRect_8bIA(&gMasterDisp, D_vs_player_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_versus_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD76C(f32 xPos, f32 yPos) {
TextureRect_4bCI(&gMasterDisp, D_vs_player_30001E0, D_vs_player_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_versus_30001E0, D_versus_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
}
void func_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
src/overlays/ovl_ending/fox_end1.c
+2 -2
View File
@@ -341,7 +341,7 @@ void func_ending_80188030(s32 arg0) {
s32 func_ending_80188394(void) {
s32 i;
UnkStruct_196D08 sp14[2] = {
{ &D_END_70143C0,
{ (void*) D_END_70143C0,
NULL,
17,
{ 0.0f, -3830.0f, -7000.0f },
@@ -496,7 +496,7 @@ void func_ending_80188DB4(void) {
s32 j;
Vec3f sp1B4 = { 0.0f, 0.0f, 0.0f };
UnkStruct_196D08 sp74[5] = {
{ &D_END_70111D0,
{ (void*) D_END_70111D0,
NULL,
17,
{ 0.0f, -2960.0f, -6600.0f },
src/overlays/ovl_i6/fox_andross.c
-1
View File
@@ -4,7 +4,6 @@
#include "assets.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_bg_planet.h"
extern Animation D_600C038;
src/overlays/ovl_menu/fox_option.c
+46 -44
View File
@@ -24,7 +24,7 @@ extern Gfx D_menu_801B57A8[];
#include "assets/ast_font.h"
#include "assets/ast_font_3d.h"
#include "assets/ast_option.h"
#include "assets/ast_versus.h"
#include "assets/ast_vs_menu.h"
#include "assets/ast_map.h"
extern f32 D_menu_801CD818[];
@@ -2145,7 +2145,7 @@ void Option_RankingMenuDraw(void) {
func_menu_8019C824(&D_menu_801B93F0);
temp_t0 = D_menu_801B93F0;
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, temp_t0, temp_t0, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7004010, 8, 8, 70.0f, (D_menu_801B93E4 * 17.0f) + 55.0f, 1.0f, 1.0f);
}
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
@@ -2751,33 +2751,33 @@ void func_menu_80199820(s32 arg0) {
s32 colorGB;
s32 i;
static u8* D_menu_801AF1E0[3] = {
D_VS_70030B0,
D_VS_7003290,
D_VS_7003470,
D_VS_MENU_70030B0,
D_VS_MENU_7003290,
D_VS_MENU_7003470,
};
static u8* D_menu_801AF1EC[4] = {
D_VS_70049C0,
D_VS_7004BB0,
D_VS_7004DC0,
D_VS_7005020,
D_VS_MENU_70049C0,
D_VS_MENU_7004BB0,
D_VS_MENU_7004DC0,
D_VS_MENU_7005020,
};
static u16* D_menu_801AF1FC[4] = {
D_VS_7004B80,
D_VS_7004D90,
D_VS_7004FF0,
D_VS_70051A0,
D_VS_MENU_7004B80,
D_VS_MENU_7004D90,
D_VS_MENU_7004FF0,
D_VS_MENU_70051A0,
};
static u16* D_menu_801AF20C[4] = {
D_VS_7008EE0,
D_VS_700AD20,
D_VS_700CB60,
D_VS_70070A0,
D_VS_MENU_7008EE0,
D_VS_MENU_700AD20,
D_VS_MENU_700CB60,
D_VS_MENU_70070A0,
};
static u8* D_menu_801AF21C[4] = {
D_VS_7000000,
D_VS_70000D0,
D_VS_7000210,
D_VS_7000350,
D_VS_MENU_7000000,
D_VS_MENU_70000D0,
D_VS_MENU_7000210,
D_VS_MENU_7000350,
};
static s32 D_menu_801AF22C[4] = { 177, 255, 0, 30 };
static s32 D_menu_801AF23C[4] = { 242, 30, 255, 30 };
@@ -2788,12 +2788,12 @@ void func_menu_80199820(s32 arg0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 4; i++) {
TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + (80 * 16 * i) / 2, D_VS_70123F8, 80, 16, D_menu_801AF148[arg0],
D_menu_801AF158[arg0] + (16.0f * i), 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_VS_MENU_70118E0 + (80 * 16 * i) / 2, D_VS_MENU_70123F8, 80, 16,
D_menu_801AF148[arg0], D_menu_801AF158[arg0] + (16.0f * i), 1.0f, 1.0f);
}
TextureRect_4bCI(&gMasterDisp, D_VS_70118E0 + (80 * 16 * 4) / 2, D_VS_70123F8, 80, 7, D_menu_801AF148[arg0],
D_menu_801AF158[arg0] + (16.0f * 4), 1.0f, 1.0f);
TextureRect_4bCI(&gMasterDisp, D_VS_MENU_70118E0 + (80 * 16 * 4) / 2, D_VS_MENU_70123F8, 80, 7,
D_menu_801AF148[arg0], D_menu_801AF158[arg0] + (16.0f * 4), 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, D_menu_801AF22C[arg0], D_menu_801AF23C[arg0], D_menu_801AF24C[arg0], 255);
@@ -2814,7 +2814,7 @@ void func_menu_80199820(s32 arg0) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_7001030, 64, 9, D_menu_801AF148[arg0] + D_menu_801AF1BC,
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7001030, 64, 9, D_menu_801AF148[arg0] + D_menu_801AF1BC,
D_menu_801AF158[arg0] + D_menu_801AF1C0, 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
@@ -2831,7 +2831,7 @@ void func_menu_80199820(s32 arg0) {
TextureRect_8bIA(&gMasterDisp, D_OPT_800E130, 8, 8, D_menu_801AF148[arg0] + D_menu_801AF1D8,
D_menu_801AF158[arg0] + D_menu_801AF1DC, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC,
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7000F10, 40, 7, D_menu_801AF148[arg0] + D_menu_801AF1CC,
D_menu_801AF158[arg0] + D_menu_801AF1D0, 1.0f, 1.0f);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@@ -2864,7 +2864,8 @@ void func_menu_80199EA8(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
for (i = 0; i < 3; i++) {
TextureRect_16bRGBA(&gMasterDisp, D_VS_700E9A0 + (144 * 14 * i), 144, 14, 87.0f, 84 + (i * 14.0f), 1.0f, 1.0f);
TextureRect_16bRGBA(&gMasterDisp, D_VS_MENU_700E9A0 + (144 * 14 * i), 144, 14, 87.0f, 84 + (i * 14.0f), 1.0f,
1.0f);
}
}
@@ -3216,7 +3217,7 @@ void func_menu_8019AB30(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7001DF0, 80, 10, 122.0f, 49.0f, 1.0f, 1.0f);
}
}
@@ -3230,7 +3231,8 @@ void func_menu_8019AD84(void) {
s32 colorGB;
s32 var_v0;
static u8* sTimeTrialMinuteTextures[] = { D_VS_70024D0, D_VS_7002730, D_VS_7002990, D_VS_7002BF0, D_VS_7002E50 };
static u8* sTimeTrialMinuteTextures[] = { D_VS_MENU_70024D0, D_VS_MENU_7002730, D_VS_MENU_7002990,
D_VS_MENU_7002BF0, D_VS_MENU_7002E50 };
RCP_SetupDL(&gMasterDisp, 0x53);
@@ -3271,7 +3273,7 @@ void func_menu_8019AD84(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7002110, 80, 12, D_menu_801AF25C[0], D_menu_801AF274[0], 1.0f, 1.0f);
}
}
@@ -3314,7 +3316,7 @@ void func_menu_8019AFFC(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7001270, 112, 12, D_menu_801AF2A0, D_menu_801AF2A4, 1.0f, 1.0f);
}
if (D_menu_801B93D0 == 30) {
@@ -3333,9 +3335,9 @@ void func_menu_8019B1F8(void) {
s32 i;
s32 width;
s32 sp8C[2];
static u8* D_menu_801AF2BC[] = { D_VS_7001C10, D_VS_70019E0 };
static u8* D_menu_801AF2C4[] = { D_VS_7006780, D_VS_7005F10 };
static u16* D_menu_801AF2CC[] = { D_VS_7006EA0, D_VS_7006630 };
static u8* D_menu_801AF2BC[] = { D_VS_MENU_7001C10, D_VS_MENU_70019E0 };
static u8* D_menu_801AF2C4[] = { D_VS_MENU_7006780, D_VS_MENU_7005F10 };
static u16* D_menu_801AF2CC[] = { D_VS_MENU_7006EA0, D_VS_MENU_7006630 };
for (xPos = D_menu_801AF2A8, i = 0; i < 2; i++, xPos += D_menu_801AF2B0) {
if (i == D_80161A28) {
@@ -3371,16 +3373,16 @@ void func_menu_8019B3DC(void) {
s32 i;
s32 sp8C[3];
static u8* D_menu_801AF2E8[] = {
D_VS_70017B0,
D_VS_70019E0,
D_VS_MENU_70017B0,
D_VS_MENU_70019E0,
};
static u8* D_menu_801AF2F0[] = {
D_VS_7005600,
D_VS_7005F10,
D_VS_MENU_7005600,
D_VS_MENU_7005F10,
};
static u16* D_menu_801AF2F8[] = {
D_VS_7005D20,
D_VS_7006630,
D_VS_MENU_7005D20,
D_VS_MENU_7006630,
};
for (xPos = D_menu_801AF2D4, i = 0; i < 2; i++, xPos += D_menu_801AF2DC) {
@@ -3428,15 +3430,15 @@ void func_menu_8019B5AC(void) {
if (gGameFrameCount & var_v0) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_VS_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f);
}
}
void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, r, g, b, 255);
TextureRect_8bIA_MirX(&gMasterDisp, D_VS_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f);
TextureRect_8bIA_MirX(&gMasterDisp, D_VS_MENU_7004010, 8, 8, xPos, yPos, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_VS_MENU_7004010, 8, 8, xPos + offset, yPos, 1.0f, 1.0f);
}
void func_menu_8019B7D4(void) {