mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-06-27 11:02:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed more wrong textures

Browse Source
This commit is contained in:
KiritoDv
2024-05-24 09:28:35 -06:00
committed by Sonic Dreamcaster
parent deabc05047
commit ce9c6d0120
4 changed files with 28 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/fox_versus.c
+1 -40
View File
@@ -88,11 +88,7 @@ void func_versus_800BC88C(f32 xPos, f32 yPos, f32 scale) {
}
void func_versus_800BC8D8(f32 xPos, f32 yPos, f32 scale) {
<<<<<<< HEAD
Lib_TextureRect_CI8(&gMasterDisp, D_versus_300A470, D_versus_300B218, 152, 23, xPos, yPos, scale, scale);
=======
TextureRect_CI8(&gMasterDisp, D_versus_300A470, D_versus_300B218, 152, 23, xPos, yPos, scale, scale);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
@@ -100,20 +96,12 @@ void func_versus_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
u8* D_800D4ABC[] = { D_versus_30087A0, D_versus_3008EC0, D_versus_3009990 };
s32 D_800D4AB0[] = { 40, 64, 64 };
<<<<<<< HEAD
Lib_TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale], D_800D4AA4[yScale], D_800D4AB0[yScale], 40, xPos, yPos, scale,
=======
TextureRect_CI8(&gMasterDisp, D_800D4ABC[yScale], D_800D4AA4[yScale], D_800D4AB0[yScale], 40, xPos, yPos, scale,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
scale);
}
void func_versus_800BCB44(f32 xPos, f32 yPos, f32 scale) {
<<<<<<< HEAD
Lib_TextureRect_CI8(&gMasterDisp, D_versus_3006C60, D_versus_3007500, 96, 23, xPos, yPos, scale, scale);
=======
TextureRect_CI8(&gMasterDisp, D_versus_3006C60, D_versus_3007500, 96, 23, xPos, yPos, scale, scale);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) {
@@ -121,16 +109,11 @@ void func_versus_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4)
u8* D_800D4AD8[] = { D_versus_3006040, D_versus_30076C0, D_versus_300B3F0, D_versus_3004F60 };
s32 D_800D4AE8[] = { 104, 152, 168, 152 };
<<<<<<< HEAD
Lib_TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4], D_800D4AC8[arg4], D_800D4AE8[arg4], 25, xPos, yPos, xScale,
=======
TextureRect_CI8(&gMasterDisp, D_800D4AD8[arg4], D_800D4AC8[arg4], D_800D4AE8[arg4], 25, xPos, yPos, xScale,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
yScale);
}
void func_versus_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
<<<<<<< HEAD
Lib_TextureRect_CI8(&gMasterDisp, D_versus_3001420, D_versus_3003E20, 256, 42, xPos, yPos, xScale, yScale);
}
@@ -138,13 +121,6 @@ void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) {
s32 i;
Lib_TextureRect_CI8(&gMasterDisp, D_versus_3004010, D_versus_3004D58, 136, 25, xPos, yPos, scale, scale);
=======
TextureRect_CI8(&gMasterDisp, D_versus_3001420, D_versus_3003E20, 256, 42, xPos, yPos, xScale, yScale);
}
void func_versus_800BCEF8(f32 xPos, f32 yPos, f32 scale) {
TextureRect_CI8(&gMasterDisp, D_versus_3004010, D_versus_3004D58, 136, 25, xPos, yPos, scale, scale);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void func_versus_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
@@ -192,15 +168,9 @@ void func_versus_800BD350(f32 xPos, f32 yPos) {
}
void func_versus_800BD3A8(f32 xPos, f32 yPos) {
<<<<<<< HEAD
s32 i;
Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex + ((80 * 8 * i) / 2), aVsHandicapFrameTLUT, 80, 71, xPos, yPos, 1.0f,
=======
s32 i = 0;
TextureRect_CI4(&gMasterDisp, D_VS_MENU_70118E0 + ((80 * 8 * i) / 2), D_VS_MENU_70123F8, 80, 71, xPos, yPos, 1.0f,
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
1.0f);
}
@@ -277,17 +247,8 @@ void func_versus_800BDAA0(f32 xPos, f32 yPos, s32 arg2, s32 arg3, s32 arg4) {
if (temp1 == temp2) {
Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, 15, xPos, yPos, 0.7f, 0.7f);
} else {
if (temp3 > y3) {
Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2] + (16 * arg4), 16, 15 - arg4, xPos, yPos, 0.7f,
0.7f);
Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1], 16, arg4, xPos, yPos + (15 - arg4) * 0.7f, 0.7f,
0.7f);
}
if (temp3 < y3) {
Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2], 16, 15 - arg4, xPos, yPos + (arg4 * 0.7f), 0.7f,
0.7f);
Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp1] + (16 * (15 - arg4)), 16, arg4, xPos, yPos, 0.7f,
0.7f);
Lib_TextureRect_IA8(&gMasterDisp, D_800D4B48[temp2], 16, arg4, xPos, yPos, 0.7f, 0.7f);
}
}
xPos += 13.0f * 0.7f;
src/overlays/ovl_ending/fox_end2.c
+1
View File
@@ -44,6 +44,7 @@ void Ending_8018CE20(u32 arg0) {
RCP_SetupDL(&gMasterDisp, SETUPDL_83);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, alpha);
// LTODO: This is a bug im pretty sure
Lib_TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 0, 192, 5, 64.0f,
105.0f, 1.0f, 1.0f);
Lib_TextureRect_IA8(&gMasterDisp, D_ending_80192E74[i].unk_00 + 192 * 5 * 1, 192, 5, 64.0f,
src/overlays/ovl_ending/fox_end2_data.c
+26 -26
View File
@@ -82,95 +82,95 @@ u32 D_ending_80192E70 = 0;
Credit D_ending_80192E74[] = {
"PRODUCER", 100, 200, 0, 60, 0, 0, 25, 20,
"SHIGERU MIYAMOTO", 100, 200, 0, 80, 1, 0, 25, 20,
"DIRECTOR", 430, 180, 0, 60, 0, 0, 25, 20,
"TAKAO SHIMIZU", 430, 180, 0, 80, 1, 0, 25, 20,
"ART DIRECTOR", 630, 180, 0, 60, 0, 0, 25, 20,
"TAKAYA IMAMURA", 630, 180, 0, 80, 1, 0, 25, 20,
"CHIEF PROGRAMMER", 830, 180, 0, 60, 0, 0, 25, 20,
"KAZUAKI MORITA", 830, 180, 0, 80, 1, 0, 25, 20,
"SOUND COMPOSERS", 1030, 180, 0, 60, 0, 0, 25, 20,
"KOJI KONDO", 1030, 180, 0, 80, 1, 0, 25, 20,
"HAJIME WAKAI", 1030, 180, 0, 110, 1, 0, 25, 20,
"SOUND EFFECTS PROGRAMMER", 1250, 180, 0, 60, 0, 0, 25, 20,
"YOJI INAGAKI", 1250, 180, 0, 80, 1, 0, 25, 20,
"GRAPHIC DESIGNERS", 1490, 180, 0, 60, 0, 0, 25, 20,
"YOSHIKI HARUHANA", 1490, 180, 0, 80, 1, 0, 25, 20,
"SATORU TAKIZAWA", 1490, 180, 0, 110, 1, 0, 25, 20,
"MASANORI SATO", 1490, 180, 0, 140, 1, 0, 25, 20,
"COURSE DESIGNERS", 2000, 180, 0, 60, 0, 0, 25, 20,
"YASUHISA YAMAMURA", 2000, 180, 0, 80, 1, 0, 25, 20,
"TAKUJI HOTTA", 2000, 180, 0, 110, 1, 0, 25, 20,
"COURSE DESIGNERS", 2370, 180, 0, 60, 0, 0, 25, 20,
"DAISUKE TSUJIMURA", 2370, 180, 0, 80, 1, 0, 25, 20,
"YASUYUKI OYAGI", 2370, 180, 0, 110, 1, 0, 25, 20,
"PROGRAMMERS", 2820, 180, 0, 60, 0, 0, 25, 20,
"YUICHI YAMAMOTO", 2820, 180, 0, 80, 1, 0, 25, 20,
"NOBUO OKAJIMA", 2820, 180, 0, 110, 1, 0, 25, 20,
"PROGRAMMERS", 3200, 180, 0, 60, 0, 0, 25, 20,
"SHIGEKI YOSHIDA", 3200, 180, 0, 80, 1, 0, 25, 20,
"TAKAMITSU KUZUHARA", 3200, 180, 0, 110, 1, 0, 25, 20,
"PROGRAMMERS", 3500, 180, 0, 60, 0, 0, 25, 20,
"NOBUHIRO SUMIYOSHI", 3500, 180, 0, 80, 1, 0, 25, 20,
"MAKOTO SASAKI", 3500, 180, 0, 110, 1, 0, 25, 20,
"MASUMI TARUKADO", 3500, 180, 0, 140, 1, 0, 25, 20,
"SCRIPT WRITER", 4100, 180, 0, 60, 0, 0, 25, 20,
"MITSUHIRO TAKANO", 4100, 180, 0, 80, 1, 0, 25, 20,
"CHARACTER VOICES", 4400, 180, 0, 60, 0, 0, 25, 20,
"MIKE WEST", 4400, 180, 0, 80, 1, 0, 25, 20,
"RICK MAY", 4400, 180, 0, 110, 1, 0, 25, 20,
"LYSSA BROWNE", 4400, 180, 0, 140, 1, 0, 25, 20,
"JOCK BLANEY", 4400, 180, 0, 170, 1, 0, 25, 20,
"CHARACTER VOICES", 4700, 180, 0, 60, 0, 0, 25, 20,
"DAVID WHITE", 4700, 180, 0, 80, 1, 0, 25, 20,
"J. GREEN", 4700, 180, 0, 110, 1, 0, 25, 20,
"BILL JOHNS", 4700, 180, 0, 140, 1, 0, 25, 20,
"TECHNICAL SUPPORTERS", 5050, 120, 0, 60, 0, 0, 16, 13,
"KENJI MATSUTANI", 5050, 120, 0, 80, 1, 0, 16, 13,
"ATSUSHI NISHIWAKI", 5050, 120, 0, 110, 1, 0, 16, 13,
"HIDEAKI SHIMIZU", 5050, 120, 0, 140, 1, 0, 16, 13,
"TECHNICAL SUPPORTERS", 5280, 120, 0, 60, 0, 0, 16, 13,
"YASUSHI IDA", 5280, 120, 0, 80, 1, 0, 16, 13,
"HIROHITO YOSHIMOTO", 5280, 120, 0, 110, 1, 0, 16, 13,
"YOSHINORI TANIMOTO", 5280, 120, 0, 140, 1, 0, 16, 13,
"TECHNICAL SUPPORTERS", 5510, 120, 0, 60, 0, 0, 16, 13,
"TAKAO SAWANO", 5510, 120, 0, 80, 1, 0, 16, 13,
"HIRONOBU KAKUI", 5510, 120, 0, 110, 1, 0, 16, 13,
"KENJI NISHIZAWA", 5510, 120, 0, 140, 1, 0, 16, 13,
"TECHNICAL SUPPORTERS", 5740, 120, 0, 60, 0, 0, 16, 13,
"TAKUYA KURIBAYASHI", 5740, 120, 0, 80, 1, 0, 16, 13,
"TSUYOSHI TAKAHASHI", 5740, 120, 0, 110, 1, 0, 16, 13,
"SHIN HASEGAWA", 5740, 120, 0, 140, 1, 0, 16, 13,
"SUPERVISORS", 5970, 120, 0, 60, 0, 0, 16, 13,
"TAKASHI TEZUKA", 5970, 120, 0, 80, 1, 0, 16, 13,
"TOSHIHIKO NAKAGO", 5970, 120, 0, 110, 1, 0, 16, 13,
"PROGRESS MANAGERS", 6200, 120, 0, 60, 0, 0, 16, 13,
"KIMIYOSHI FUKUI", 6200, 120, 0, 80, 1, 0, 16, 13,
"KEIZO KATO", 6200, 120, 0, 110, 1, 0, 16, 13,
"SPECIAL THANKS TO", 6430, 120, 0, 60, 0, 0, 16, 13,
"BENIMARU ITOH", 6430, 120, 0, 80, 1, 0, 16, 13,
"SUPER MARIO CLUB", 6430, 120, 0, 110, 1, 0, 16, 13,
"TRI-FILM", 6430, 120, 0, 140, 1, 0, 16, 13,
"EAR FORCE", 6430, 120, 0, 170, 1, 0, 16, 13,
"ENGLISH VERSION STAFF", 6900, 200, 0, 60, 0, 0, 25, 20,
"JIM WORNELL", 6900, 200, 0, 80, 1, 0, 25, 20,
"KENJI OKUBO", 6900, 200, 0, 110, 1, 0, 25, 20,
@@ -178,7 +178,7 @@ Credit D_ending_80192E74[] = {
"KAYOMI MCDONALD", 6900, 200, 0, 170, 1, 0, 25, 20,
"EXECUTIVE PRODUCER", 7400, 200, 0, 100, 0, 0, 25, 20,
"HIROSHI YAMAUCHI", 7400, 200, 0, 120, 1, 0, 25, 20,
"NINTENDO", 7800, 200, 0, 120, 1, 0, 25, 20,
aText_THE_END, 8200, 380, 0, 110, 2, 1, 25, 20,
};
@@ -200,7 +200,7 @@ AssetInfo D_ending_801934B4[] = {
{ aAwFalcoHeadDL, NULL, 29, 1090, 30, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 7, 0 },
{ D_arwing_30194E0, NULL, 45, 100, 1020, 1.0f, -1000.0f, 516.9f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {255, 255, 255, 140,}, 7, 0 },
{ NULL, Ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, 500.0f, -64.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 255, 0,}, {255, 255, 255, 255,}, 0, 0 },
{ &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, -1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 5, 0 },
{ D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, -1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 5, 0 },
{ NULL, Ending_80190778, 29, 1120, 200, 1.0f, -1000.0f, -493.2f, -16.0f, 0.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 7, 0 },
{ D_arwing_30194E0, NULL, 45, 1120, 200, 1.0f, -1000.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {255, 255, 255, 140,}, 7, 0 },
{ NULL, Ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, -500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 255, 0,}, {255, 255, 255, 255,}, 0, 0 },
@@ -261,13 +261,13 @@ AssetInfo D_ending_801934B4[] = {
{ D_END_7016540, NULL, 17, 5100, 310, 1.0f, 0.0f, -2800.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, -4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 0, 0 },
{ D_END_7016540, NULL, 17, 5410, 1490, 1.0f, 0.0f, -4040.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {0, 0, 0, 0}, 995, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 0, 0 },
{ NULL, Ending_80190CF0, 62, 6520, 380, 1.0f, 0.0f, 0.0f, -7000.0f, 0.0f, 0.0f, 0.0f, 12.0f, 12.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {0, 0, 0, 0}, 200, 0, {0, 0, 0, 0,}, {255, 255, 255, 0,}, 0, 0 },
{ &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 3, 0 },
{ D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 3, 0 },
{ D_END_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {255, 0, 0, 0,}, {255, 255, 255, 255,}, 0, 0 },
{ &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 5, 0 },
{ D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 5, 0 },
{ D_END_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {255, 0, 0, 0,}, {255, 255, 255, 255,}, 5, 0 },
{ &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 7, 0 },
{ D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 7, 0 },
{ D_END_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {255, 0, 0, 0,}, {255, 255, 255, 255,}, 7, 0 },
{ &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 11, 0 },
{ D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 11, 0 },
{ D_END_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, {240, 176, 64, 0}, 996, 1000, {255, 0, 0, 0,}, {255, 255, 255, 255,}, 11, 0 },
{ NULL, Ending_8018F2A8, 29, 5100, 1800, 1.0f, 0.0f, 0.0f, -220.0f, 0.0f, 180.0f, 0.0f, 0.1f, 0.1f, 0.1f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, {240, 176, 64, 0}, 996, 1000, {0, 0, 0, 0,}, {0, 0, 0, 0,}, 0, 0 },
{ NULL, Ending_8018DA0C, 76, 6520, 380, 1.0f, 224.0f, 164.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, {0, 0, 0, 0}, 20, 0, {0, 0, 0, 0,}, {255, 255, 255, 255,}, 0, 0 },
src/overlays/ovl_menu/fox_option.c
-14
View File
@@ -2806,13 +2806,8 @@ void Option_VS_HandicapSet_Draw(s32 PlayerIdx) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_CI4(&gMasterDisp, aVsHandicapFrameTex, aVsHandicapFrameTLUT, 80, 71, sVsHandicapFrameXpos[arg0],
sVsHandicapFrameYpos[arg0], 1.0f, 1.0f);
=======
TextureRect_CI4(&gMasterDisp, D_VS_MENU_70118E0, D_VS_MENU_70123F8, 80, 71, D_menu_801AF148[arg0],
D_menu_801AF158[arg0], 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
Lib_TextureRect_CI8(&gMasterDisp, sVsCharNameTex[PlayerIdx], sVsCharNameTLUT[PlayerIdx], sCharNameWidth[PlayerIdx],
sCharNameHeight[PlayerIdx], sVsHandicapFrameXpos[PlayerIdx] + sCharNameXoffsetPos[PlayerIdx],
@@ -2854,13 +2849,8 @@ void Option_VS_HandicapSet_Draw(s32 PlayerIdx) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_RGBA16(&gMasterDisp, sVsPlayerFaceTex[arg0], 44, 44, sVsHandicapFrameXpos[arg0] + sPlayerFaceXoffsetPos,
sVsHandicapFrameYpos[arg0] + sPlayerFaceYoffsetPos, 0.7f, 0.7f);
=======
TextureRect_RGBA16(&gMasterDisp, D_menu_801AF20C[arg0], 44, 44, D_menu_801AF148[arg0] + D_menu_801AF1B4,
D_menu_801AF158[arg0] + D_menu_801AF1B8, 0.7f, 0.7f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
width = 24;
if (PlayerIdx == 0) {
@@ -2879,11 +2869,7 @@ void Option_VS_N64Console_Draw(void) {
RCP_SetupDL_76();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
<<<<<<< HEAD
Lib_TextureRect_RGBA16(&gMasterDisp, aVsN64ConsoleTex, 144, 42, 87.0f, 84, 1.0f, 1.0f);
=======
TextureRect_RGBA16(&gMasterDisp, D_VS_MENU_700E9A0, 144, 42, 87.0f, 84, 1.0f, 1.0f);
>>>>>>> edd7dba2 (Fixed all remaining compilation issues)
}
void Option_VersusStage_Setup(void) {